Skip to content

Commit 2de1978

Browse files
renovate[bot]gabrielittner
renovate[bot]
and
gabrielittner
authored
Update Gradle (#1362)
* Update Gradle * support * set max gradle version for min agp version * Kotlin 2.2.0 is incompatoble with Gradle 9.7 * fix version * leftover Gradle 9.6.0 rcs * add test report --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Gabriel Ittner <gabriel.ittner@gmail.com>
1 parent 6f03e46 commit 2de1978

11 files changed

Lines changed: 35 additions & 42 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,12 @@ jobs:
4343
- name: Build with Gradle
4444
run: ./gradlew build --stacktrace -PtestJavaVersion=${{ matrix.test_java_version }} -PtestConfigMethod=${{ matrix.test_config_method }}
4545

46+
- name: Publish Test Report
47+
uses: mikepenz/action-junit-report@v6
48+
if: success() || failure()
49+
with:
50+
report_paths: '**/build/test-results/**/TEST-*.xml'
51+
4652
# Status check that is required in branch protection rules.
4753
build-status:
4854
needs:

‎gradle/alpha.versions.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[versions]
2-
gradle = "9.5.0-rc-3"
2+
gradle = "9.7.0-milestone-1"
33

44
kotlin = "2.4.0"
55

‎gradle/beta.versions.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[versions]
2-
gradle = "9.5.0-rc-3"
2+
gradle = "9.6.0"
33

44
kotlin = "2.4.0"
55

‎gradle/libs.versions.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ minGradle = "9.0.0"
44
minAgp = "8.13.0"
55
minKgp = "2.2.0"
66

7-
gradle = "9.4.1"
7+
gradle = "9.6.0"
88

99
kotlin = "2.4.0"
1010

‎gradle/rc.versions.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[versions]
2-
gradle = "9.5.0-rc-3"
2+
gradle = "9.6.0"
33

44
kotlin = "2.4.0"
55

‎gradle/wrapper/gradle-wrapper.jar‎

-504 Bytes
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=2ab2958f2a1e51120c326cad6f385153bb11ee93b3c216c5fccebfdfbb7ec6cb
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
3+
distributionSha256Sum=bbaeb2fef8710818cf0e261201dab964c572f92b942812df0c3620d62a529a01
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.0-bin.zip
55
networkTimeout=10000
6+
retries=0
7+
retryBackOffMs=500
68
validateDistributionUrl=true
79
zipStoreBase=GRADLE_USER_HOME
810
zipStorePath=wrapper/dists

‎gradlew‎

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

‎gradlew.bat‎

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

‎plugin/build.gradle.kts‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ val integrationTestSourceSet = sourceSets.create("integrationTest") {
3737
compileClasspath += configurations.testRuntimeClasspath.get()
3838
runtimeClasspath += output + compileClasspath
3939
}
40-
val integrationTestImplementation by configurations.getting {
40+
val integrationTestImplementation = configurations.getByName("integrationTestImplementation") {
4141
extendsFrom(configurations.testImplementation.get())
4242
}
4343

@@ -121,7 +121,7 @@ tasks.validatePlugins {
121121
enableStricterValidation = true
122122
}
123123

124-
val integrationTest by tasks.registering(Test::class) {
124+
val integrationTest = tasks.register("integrationTest", Test::class) {
125125
dependsOn(
126126
tasks.publishToMavenLocal,
127127
project(projects.centralPortal.path).tasks.publishToMavenLocal,
@@ -158,12 +158,6 @@ val integrationTest by tasks.registering(Test::class) {
158158
"java.base/java.util=ALL-UNNAMED",
159159
)
160160

161-
beforeTest(
162-
closureOf<TestDescriptor> {
163-
logger.lifecycle("Running test: ${this.className} ${this.displayName}")
164-
},
165-
)
166-
167161
develocity {
168162
testRetry {
169163
if (providers.environmentVariable("CI").isPresent) {

0 commit comments

Comments
 (0)