File tree Expand file tree Collapse file tree 7 files changed +14
-19
lines changed
src/test/groovy/org/gradlex/jvm/dependency/conflict/test Expand file tree Collapse file tree 7 files changed +14
-19
lines changed Original file line number Diff line number Diff line change 1616 uses : actions/setup-java@v4
1717 with :
1818 distribution : temurin
19- java-version : 11
19+ java-version : 17
2020 - name : Set up Gradle
2121 uses : gradle/actions/setup-gradle@v4
2222 - run : " ./gradlew quickCheck"
Original file line number Diff line number Diff line change 1919 uses : actions/setup-java@v4
2020 with :
2121 distribution : temurin
22- java-version : 11
22+ java-version : 17
2323 - name : Set up Gradle
2424 uses : gradle/actions/setup-gradle@v4
2525 - run : " ./gradlew test${{ matrix.gradleVersion }}"
Original file line number Diff line number Diff line change @@ -19,20 +19,15 @@ jobs:
1919 build :
2020 runs-on : ubuntu-latest
2121 steps :
22- - name : Checkout
23- uses : actions/checkout@v4
24- - name : Setup Pages
25- uses : actions/configure-pages@v5
26- - name : Set up JDK 11
27- uses : actions/setup-java@v4
22+ - uses : actions/checkout@v4
23+ - uses : actions/configure-pages@v5
24+ - uses : actions/setup-java@v4
2825 with :
2926 distribution : zulu
30- java-version : 11
31- - name : Set up Gradle
32- uses : gradle/actions/setup-gradle@v4
27+ java-version : 17
28+ - uses : gradle/actions/setup-gradle@v4
3329 - run : " ./gradlew :asciidoctor --no-configuration-cache"
34- - name : Upload artifact
35- uses : actions/upload-pages-artifact@v3
30+ - uses : actions/upload-pages-artifact@v3
3631 with :
3732 path : " ./build/docs/asciidoc"
3833
Original file line number Diff line number Diff line change 1313 uses : actions/setup-java@v4
1414 with :
1515 distribution : temurin
16- java-version : 11
16+ java-version : 17
1717 - name : Set up Gradle
1818 uses : gradle/actions/setup-gradle@v4
1919 - run : " ./gradlew :publishPlugin --no-configuration-cache"
Original file line number Diff line number Diff line change @@ -9,7 +9,7 @@ group = "org.gradlex"
99version = " 2.2"
1010
1111java {
12- toolchain.languageVersion = JavaLanguageVersion .of(11 ) // to run tests that use Android with 11
12+ toolchain.languageVersion = JavaLanguageVersion .of(17 )
1313}
1414
1515tasks.withType<JavaCompile >().configureEach {
Original file line number Diff line number Diff line change @@ -42,7 +42,7 @@ class CustomizationTest extends Specification {
4242 +--- org.ow2.asm:asm:7.0
4343 \\ --- org.apache.ant:ant:1.10.3
4444 \\ --- org.apache.ant:ant-launcher:1.10.3
45- ''' . stripIndent()
45+ ''' . stripIndent()
4646 }
4747
4848 def " can use own capability resolution strategies through Gradle standard API" () {
@@ -103,7 +103,7 @@ class CustomizationTest extends Specification {
103103 +--- com.sun.mail:mailapi:1.6.7 -> com.sun.mail:jakarta.mail:1.6.7 (*)
104104 +--- jakarta.servlet:jakarta.servlet-api:5.0.0
105105 \\ --- org.apache.tomcat:tomcat-servlet-api:10.0.18 -> jakarta.servlet:jakarta.servlet-api:5.0.0
106- ''' . stripIndent()
106+ ''' . stripIndent()
107107 }
108108
109109 def " can use own capability resolution strategies through DSL" () {
@@ -149,6 +149,6 @@ class CustomizationTest extends Specification {
149149 +--- com.sun.mail:mailapi:1.6.7 -> com.sun.mail:jakarta.mail:1.6.7 (*)
150150 +--- jakarta.servlet:jakarta.servlet-api:5.0.0
151151 \\ --- org.apache.tomcat:tomcat-servlet-api:10.0.18 -> jakarta.servlet:jakarta.servlet-api:5.0.0
152- ''' . stripIndent()
152+ ''' . stripIndent()
153153 }
154154}
Original file line number Diff line number Diff line change @@ -66,6 +66,6 @@ class SettingsTest extends Specification {
6666 +--- com.sun.mail:mailapi:1.6.7 -> com.sun.mail:jakarta.mail:1.6.7 (*)
6767 +--- jakarta.servlet:jakarta.servlet-api:5.0.0
6868 \\ --- org.apache.tomcat:tomcat-servlet-api:10.0.18 -> jakarta.servlet:jakarta.servlet-api:5.0.0
69- ''' . stripIndent()
69+ ''' . stripIndent()
7070 }
7171}
You can’t perform that action at this time.
0 commit comments