Skip to content

Commit ea3db1b

Browse files
lkishalmilkishalmi
authored
Merge pull request #9112 from lkishalmi/gradle-tooling-api-9.3.0-rc-2
Upgrade Gradle Tooling API 9.3.0
2 parents 4c3d774 + 10f9046 commit ea3db1b

62 files changed

Lines changed: 368 additions & 341 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/main.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -849,7 +849,7 @@ jobs:
849849
timeout-minutes: 50
850850
strategy:
851851
matrix:
852-
java: [ '17', '21', '26-ea' ]
852+
java: [ '17', '21', '25', '26-ea' ]
853853
exclude:
854854
- java: ${{ github.event_name == 'pull_request' && 'nothing' || '21' }}
855855
fail-fast: false
@@ -934,23 +934,23 @@ jobs:
934934
- name: java/gradle.test
935935
run: ant $OPTS -f java/gradle.test test
936936

937-
# TODO next are JDK 21 or 25 incompatibe steps
938-
- name: java/java.mx.project
939-
if: ${{ matrix.java == '17' || matrix.java == '21' }}
940-
run: .github/retry.sh ant $OPTS -f java/java.mx.project test
941-
942937
- name: java/gradle.java
943-
if: ${{ matrix.java == '17' || matrix.java == '21' }}
938+
if: ${{ matrix.java == '17' || matrix.java == '21' || matrix.java == '25' }}
944939
run: .github/retry.sh ant $OPTS -f java/gradle.java test
945940

946941
- name: extide/gradle
947-
if: ${{ matrix.java == '17' || matrix.java == '21' }}
942+
if: ${{ matrix.java == '17' || matrix.java == '21' || matrix.java == '25' }}
948943
run: ant $OPTS -f extide/gradle test
949944

950945
- name: java/gradle.dependencies
951-
if: ${{ matrix.java == '17' }}
946+
if: ${{ matrix.java == '17' || matrix.java == '21' || matrix.java == '25' }}
952947
run: ant $OPTS -f java/gradle.dependencies test
953948

949+
# TODO next are JDK 21 or 25 incompatibe steps
950+
- name: java/java.mx.project
951+
if: ${{ matrix.java == '17' || matrix.java == '21' }}
952+
run: .github/retry.sh ant $OPTS -f java/java.mx.project test
953+
954954
- name: extide/o.apache.tools.ant.module
955955
if: ${{ matrix.java == '17' }}
956956
run: ant $OPTS -f extide/o.apache.tools.ant.module test

‎enterprise/micronaut/test/unit/data/gradle/artifacts/multi/app/build.gradle‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
plugins {
2-
id("com.github.johnrengelman.shadow") version "7.1.2"
3-
id("io.micronaut.application") version "3.7.10"
2+
id("io.micronaut.application") version "4.6.1"
43
}
54

