From db1ee743aeed10ff316fb1a41ea0a34fedc7946a Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Thu, 10 Aug 2023 15:36:25 +0200 Subject: [PATCH] [Gradle] Adjust functionalTests for stdlib-jdk7, stdlib-jdk8 constraint to 1.8.0 ^KT-60901 Verification Pending --- ...deJvmAndAndroidDependencyResolutionTest.kt | 3 +-- ...ansformedMetadataDependencyResolverTest.kt | 6 ++--- .../util/ideDependencyResolutionTestUtils.kt | 23 +++++++++++++++++++ 3 files changed, 26 insertions(+), 6 deletions(-) create mode 100644 libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/ideDependencyResolutionTestUtils.kt diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeJvmAndAndroidDependencyResolutionTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeJvmAndAndroidDependencyResolutionTest.kt index 030a43763c4..462dee92669 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeJvmAndAndroidDependencyResolutionTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeJvmAndAndroidDependencyResolutionTest.kt @@ -174,8 +174,7 @@ class IdeJvmAndAndroidDependencyResolutionTest { binaryCoordinates("com.arkivanov.mvikotlin:mvikotlin-jvm:3.2.1"), binaryCoordinates("com.arkivanov.essenty:lifecycle-jvm:1.0.0"), binaryCoordinates("com.arkivanov.essenty:instance-keeper-jvm:1.0.0"), - binaryCoordinates("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kgpVersion"), - binaryCoordinates("org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kgpVersion"), + legacyStdlibJdkDependencies(), binaryCoordinates("org.jetbrains.kotlin:kotlin-stdlib:$kgpVersion"), binaryCoordinates("org.jetbrains:annotations:13.0"), ) diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeTransformedMetadataDependencyResolverTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeTransformedMetadataDependencyResolverTest.kt index 462c9f2304e..cdc339ca7bc 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeTransformedMetadataDependencyResolverTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeTransformedMetadataDependencyResolverTest.kt @@ -102,16 +102,14 @@ class IdeTransformedMetadataDependencyResolverTest { val kgpVersion = project.getKotlinPluginVersion() commonMain.binaryDependencies().assertMatches( binaryCoordinates("com.squareup.okio:okio-jvm:3.2.0"), - binaryCoordinates("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kgpVersion"), - binaryCoordinates("org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kgpVersion"), + legacyStdlibJdkDependencies(), binaryCoordinates("org.jetbrains.kotlin:kotlin-stdlib:$kgpVersion"), binaryCoordinates("org.jetbrains:annotations:13.0"), ) commonTest.binaryDependencies().assertMatches( binaryCoordinates("com.squareup.okio:okio-jvm:3.2.0"), - binaryCoordinates("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kgpVersion"), - binaryCoordinates("org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kgpVersion"), + legacyStdlibJdkDependencies(), binaryCoordinates("org.jetbrains.kotlin:kotlin-stdlib:$kgpVersion"), binaryCoordinates("org.jetbrains:annotations:13.0"), ) diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/ideDependencyResolutionTestUtils.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/ideDependencyResolutionTestUtils.kt new file mode 100644 index 00000000000..2641f1970ad --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/ideDependencyResolutionTestUtils.kt @@ -0,0 +1,23 @@ +/* + * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.gradle.util + +import org.jetbrains.kotlin.gradle.idea.testFixtures.tcs.binaryCoordinates + +/** + * Legacy -jdk8 and -jdk7 dependencies: + * Those artifacts will be published as empty jars starting from Kotlin 1.8.0 as + * the classes will be included in the kotlin-stdlib artifact already. + * + * Note: The kotlin-stdlib will add a constraint to always resolve 1.8.0 of those artifacts. + * This will be necessary in the future, when no more jdk8 or jdk7 artifacts will be published: + * In this case we need to still resolve to a version that will contain empty artifacts (1.8.0) + * + */ +fun legacyStdlibJdkDependencies(version: String = "1.8.0") = listOf( + binaryCoordinates("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version"), + binaryCoordinates("org.jetbrains.kotlin:kotlin-stdlib-jdk7:$version"), +)