Skip to content

Commit d615edb

Browse files
CristianGMSpace Team
CristianGM
authored and
Space Team
committed
Gradle 8.11
1 parent 94a2612 commit d615edb

File tree

11 files changed

+36
-30
lines changed

11 files changed

+36
-30
lines changed

‎build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,7 @@ allprojects {
553553
afterEvaluate {
554554
configurations.all {
555555
// Remove kotlin-compiler from dependencies during Idea import. KTI-1598
556-
if (dependencies.removeIf { (it as? ProjectDependency)?.dependencyProject?.path == ":kotlin-compiler" }) {
556+
if (dependencies.removeIf { (it as? ProjectDependency)?.path == ":kotlin-compiler" }) {
557557
logger.warn("Removed :kotlin-compiler project dependency from $this")
558558
}
559559
}

‎gradle/verification-metadata.xml

+18-18
Original file line numberDiff line numberDiff line change
@@ -3666,10 +3666,10 @@
36663666
<sha256 value="4a6a9f483388d461b81aa9a28c685b8b74c0597993bf1884b04eddbca95f48fe" origin="Generated by Gradle"/>
36673667
</artifact>
36683668
</component>
3669-
<component group="org.gradle.kotlin" name="gradle-kotlin-dsl-plugins" version="4.4.0">
3670-
<artifact name="gradle-kotlin-dsl-plugins-4.4.0.jar">
3671-
<md5 value="a1299c8860d7de6cd5a51dcbb9264302" origin="Generated by Gradle"/>
3672-
<sha256 value="918fea73b249301cbf0c030d70acc023759fce377ad30b6c203d53870a61689c" origin="Generated by Gradle"/>
3669+
<component group="org.gradle.kotlin" name="gradle-kotlin-dsl-plugins" version="5.1.1">
3670+
<artifact name="gradle-kotlin-dsl-plugins-5.1.1.jar">
3671+
<md5 value="e9b6cd04cac72794f5ae0cb1aab6aba8" origin="Generated by Gradle"/>
3672+
<sha256 value="1f7e211c4372dec94727bd82270a39438778b9049fa165baf80bb8ffe6878f23" origin="Generated by Gradle"/>
36733673
</artifact>
36743674
</component>
36753675
<component group="org.gradle.toolchains" name="foojay-resolver" version="0.4.0">
@@ -4184,10 +4184,10 @@
41844184
<sha256 value="77f311ca1384811d519fda389fcb1268bdaa058d605046e0ede76c03b0df3e97" origin="Generated by Gradle"/>
41854185
</artifact>
41864186
</component>
4187-
<component group="org.jetbrains.kotlin" name="kotlin-reflect" version="1.9.23">
4188-
<artifact name="kotlin-reflect-1.9.23.jar">
4189-
<md5 value="08f576baf497678c7a08b5cd14bc707a" origin="Generated by Gradle"/>
4190-
<sha256 value="747c2927a623b6ebb734b465d6a26862e920ddd1828ef43716887c0849a3131f" origin="Generated by Gradle"/>
4187+
<component group="org.jetbrains.kotlin" name="kotlin-reflect" version="2.0.20">
4188+
<artifact name="kotlin-reflect-2.0.20.jar">
4189+
<md5 value="787b941725eb2db0618c9e22c6c83080" origin="Generated by Gradle"/>
4190+
<sha256 value="18f451e6b4b7bd1d1f9d60849c3cbf160e115302f97a2008c190d505c439c670" origin="Generated by Gradle"/>
41914191
</artifact>
41924192
</component>
41934193
<component group="org.jetbrains.kotlin" name="kotlin-reflect" version="2.1.20-dev-3305">
@@ -4344,16 +4344,6 @@
43444344
<sha256 value="6abe146c27864138b874ccccfe5f534e3eb923c99a1b7b5d45494ee5694f3e0a" origin="Generated by Gradle"/>
43454345
</artifact>
43464346
</component>
4347-
<component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="1.9.23">
4348-
<artifact name="kotlin-stdlib-1.9.23-all.jar">
4349-
<md5 value="4468f2ad5cecac0c0c2639699aafcfc1" origin="Generated by Gradle"/>
4350-
<sha256 value="cec38bc3302e72a8aaf9cde436b5a9071ee0331e2ad05e84d8bb897334d7e9d4" origin="Generated by Gradle"/>
4351-
</artifact>
4352-
<artifact name="kotlin-stdlib-1.9.23.jar">
4353-
<md5 value="cb64a3d7f5b6f2ac37fe1532a3c1b2ef" origin="Generated by Gradle"/>
4354-
<sha256 value="8910cc238807d86ef550cb1f0b10dd5ed40b35a4ec1a52525f760aede84ead37" origin="Generated by Gradle"/>
4355-
</artifact>
4356-
</component>
43574347
<component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="1.9.24">
43584348
<artifact name="kotlin-stdlib-1.9.24.jar">
43594349
<md5 value="bfbb362013fc67d71fb0c9655c7cc308" origin="Generated by Gradle"/>
@@ -4370,6 +4360,16 @@
43704360
<sha256 value="240938c4aab8e73e888703e3e7d3f87383ffe5bd536d6d5e3c100d4cd0379fcf" origin="Generated by Gradle"/>
43714361
</artifact>
43724362
</component>
4363+
<component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="2.0.20">
4364+
<artifact name="kotlin-stdlib-2.0.20-all.jar">
4365+
<md5 value="e7e10f7c657d520b39dde64e22cc0d6a" origin="Generated by Gradle"/>
4366+
<sha256 value="50ffadeb20b4d2456a526595a4f7a9e85889682715073e6cdba1b1d80e3ad458" origin="Generated by Gradle"/>
4367+
</artifact>
4368+
<artifact name="kotlin-stdlib-2.0.20.jar">
4369+
<md5 value="1ff18c14651c34e7fdcd2de19b5c923d" origin="Generated by Gradle"/>
4370+
<sha256 value="fb169596659a518357c4b2c16f43dc75ab1c4980565ed4b4a317a050e5e39006" origin="Generated by Gradle"/>
4371+
</artifact>
4372+
</component>
43734373
<component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="2.0.20-RC">
43744374
<artifact name="kotlin-stdlib-2.0.20-RC.jar">
43754375
<md5 value="70d14545f769c0674dab9464916f2333" origin="Generated by Gradle"/>

‎gradle/wrapper/gradle-wrapper.jar

51 Bytes
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
3+
distributionSha256Sum=57dafb5c2622c6cc08b993c85b7c06956a2f53536432a30ead46166dbca0f1e9
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

‎gradlew

+4-1
Original file line numberDiff line numberDiff line change
@@ -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
#
@@ -84,7 +86,8 @@ 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
90+
' "$PWD" ) || exit
8891

8992
# Use the maximum available, or set MAX_FD != -1 to use that value.
9093
MAX_FD=maximum

‎gradlew.bat

+2
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 ##########################################################################

‎libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/ConfigurationsTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ class ConfigurationsTest : MultiplatformExtensionTest() {
100100

101101
commonMainApi.assertHasDependency("project notation of :lib:outputConfiguration") {
102102
this is ProjectDependency &&
103-
dependencyProject == lib &&
103+
path == lib.path &&
104104
targetConfiguration == "outputConfiguration"
105105
}
106106

‎libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/KT58280JvmWithJavaTestCompileClasspath.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class KT58280JvmWithJavaTestCompileClasspath {
4141
val kotlin = project.kotlinJvmExtension
4242

4343
/* This kind of association is not required for java: java plugin handles this separately */
44-
kotlin.target.compilations.test.internal.configurations.compileDependencyConfiguration.resolvedConfiguration.files.forEach { file ->
44+
kotlin.target.compilations.test.internal.configurations.compileDependencyConfiguration.incoming.files.forEach { file ->
4545
if (file in kotlin.target.compilations.main.output.allOutputs) {
4646
fail("Unexpected file in test compile dependencies: $file")
4747
}

‎libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/CInteropCommonizerConfigurationTests.kt

+3-2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
package org.jetbrains.kotlin.gradle.unitTests
99

10+
import org.gradle.api.Project
1011
import org.gradle.api.artifacts.Configuration
1112
import org.gradle.api.artifacts.ProjectDependency
1213
import org.gradle.kotlin.dsl.dependencies
@@ -172,9 +173,9 @@ class CInteropCommonizerConfigurationTests {
172173
if (linuxMainCinterop == commonMainCinterop)
173174
fail("Expected different source sets have different resolvable Cinterop configurations")
174175

175-
fun Configuration.allProjectDependencies() = allDependencies
176+
fun Configuration.allProjectDependencies(): Set<Project?> = allDependencies
176177
.filterIsInstance<ProjectDependency>()
177-
.map { it.dependencyProject }
178+
.map { project.project(it.path) }
178179
.toSet()
179180

180181
if (commonMainCinterop.allProjectDependencies() != setOf(producerAProject))

‎repo/gradle-build-conventions/asm-deprecating-transformer/src/main/kotlin/org/jetbrains/kotlin/build/asm/AsmDeprecationExtension.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
1111
import org.gradle.api.DefaultTask
1212
import org.gradle.api.GradleException
1313
import org.gradle.api.file.ArchiveOperations
14-
import org.gradle.api.internal.file.archive.ZipCopyAction
14+
import org.gradle.api.internal.file.archive.ZipEntryConstants.CONSTANT_TIME_FOR_ZIP_ENTRIES
1515
import org.gradle.api.tasks.Copy
1616
import org.gradle.api.tasks.TaskContainer
1717
import org.gradle.api.tasks.util.PatternSet
@@ -75,15 +75,15 @@ abstract class AsmDeprecationExtension {
7575
val newBytes = classWriter.toByteArray()
7676
val newEntry = ZipEntry(path)
7777
if (!isPreserveFileTimestamps) {
78-
newEntry.time = ZipCopyAction.CONSTANT_TIME_FOR_ZIP_ENTRIES
78+
newEntry.time = CONSTANT_TIME_FOR_ZIP_ENTRIES
7979
}
8080
intermediateZipFile.putNextEntry(newEntry)
8181
intermediateZipFile.write(newBytes)
8282
intermediateZipFile.closeEntry()
8383
} else {
8484
val newEntry = ZipEntry(if (isDirectory) "$path/" else path)
8585
if (!isPreserveFileTimestamps) {
86-
newEntry.time = ZipCopyAction.CONSTANT_TIME_FOR_ZIP_ENTRIES
86+
newEntry.time = CONSTANT_TIME_FOR_ZIP_ENTRIES
8787
}
8888
intermediateZipFile.putNextEntry(newEntry)
8989
if (!isDirectory) {

‎repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/jps.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ if (kotlinBuildProperties.isInJpsBuildIdeaSync) {
207207

208208
val dependencyProjects = configuration
209209
?.dependencies
210-
?.mapNotNull { (it as? ProjectDependency)?.dependencyProject }
210+
?.mapNotNull { (it as? ProjectDependency)?.let { project.project(it.path)} }
211211

212212
dependencies {
213213
dependencyProjects?.forEach { dependencyProject ->

0 commit comments

Comments
 (0)