Skip to content

Commit 916212d

Browse files
committed
upgrade to java 17
which requires upgrading gradle and mockito as well
1 parent c241d9d commit 916212d

File tree

7 files changed

+78
-57
lines changed

7 files changed

+78
-57
lines changed

.github/workflows/gradle.yml

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,16 @@ permissions:
1313

1414
jobs:
1515
build:
16-
1716
runs-on: ubuntu-latest
18-
1917
steps:
2018
- uses: actions/checkout@v4
21-
- name: Set up JDK 8
22-
uses: actions/setup-java@v3
19+
- name: Setup Java
20+
uses: actions/setup-java@v5
2321
with:
24-
java-version: '8.0.392+8'
2522
distribution: 'temurin'
26-
- name: Validate Gradle wrapper
27-
uses: gradle/wrapper-validation-action@v1
28-
- name: Build with Gradle
29-
uses: gradle/gradle-build-action@v2.11.1
30-
with:
31-
arguments: build
23+
java-version: 17
24+
- name: Setup Gradle
25+
uses: gradle/actions/setup-gradle@v3
26+
- name: Build and test
27+
run: ./gradlew check
28+

.github/workflows/release.yml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,15 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- uses: actions/checkout@v4
19-
- name: Set up Java
20-
uses: actions/setup-java@v3
19+
- name: Setup Java
20+
uses: actions/setup-java@v5
2121
with:
22-
java-version: '8.0.392+8'
2322
distribution: 'temurin'
24-
- name: Validate Gradle wrapper
25-
uses: gradle/wrapper-validation-action@v1
23+
java-version: 17
24+
- name: Setup Gradle
25+
uses: gradle/actions/setup-gradle@v3
2626
- name: Publish package
27-
uses: gradle/gradle-build-action@v2.11.1
28-
with:
29-
arguments: publish
27+
run: .gradlew publish
3028
env:
3129
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3230
- name: Add Artifact to GitHub Release

build.gradle

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,11 @@ allprojects {
2121

2222
defaultTasks 'build'
2323

24-
sourceCompatibility = 1.8
25-
targetCompatibility = 1.8
24+
java {
25+
toolchain {
26+
languageVersion = JavaLanguageVersion.of(17)
27+
}
28+
}
2629

2730
ext {
2831
fullName = 'Nanofix'
@@ -49,7 +52,7 @@ subprojects {
4952
dependencies {
5053
testImplementation 'junit:junit-dep:4.11'
5154
testImplementation 'org.hamcrest:hamcrest-library:1.3'
52-
testImplementation 'org.mockito:mockito-core:2.1.0'
55+
testImplementation 'org.mockito:mockito-core:5.20.0'
5356
}
5457

5558
jar {
@@ -61,7 +64,6 @@ subprojects {
6164
}
6265

6366
task sourcesJar(type: Jar) {
64-
classifier = 'sources'
6567
from sourceSets.main.allSource
6668
}
6769

gradle/wrapper/gradle-wrapper.jar

-15.4 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.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists

gradlew

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

gradlew.bat

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

0 commit comments

Comments
 (0)