[Gradle] Enabled downloading k/n from maven in all functional tests #KT-69902 Fixed
diff --git a/libraries/tools/kotlin-compose-compiler/src/functionalTest/kotlin/org/jetbrains/kotlin/compose/compiler/gradle/testUtils/functionalTestDsl.kt b/libraries/tools/kotlin-compose-compiler/src/functionalTest/kotlin/org/jetbrains/kotlin/compose/compiler/gradle/testUtils/functionalTestDsl.kt index 979c270..e8c3d4f 100644 --- a/libraries/tools/kotlin-compose-compiler/src/functionalTest/kotlin/org/jetbrains/kotlin/compose/compiler/gradle/testUtils/functionalTestDsl.kt +++ b/libraries/tools/kotlin-compose-compiler/src/functionalTest/kotlin/org/jetbrains/kotlin/compose/compiler/gradle/testUtils/functionalTestDsl.kt
@@ -24,7 +24,6 @@ .build() .also { it.enableDependencyVerification(false) - disableDownloadingKonanFromMavenCentral(it) } .apply(configureProject) .let { it as ProjectInternal } @@ -51,13 +50,6 @@ code() } -inline val ExtensionAware.extraProperties: ExtraPropertiesExtension - get() = extensions.extraProperties - -// TODO(Dmitrii Krasnov): we can remove this, when downloading konan from maven local will be possible KT-63198 -internal fun disableDownloadingKonanFromMavenCentral(project: Project) { - project.extraProperties.set("kotlin.native.distribution.downloadFromMaven", "false") -} fun Project.applyKotlinJvmPlugin() { project.plugins.apply(KotlinPluginWrapper::class.java)
diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/KT71398KotlinNativeBundleConfigurationOnUnsupportedPlatform.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/KT71398KotlinNativeBundleConfigurationOnUnsupportedPlatform.kt index fbfe006..d483b25 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/KT71398KotlinNativeBundleConfigurationOnUnsupportedPlatform.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/KT71398KotlinNativeBundleConfigurationOnUnsupportedPlatform.kt
@@ -19,10 +19,7 @@ @Test fun `KT-71398 - project with multiplatform plugin should not add kotlinNativeBundleConfiguration`() { Assume.assumeTrue(!HostManager.hostIsMac) - val project = buildProjectWithMPP(preApplyCode = { - project.extraProperties.set("kotlin.native.distribution.downloadFromMaven", "true") - project.extraProperties.set("kotlin.native.toolchain.enabled", "true") - }) { + val project = buildProjectWithMPP { val kotlin = project.multiplatformExtension kotlin.macosArm64() }
diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/KotlinJvmFunctionalTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/KotlinJvmFunctionalTest.kt index 22dee5b..41c6737 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/KotlinJvmFunctionalTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/regressionTests/KotlinJvmFunctionalTest.kt
@@ -43,10 +43,7 @@ @Test fun `KT-66750 - check that disabled native toolchain flag in subproject does not affect root project`() { - val project = buildProjectWithJvm(preApplyCode = { - project.extraProperties.set("kotlin.native.distribution.downloadFromMaven", "true") - project.extraProperties.set("kotlin.native.toolchain.enabled", "true") - }) + val project = buildProjectWithJvm() project.evaluate()
diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/KotlinNativeToolchainTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/KotlinNativeToolchainTest.kt index 19aceb0..fd91a98 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/KotlinNativeToolchainTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/KotlinNativeToolchainTest.kt
@@ -79,6 +79,5 @@ private fun Project.setUpKotlinNativeToolchainWithStableVersion() { project.extraProperties.set("kotlin.native.version", STABLE_VERSION) - project.extraProperties.set("kotlin.native.distribution.downloadFromMaven", true) } } \ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/KotlinTargetVariantResourcesResolutionTests.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/KotlinTargetVariantResourcesResolutionTests.kt index f02975e..5718b2a 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/KotlinTargetVariantResourcesResolutionTests.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/KotlinTargetVariantResourcesResolutionTests.kt
@@ -27,6 +27,7 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.resources.resolve.KotlinTargetResourcesResolutionStrategy import org.jetbrains.kotlin.gradle.plugin.mpp.resources.resourcesPublicationExtension import org.jetbrains.kotlin.gradle.plugin.usageByName +import org.jetbrains.kotlin.gradle.targets.native.toolchain.KotlinNativeBundleArtifactFormat import org.jetbrains.kotlin.gradle.util.* import org.junit.Test import java.io.File @@ -475,9 +476,14 @@ val variantPath = { "$resolvableConfiguration -> $resolvedComponent -> $variant" } val typedUsage = variant.attributes.getAttribute(Usage.USAGE_ATTRIBUTE) val stringUsage = variant.attributes.getAttribute(Attribute.of(Usage.USAGE_ATTRIBUTE.name, String::class.java)) + val isKotlinNativeBundleConfiguration = + variant.attributes.getAttribute(KotlinNativeBundleArtifactFormat.attribute) + ?: variant.attributes.getAttribute( + Attribute.of(KotlinNativeBundleArtifactFormat.attribute.name, String::class.java) + ) val isKotlinCompilerClasspath = variant.attributes.keySet().isEmpty() assert( - typedUsage != null || stringUsage != null || isKotlinCompilerClasspath, + typedUsage != null || stringUsage != null || isKotlinNativeBundleConfiguration != null || isKotlinCompilerClasspath, variantPath ) assert(
diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/diagnosticsTests/KonanHomeConflictDeclarationCheckerTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/diagnosticsTests/KonanHomeConflictDeclarationCheckerTest.kt index f66ebd3..559ad66 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/diagnosticsTests/KonanHomeConflictDeclarationCheckerTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/diagnosticsTests/KonanHomeConflictDeclarationCheckerTest.kt
@@ -22,7 +22,6 @@ project.extraProperties.set(NativeProperties.NATIVE_HOME.name, "kotlin_naitve_home_non_existed_path") project.extraProperties.set(NativeProperties.KONAN_DATA_DIR.name, "konan_data_dir_non_existed_path") }) { - project.extraProperties.set("kotlin.native.distribution.downloadFromMaven", "true") project.multiplatformExtension.applyDefaultHierarchyTemplate() project.multiplatformExtension.linuxX64() } @@ -35,7 +34,6 @@ preApplyCode = { project.extraProperties.set(NativeProperties.KONAN_DATA_DIR.name, "build/konan") }) { - project.extraProperties.set("kotlin.native.distribution.downloadFromMaven", "true") project.multiplatformExtension.applyDefaultHierarchyTemplate() project.multiplatformExtension.linuxX64() }
diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/diagnosticsTests/NativeVersionDiagnosticTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/diagnosticsTests/NativeVersionDiagnosticTest.kt index 3a9b4e9..1b2df9a 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/diagnosticsTests/NativeVersionDiagnosticTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/diagnosticsTests/NativeVersionDiagnosticTest.kt
@@ -16,7 +16,6 @@ val project = buildProjectWithJvm( preApplyCode = { project.extraProperties.set("kotlin.native.version", nativeVersion) - project.extraProperties.set("kotlin.native.distribution.downloadFromMaven", true) } ) project.evaluate()
diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/buildProject.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/buildProject.kt index 5b974b6..f48d6a5 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/buildProject.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/buildProject.kt
@@ -39,7 +39,6 @@ .apply(projectBuilder) .build() .also { - disableDownloadingKonanFromMavenCentral(it) it.enableDependencyVerification(false) } .apply(configureProject)
diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/propertiesUtils.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/propertiesUtils.kt deleted file mode 100644 index 9dcf982..0000000 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/propertiesUtils.kt +++ /dev/null
@@ -1,14 +0,0 @@ -/* - * 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.gradle.api.Project -import org.jetbrains.kotlin.gradle.plugin.extraProperties - -// TODO(Dmitrii Krasnov): we can remove this, when downloading konan from maven local will be possible KT-63198 -internal fun disableDownloadingKonanFromMavenCentral(project: Project) { - project.extraProperties.set("kotlin.native.distribution.downloadFromMaven", "false") -} \ No newline at end of file