Skip to content

Commit 4a84af2

Browse files
feat: update spotless, ktlint, min java version (#8)
1 parent a41ac6d commit 4a84af2

File tree

11 files changed

+82
-83
lines changed

11 files changed

+82
-83
lines changed

.github/CODEOWNERS

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,3 @@
33
# global
44
* @hypertrace/build-tooling
55

6-
# GH action
7-
.github/ @aaron-steinfeld @jbahire @kotharironak

.github/workflows/pr-build.yml

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,22 @@ on:
99

1010
jobs:
1111
build:
12-
runs-on: ubuntu-20.04
12+
runs-on: ubuntu-22.04
1313
steps:
1414
# Set fetch-depth: 0 to fetch commit history and tags for use in version calculation
1515
- name: Check out code
16-
uses: actions/checkout@v2.3.4
16+
uses: actions/checkout@v3
1717
with:
1818
ref: ${{github.event.pull_request.head.ref}}
1919
repository: ${{github.event.pull_request.head.repo.full_name}}
2020
fetch-depth: 0
2121

22-
- name: create checksum file
23-
uses: hypertrace/github-actions/checksum@main
24-
25-
- name: Cache packages
26-
uses: actions/cache@v2
27-
with:
28-
path: ~/.gradle
29-
key: gradle-packages-${{ runner.os }}-${{ github.job }}-${{ hashFiles('**/checksum.txt') }}
30-
restore-keys: |
31-
gradle-packages-${{ runner.os }}-${{ github.job }}
32-
gradle-packages-${{ runner.os }}
33-
3422
- name: Build with Gradle
3523
uses: hypertrace/github-actions/gradle@main
3624
with:
37-
args: build
25+
args: build
26+
dependency-check:
27+
runs-on: ubuntu-22.04
28+
steps:
29+
- name: Dependency Check
30+
uses: hypertrace/github-actions/dependency-check@main

.github/workflows/publish.yml

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,14 @@ on:
88

99
jobs:
1010
publish-artifacts:
11-
runs-on: ubuntu-20.04
11+
runs-on: ubuntu-22.04
1212
steps:
1313
# Set fetch-depth: 0 to fetch commit history and tags for use in version calculation
1414
- name: Check out code
15-
uses: actions/checkout@v2.3.4
15+
uses: actions/checkout@v3
1616
with:
1717
fetch-depth: 0
1818

19-
- name: create checksum file
20-
uses: hypertrace/github-actions/checksum@main
21-
22-
- name: Cache packages
23-
uses: actions/cache@v2
24-
with:
25-
path: ~/.gradle
26-
key: gradle-packages-${{ runner.os }}-${{ github.job }}-${{ hashFiles('**/checksum.txt') }}
27-
restore-keys: |
28-
gradle-packages-${{ runner.os }}-${{ github.job }}
29-
gradle-packages-${{ runner.os }}
30-
3119
- name: publish java artifacts
3220
uses: hypertrace/github-actions/gradle@main
3321
with:

.github/workflows/snyk-scan.yml

Lines changed: 0 additions & 26 deletions
This file was deleted.

build.gradle.kts

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,21 @@ plugins {
55
id("org.hypertrace.repository-plugin") version "0.4.0"
66
id("org.hypertrace.ci-utils-plugin") version "0.3.0"
77
id("org.hypertrace.publish-plugin") version "1.0.4"
8+
id("org.owasp.dependencycheck") version "8.4.0"
89
}
910

1011
group = "org.hypertrace.gradle.code.style"
1112

1213
java {
13-
targetCompatibility = JavaVersion.VERSION_1_8
14-
sourceCompatibility = JavaVersion.VERSION_1_8
14+
targetCompatibility = JavaVersion.VERSION_11
15+
sourceCompatibility = JavaVersion.VERSION_11
1516
}
1617

1718
dependencies {
18-
api("com.diffplug.spotless:spotless-plugin-gradle:6.8.0")
19+
api("com.diffplug.spotless:spotless-plugin-gradle:6.20.0")
20+
constraints {
21+
implementation("com.squareup.okio:okio:3.4.0")
22+
}
1923
}
2024

2125
gradlePlugin {
@@ -30,3 +34,10 @@ gradlePlugin {
3034
hypertracePublish {
3135
license.set(APACHE_2_0)
3236
}
37+
38+
dependencyCheck {
39+
format = org.owasp.dependencycheck.reporting.ReportGenerator.Format.ALL.toString()
40+
suppressionFile = "owasp-suppressions.xml"
41+
scanConfigurations.add("runtimeClasspath")
42+
failBuildOnCVSS = 3.0F
43+
}

gradle/wrapper/gradle-wrapper.jar

3.81 KB
Binary file not shown.
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists

gradlew

Lines changed: 23 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 9 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

owasp-suppressions.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
3+
<suppress>
4+
<packageUrl regex="true">^pkg:maven/org\.eclipse\.platform/org\.eclipse\.osgi@.*$</packageUrl>
5+
<cpe>cpe:/a:eclipse:equinox</cpe>
6+
</suppress>
7+
</suppressions>

0 commit comments

Comments
 (0)