Skip to content

Commit ca6b5df

Browse files
rpalcolearpalcolea
committed
Gradle 9.x compatibility
1 parent 38f5453 commit ca6b5df

15 files changed

+105
-1190
lines changed

‎.github/workflows/nebula.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
strategy:
2323
matrix:
2424
# test against latest update of some major Java version(s), as well as specific LTS version(s)
25-
java: [8, 17, 21]
25+
java: [17, 21]
2626
name: Gradle Build without Publish
2727
steps:
2828
- uses: actions/checkout@v4
@@ -35,7 +35,7 @@ jobs:
3535
with:
3636
distribution: 'zulu'
3737
java-version: |
38-
8
38+
17
3939
${{ matrix.java }}
4040
java-package: jdk
4141
- uses: actions/cache@v4
@@ -75,7 +75,7 @@ jobs:
7575
with:
7676
distribution: 'zulu'
7777
java-version: |
78-
8
78+
17
7979
21
8080
java-package: jdk
8181
- uses: actions/cache@v4
@@ -120,7 +120,7 @@ jobs:
120120
with:
121121
distribution: 'zulu'
122122
java-version: |
123-
8
123+
7
124124
21
125125
java-package: jdk
126126
- uses: actions/cache@v4

‎build.gradle‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
*/
1717

1818
plugins {
19-
id 'com.netflix.nebula.plugin-plugin' version '21.3.3'
20-
id "org.jetbrains.kotlin.jvm" version "2.1.0"
19+
id 'com.netflix.nebula.plugin-plugin' version '22.0.2'
20+
id "org.jetbrains.kotlin.jvm" version "2.2.0"
2121
id 'java-gradle-plugin'
2222
}
2323

@@ -35,8 +35,6 @@ dependencies {
3535
testRuntimeOnly 'com.netflix.nebula:gradle-dependency-lock-plugin:latest.release'
3636
}
3737

38-
apply from: 'gradle/idea.gradle'
39-
4038
description 'Gradle resolution rules plugin'
4139

4240
contacts {
@@ -66,14 +64,14 @@ gradlePlugin {
6664

6765
java {
6866
toolchain {
69-
languageVersion = JavaLanguageVersion.of(8)
67+
languageVersion = JavaLanguageVersion.of(17)
7068
}
7169
}
7270

7371
idea {
7472
project {
75-
jdkName = '1.8'
76-
languageLevel = '1.8'
73+
jdkName = '17'
74+
languageLevel = '17'
7775
}
7876
}
7977

‎gradle.lockfile‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,39 +8,40 @@ com.fasterxml.jackson.core:jackson-databind:2.9.10.8=compileClasspath,integTestC
88
com.fasterxml.jackson.module:jackson-module-kotlin:2.9.10=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
99
com.fasterxml.jackson:jackson-bom:2.9.10.20210106=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
1010
com.google.guava:guava:20.0=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
11-
com.netflix.nebula:gradle-dependency-lock-plugin:15.1.0=integTestRuntimeClasspath,testRuntimeClasspath
11+
com.netflix.nebula:gradle-dependency-lock-plugin:15.2.0=integTestRuntimeClasspath,testRuntimeClasspath
1212
com.netflix.nebula:nebula-dependencies-comparison:0.2.1=integTestRuntimeClasspath,testRuntimeClasspath
13-
com.netflix.nebula:nebula-dependency-recommender:12.5.1=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
13+
com.netflix.nebula:nebula-dependency-recommender:13.0.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
1414
com.netflix.nebula:nebula-gradle-interop:2.3.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
15-
com.netflix.nebula:nebula-test:10.6.2=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
15+
com.netflix.nebula:nebula-test:11.0.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
1616
com.squareup.moshi:moshi:1.12.0=integTestRuntimeClasspath,testRuntimeClasspath
1717
com.squareup.okio:okio:2.10.0=integTestRuntimeClasspath,testRuntimeClasspath
1818
javax.inject:javax.inject:1=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
1919
joda-time:joda-time:2.10=integTestRuntimeClasspath,testRuntimeClasspath
2020
junit:junit:4.13.2=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
2121
org.apache.commons:commons-lang3:3.12.0=integTestRuntimeClasspath,testRuntimeClasspath
2222
org.apache.commons:commons-lang3:3.8.1=runtimeClasspath
23+
org.apache.groovy:groovy:4.0.4=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
2324
org.apache.maven:maven-artifact:3.8.3=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
2425
org.apache.maven:maven-builder-support:3.8.3=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
2526
org.apache.maven:maven-model-builder:3.8.3=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
2627
org.apache.maven:maven-model:3.8.3=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
2728
org.apiguardian:apiguardian-api:1.1.2=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
28-
org.codehaus.groovy:groovy:3.0.12=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
2929
org.codehaus.plexus:plexus-interpolation:1.26=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
3030
org.codehaus.plexus:plexus-utils:3.3.0=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
3131
org.eclipse.sisu:org.eclipse.sisu.inject:0.3.5=integTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
3232
org.hamcrest:hamcrest-core:1.3=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
3333
org.hamcrest:hamcrest:2.2=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
34-
org.jetbrains.kotlin:kotlin-reflect:2.1.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
34+
org.jetbrains.kotlin:kotlin-reflect:2.2.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
3535
org.jetbrains.kotlin:kotlin-stdlib-common:1.4.20=integTestRuntimeClasspath,testRuntimeClasspath
36-
org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
37-
org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
38-
org.jetbrains.kotlin:kotlin-stdlib:2.1.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
36+
org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
37+
org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
38+
org.jetbrains.kotlin:kotlin-stdlib:2.2.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
3939
org.jetbrains:annotations:13.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
40-
org.junit.platform:junit-platform-commons:1.9.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
41-
org.junit.platform:junit-platform-engine:1.9.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
40+
org.junit.platform:junit-platform-commons:1.13.1=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
41+
org.junit.platform:junit-platform-engine:1.13.1=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
42+
org.junit.platform:junit-platform-launcher:1.13.1=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
4243
org.objenesis:objenesis:2.4=integTestRuntimeClasspath,testRuntimeClasspath
43-
org.opentest4j:opentest4j:1.2.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
44-
org.spockframework:spock-core:2.3-groovy-3.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
45-
org.spockframework:spock-junit4:2.3-groovy-3.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
44+
org.opentest4j:opentest4j:1.3.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
45+
org.spockframework:spock-core:2.3-groovy-4.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
46+
org.spockframework:spock-junit4:2.3-groovy-4.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
4647
empty=annotationProcessor,compile,integTestAnnotationProcessor,integTestCompile,integTestRuntime,runtime,testAnnotationProcessor,testCompile,testRuntime

‎gradle/idea.gradle‎

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

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=7197a12f450794931532469d4ff21a59ea2c1cd59a3ec3f89c035c3c420a6999
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-rc-1-bin.zip
54
networkTimeout=10000
65
validateDistributionUrl=true
76
zipStoreBase=GRADLE_USER_HOME

‎src/integTest/groovy/nebula/plugin/resolutionrules/AlignAndSubstituteRulesSpec.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1919,7 +1919,7 @@ class AlignAndSubstituteRulesSpec extends AbstractIntegrationTestKitSpec {
19191919
repositories { mavenCentral() }
19201920
}
19211921
""".stripIndent()
1922-
buildFile << baseBuildGradleFile("'nebula.dependency-recommender' version '9.0.1\'")
1922+
buildFile << baseBuildGradleFile("'com.netflix.nebula.dependency-recommender' version '13.0.0\'")
19231923

19241924

19251925
if (!usingEnforcedPlatform) {

0 commit comments

Comments
 (0)