65
version = "0.1"
@@ -12,21 +11,22 @@ repositories {
1211

1312
dependencies {
1413
annotationProcessor("io.micronaut:micronaut-http-validation")
15-
implementation("io.micronaut:micronaut-http-client")
16-
implementation("io.micronaut:micronaut-jackson-databind")
14+
implementation("io.micronaut:micronaut-http-client-jdk")
15+
implementation("io.micronaut.serde:micronaut-serde-jackson")
1716
implementation("jakarta.annotation:jakarta.annotation-api")
1817
runtimeOnly("ch.qos.logback:logback-classic")
19-
implementation("io.micronaut:micronaut-validation")
18+
implementation("io.micronaut.validation:micronaut-validation")
2019

2120
}
2221

23-
2422
application {
2523
mainClass.set("com.example.Application")
2624
}
25+
2726
java {
28-
sourceCompatibility = JavaVersion.toVersion("11")
29-
targetCompatibility = JavaVersion.toVersion("11")
27+
toolchain {
28+
languageVersion = JavaLanguageVersion.of(17)
29+
}
3030
}
3131

3232
graalvmNative.toolchainDetection = false

‎enterprise/micronaut/test/unit/data/gradle/artifacts/multi/gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
micronautVersion=3.10.2
1+
micronautVersion=4.9.4

‎enterprise/micronaut/test/unit/data/gradle/artifacts/multi/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎enterprise/micronaut/test/unit/data/gradle/artifacts/multi/oci/build.gradle‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
plugins {
2-
id("com.github.johnrengelman.shadow") version "7.1.2"
3-
id("io.micronaut.application") version "3.7.10"
2+
id("io.micronaut.application") version "4.6.1"
43
}
54

65
version = "0.1"
@@ -12,26 +11,28 @@ repositories {
1211

1312
dependencies {
1413
annotationProcessor("io.micronaut:micronaut-http-validation")
15-
implementation("io.micronaut:micronaut-http-client")
16-
implementation("io.micronaut:micronaut-jackson-databind")
14+
implementation("io.micronaut:micronaut-http-client-jdk")
15+
implementation("io.micronaut.serde:micronaut-serde-jackson")
1716
implementation("jakarta.annotation:jakarta.annotation-api")
1817
runtimeOnly("ch.qos.logback:logback-classic")
1918
implementation(project(":app"))
20-
implementation("io.micronaut:micronaut-validation")
19+
implementation("io.micronaut.validation:micronaut-validation")
2120

2221
}
2322

2423

2524
application {
2625
mainClass.set("com.example.Application")
2726
}
27+
2828
java {
29-
sourceCompatibility = JavaVersion.toVersion("11")
30-
targetCompatibility = JavaVersion.toVersion("11")
29+
toolchain {
30+
languageVersion = JavaLanguageVersion.of(17)
31+
}
3132
}
3233

3334
task testJar(type: Jar) {
34-
classifier = 'tests'
35+
archiveClassifier = 'tests'
3536
from sourceSets.test.output
3637
}
3738

‎enterprise/micronaut/test/unit/data/gradle/artifacts/multi/settings.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@
22
rootProject.name="demo"
33

44
include("app")
5-
include("aws")
65
include("oci")

‎enterprise/micronaut/test/unit/data/gradle/artifacts/simple/build.gradle‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
plugins {
2-
id("com.github.johnrengelman.shadow") version "7.1.2"
3-
id("io.micronaut.application") version "3.7.10"
2+
id("io.micronaut.application") version "4.6.1"
43
}
54

65
version = "0.1"
@@ -12,25 +11,25 @@ repositories {
1211

1312
dependencies {
1413
annotationProcessor("info.picocli:picocli-codegen")
15-
implementation("info.picocli:picocli")
16-
implementation("io.micronaut:micronaut-jackson-databind")
14+
implementation("io.micronaut.serde:micronaut-serde-jackson")
1715
implementation("io.micronaut.picocli:micronaut-picocli")
1816
implementation("jakarta.annotation:jakarta.annotation-api")
1917
runtimeOnly("ch.qos.logback:logback-classic")
20-
implementation("io.micronaut:micronaut-validation")
18+
implementation("io.micronaut.validation:micronaut-validation")
2119

22-
testImplementation("io.micronaut:micronaut-http-client")
20+
testImplementation("io.micronaut:micronaut-http-client-jdk")
2321

24-
implementation("org.apache.logging.log4j:log4j-core:2.15.0")
22+
implementation("org.apache.logging.log4j:log4j-core:2.24.0")
2523
}
2624

2725

2826
application {
2927
mainClass.set("com.example.Demo2Command")
3028
}
3129
java {
32-
sourceCompatibility = JavaVersion.toVersion("11")
33-
targetCompatibility = JavaVersion.toVersion("11")
30+
toolchain {
31+
languageVersion = JavaLanguageVersion.of(17)
32+
}
3433
}
3534

3635
micronaut {

‎enterprise/micronaut/test/unit/data/gradle/artifacts/simple/gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
micronautVersion=3.10.1
1+
micronautVersion=4.9.4

‎enterprise/micronaut/test/unit/data/gradle/artifacts/simple/gradle/wrapper/gradle-wrapper.properties‎

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

‎enterprise/micronaut/test/unit/data/gradle/artifacts/simple/micronaut-cli.yml‎

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

0 commit comments

Comments
 (0)