Skip to content

Commit 1d3689f

Browse files
committed
Upgraded Gradle version to 9.0.0
1 parent bf381a2 commit 1d3689f

File tree

9 files changed

+37
-27
lines changed

9 files changed

+37
-27
lines changed

bom/build.gradle.kts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ publishing {
4848
}
4949

5050
fun DefaultMavenPublication.unsetModuleDescriptorGenerator() {
51-
@Suppress("NULL_FOR_NONNULL_TYPE")
52-
val generator: TaskProvider<Task?> = null
53-
setModuleDescriptorGenerator(generator)
51+
// TODO fix the migration issue
52+
// @Suppress("NULL_FOR_NONNULL_TYPE")
53+
// val generator: TaskProvider<Task?> = null
54+
// setModuleDescriptorGenerator(generator)
5455
}

buildSrc/src/main/kotlin/Java9Modularity.kt

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -138,10 +138,11 @@ object Java9Modularity {
138138
source(compileTask.map { it.sources })
139139
source(compileTask.map { it.javaSources })
140140
// part of work-around for https://youtrack.jetbrains.com/issue/KT-60541
141-
source(compileTask.map {
142-
@Suppress("INVISIBLE_MEMBER")
143-
it.scriptSources
144-
})
141+
// TODO fix the migration issue
142+
// source(compileTask.map {
143+
// @Suppress("INVISIBLE_MEMBER")
144+
// it.scriptSources
145+
// })
145146
source(sourceFile)
146147
destinationDirectory.set(temporaryDir)
147148
multiPlatformEnabled.set(compileTask.get().multiPlatformEnabled)
@@ -178,11 +179,12 @@ object Java9Modularity {
178179
@Suppress("DEPRECATION")
179180
if (taskKotlinLanguageVersion.get() < KotlinVersion.KOTLIN_2_0) {
180181
// part of work-around for https://youtrack.jetbrains.com/issue/KT-60541
181-
@Suppress("INVISIBLE_MEMBER")
182-
commonSourceSet.from(compileTask.map {
183-
@Suppress("INVISIBLE_MEMBER")
184-
it.commonSourceSet
185-
})
182+
// TODO fix the migration issue
183+
// @Suppress("INVISIBLE_MEMBER")
184+
// commonSourceSet.from(compileTask.map {
185+
// @Suppress("INVISIBLE_MEMBER")
186+
// it.commonSourceSet
187+
// })
186188
} else {
187189
multiplatformStructure.refinesEdges.set(compileTask.flatMap { it.multiplatformStructure.refinesEdges })
188190
multiplatformStructure.fragments.set(compileTask.flatMap { it.multiplatformStructure.fragments })

formats/protobuf/proto-test-model/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ protobuf {
2121
java.toolchain.languageVersion.set(JavaLanguageVersion.of(8))
2222

2323
tasks.clean {
24-
delete(protobuf.protobuf.generatedFilesBaseDir)
24+
delete(protobuf.generatedFilesBaseDir)
2525
}
2626

2727
sourceSets.main {

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ kover = "0.8.2"
44
dokka = "2.0.0"
55
knit = "0.5.0"
66
bcv = "0.16.2"
7-
animalsniffer = "1.7.1"
8-
protobuf = "0.8.19"
7+
animalsniffer = "2.0.1"
8+
protobuf = "0.9.5"
99
shadow = "8.1.1"
1010
jmh = "0.7.2"
1111
jmh-core = "1.37"

gradle/wrapper/gradle-wrapper.jar

1.96 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=544c35d6bd849ae8a5ed0bcea39ba677dc40f49df7d1835561582da2009b961d
4-
distributionUrl=https\://cache-redirector.jetbrains.com/services.gradle.org/distributions/gradle-8.7-bin.zip
3+
distributionSha256Sum=8fad3d78296ca518113f3d29016617c7f9367dc005f932bd9d93bf45ba46072b
4+
distributionUrl=https\://cache-redirector.jetbrains.com/services.gradle.org/distributions/gradle-9.0.0-bin.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

33
#
4-
# Copyright © 2015-2021 the original authors.
4+
# Copyright © 2015 the original authors.
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
1820

1921
##############################################################################
2022
#
@@ -55,7 +57,7 @@
5557
# Darwin, MinGW, and NonStop.
5658
#
5759
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
60+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5961
# within the Gradle project.
6062
#
6163
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,7 @@ done
8486
# shellcheck disable=SC2034
8587
APP_BASE_NAME=${0##*/}
8688
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87-
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
8890

8991
# Use the maximum available, or set MAX_FD != -1 to use that value.
9092
MAX_FD=maximum
@@ -112,7 +114,7 @@ case "$( uname )" in #(
112114
NONSTOP* ) nonstop=true ;;
113115
esac
114116

115-
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
117+
CLASSPATH="\\\"\\\""
116118

117119

118120
# Determine the Java command to use to start the JVM.
@@ -203,15 +205,15 @@ fi
203205
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
204206

205207
# Collect all arguments for the java command:
206-
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
208+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
207209
# and any embedded shellness will be escaped.
208210
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
209211
# treated as '${Hostname}' itself on the command line.
210212

211213
set -- \
212214
"-Dorg.gradle.appname=$APP_BASE_NAME" \
213215
-classpath "$CLASSPATH" \
214-
org.gradle.wrapper.GradleWrapperMain \
216+
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
215217
"$@"
216218

217219
# Stop when "xargs" is not available.

gradlew.bat

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
@rem See the License for the specific language governing permissions and
1414
@rem limitations under the License.
1515
@rem
16+
@rem SPDX-License-Identifier: Apache-2.0
17+
@rem
1618

1719
@if "%DEBUG%"=="" @echo off
1820
@rem ##########################################################################
@@ -68,11 +70,11 @@ goto fail
6870
:execute
6971
@rem Setup the command line
7072

71-
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
73+
set CLASSPATH=
7274

7375

7476
@rem Execute Gradle
75-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
77+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
7678

7779
:end
7880
@rem End local scope for the variables with windows NT shell

rules/rules-integration-tests/build.gradle.kts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import com.android.tools.r8.*
22
import com.android.tools.r8.origin.*
3+
import org.gradle.kotlin.dsl.support.serviceOf
34
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
45

56
/*
@@ -124,11 +125,13 @@ val extractBaseJarTask = tasks.register<Task>("extractBaseJar") {
124125
jdkBinDir.resolve("jmod")
125126
}
126127

127-
exec {
128+
// using internal `serviceOf` https://github.com/gradle/gradle/issues/34483
129+
serviceOf<ExecOperations>().exec {
128130
commandLine(jmodFile.absolutePath, "extract", baseJmod.absolutePath, "--dir", extractDir.absolutePath)
129131
}
130132
// pack class-files into jar
131-
exec {
133+
// using internal `serviceOf` https://github.com/gradle/gradle/issues/34483
134+
serviceOf<ExecOperations>().exec {
132135
commandLine(
133136
"jar",
134137
"--create",

0 commit comments

Comments
 (0)