From 7ae0e24bc7053dfc53aa2870409acf1cd9c914c7 Mon Sep 17 00:00:00 2001 From: Pavel Kargashinsky Date: Tue, 7 Mar 2023 13:35:12 +0100 Subject: [PATCH] [Gradle][Tests][MPP] Bump AGP and Gradle version in MPP related tests --- .../kotlin/gradle/GradleVersionRequired.kt | 3 +- .../kotlin/gradle/HierarchicalMppIT.kt | 4 +++ .../gradle/MPPBuildReproducibilityIT.kt | 6 +++- .../gradle/MppIdeDependencyResolutionIT.kt | 4 +++ .../gradle/android/KotlinAndroidMppIT.kt | 30 +++++++++++++------ ...MultiplatformAndroidSourceSetLayoutV2IT.kt | 8 +++-- .../gradle/mpp/BrokenLazyConfigurationIT.kt | 4 +++ .../kotlin/gradle/mpp/MppCompositeBuildIT.kt | 4 +++ .../kotlin/gradle/mpp/MppDiagnosticsIt.kt | 4 +++ .../gradle/mpp/MppSharedNativeCompileIT.kt | 4 +++ .../jetbrains/kotlin/gradle/mpp/MppTestsIT.kt | 5 +++- .../kotlin/gradle/native/AppleFrameworkIT.kt | 2 +- .../kotlin/gradle/native/CinteropIT.kt | 4 +++ .../kotlin/gradle/native/XCFrameworkIT.kt | 2 +- .../AndroidProject/Android/build.gradle | 5 ++++ .../Android/src/main/AndroidManifest.xml | 1 - .../AndroidProject/Lib/build.gradle | 5 ++++ .../AndroidProject/Test/build.gradle | 5 ++++ .../Test/src/main/AndroidManifest.xml | 2 +- .../AndroidProject/gradle.properties | 1 - .../build.gradle.kts | 1 + .../testProject/kt-49877/build.gradle.kts | 5 ++++ .../build.gradle.kts | 4 +++ .../build.gradle.kts | 5 ++++ .../plainAndroidConsumer/build.gradle.kts | 5 ++++ .../producer/build.gradle.kts | 5 ++++ .../lib/build.gradle.kts | 5 ++++ .../new-mpp-android/app/build.gradle | 5 ++++ .../new-mpp-android/lib/build.gradle | 5 ++++ 29 files changed, 124 insertions(+), 19 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/GradleVersionRequired.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/GradleVersionRequired.kt index 255dc0bb7c3..6dd748f8215 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/GradleVersionRequired.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/GradleVersionRequired.kt @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.gradle import org.gradle.util.GradleVersion import org.jetbrains.kotlin.com.google.common.base.Objects import org.jetbrains.kotlin.gradle.GradleVersionRequired.Companion.OLDEST_SUPPORTED +import org.jetbrains.kotlin.gradle.testbase.TestVersions import org.jetbrains.kotlin.gradle.utils.minSupportedGradleVersion import org.junit.Assume @@ -26,7 +27,7 @@ sealed class GradleVersionRequired(val minVersion: String, val maxVersion: Strin companion object { const val OLDEST_SUPPORTED = minSupportedGradleVersion - val FOR_MPP_SUPPORT = AtLeast(OLDEST_SUPPORTED) + val FOR_MPP_SUPPORT = AtLeast(TestVersions.Gradle.MAX_SUPPORTED) } class Exact(version: String) : GradleVersionRequired(version, version) { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/HierarchicalMppIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/HierarchicalMppIT.kt index 190b84277cc..e21f9d200c5 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/HierarchicalMppIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/HierarchicalMppIT.kt @@ -31,6 +31,10 @@ import kotlin.test.assertTrue import kotlin.test.fail @MppGradlePluginTests +@GradleTestVersions( + maxVersion = TestVersions.Gradle.NEXT_RELEASE, + additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED] +) @DisplayName("Hierarchical multiplatform") open class HierarchicalMppIT : KGPBaseTest() { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MPPBuildReproducibilityIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MPPBuildReproducibilityIT.kt index 4ff5ca8029f..c8aaf4266e2 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MPPBuildReproducibilityIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MPPBuildReproducibilityIT.kt @@ -20,7 +20,11 @@ import kotlin.test.fail class MPPBuildReproducibilityIT : KGPBaseTest() { @GradleTest - @GradleTestVersions(minVersion = TestVersions.Gradle.G_7_0) + @GradleTestVersions( + minVersion = TestVersions.Gradle.G_7_0, + maxVersion = TestVersions.Gradle.NEXT_RELEASE, + additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED] + ) @DisplayName("Check if consecutive builds produce same binaries: Simple Multiplatform project") fun `test simpleMultiplatformProject`(gradleVersion: GradleVersion) { project("MPPBuildReproducibility/simpleMultiplatformProject", gradleVersion) { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MppIdeDependencyResolutionIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MppIdeDependencyResolutionIT.kt index 3bf038b6a74..1d9e1d37f9f 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MppIdeDependencyResolutionIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MppIdeDependencyResolutionIT.kt @@ -30,6 +30,10 @@ import kotlin.test.assertEquals import kotlin.test.fail @MppGradlePluginTests +@GradleTestVersions( + maxVersion = TestVersions.Gradle.NEXT_RELEASE, + additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED] +) @DisplayName("Multiplatform IDE dependency resolution") class MppIdeDependencyResolutionIT : KGPBaseTest() { @GradleTest diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/KotlinAndroidMppIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/KotlinAndroidMppIT.kt index 8e72c40ab36..1ccbff8281e 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/KotlinAndroidMppIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/KotlinAndroidMppIT.kt @@ -26,6 +26,8 @@ import kotlin.test.* @DisplayName("kotlin-android with mpp") @AndroidGradlePluginTests +@AndroidTestVersions(additionalVersions = [TestVersions.AGP.NEXT_RELEASE]) +@GradleTestVersions(maxVersion = TestVersions.Gradle.NEXT_RELEASE, additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED]) class KotlinAndroidMppIT : KGPBaseTest() { @DisplayName("KT-50736: whenEvaluated waits for AGP being applied later") @GradleAndroidTest @@ -71,6 +73,7 @@ class KotlinAndroidMppIT : KGPBaseTest() { android { compileSdkVersion 22 + namespace 'org.jetbrains.kotlin.gradle.test.android.libalfa' } kotlin { android("android") { } } @@ -129,7 +132,6 @@ class KotlinAndroidMppIT : KGPBaseTest() { @DisplayName("mpp source sets are registered in AGP") @GradleAndroidTest - @AndroidTestVersions(minVersion = TestVersions.AGP.AGP_42) fun testAndroidMppSourceSets( gradleVersion: GradleVersion, agpVersion: String, @@ -542,8 +544,6 @@ class KotlinAndroidMppIT : KGPBaseTest() { // AGP max version is limited due to https://youtrack.jetbrains.com/issue/KT-51940/HMPP-resolves-configurations-during-configuration @DisplayName("android app can depend on mpp lib") - @AndroidTestVersions(maxVersion = TestVersions.AGP.AGP_72) - @GradleTestVersions(maxVersion = TestVersions.Gradle.G_7_4) // due AGP version limit ^ @GradleAndroidTest fun testAndroidWithNewMppApp( gradleVersion: GradleVersion, @@ -726,7 +726,10 @@ class KotlinAndroidMppIT : KGPBaseTest() { appBuildScriptBackup + //language=Gradle """ - + + android { + namespace 'app.example.com.lib' + } kotlin.targets.all { compilations.all { attributes.attribute( @@ -741,7 +744,10 @@ class KotlinAndroidMppIT : KGPBaseTest() { appBuildScriptBackup + //language=Gradle """ - + + android { + namespace 'app.example.com.app_sample' + } kotlin.targets.androidApp.compilations.all { attributes.attribute( Attribute.of("com.example.compilation", String), @@ -849,8 +855,11 @@ class KotlinAndroidMppIT : KGPBaseTest() { @DisplayName("produced artifacts are consumable by projects with various AGP versions") @GradleAndroidTest - @AndroidTestVersions(minVersion = TestVersions.AGP.AGP_71) - @GradleTestVersions(minVersion = TestVersions.Gradle.G_7_2) // due AGP version limit ^ + @AndroidTestVersions(minVersion = TestVersions.AGP.AGP_71, additionalVersions = [TestVersions.AGP.NEXT_RELEASE]) + @GradleTestVersions( + minVersion = TestVersions.Gradle.G_7_2, maxVersion = TestVersions.Gradle.NEXT_RELEASE, + additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED] + ) // due AGP version limit ^ fun testAndroidMultiplatformPublicationAGPCompatibility( gradleVersion: GradleVersion, agpVersion: String, @@ -917,8 +926,11 @@ class KotlinAndroidMppIT : KGPBaseTest() { @DisplayName("KT-49877, KT-35916: associate compilation dependencies are passed correctly to android test compilations") @GradleAndroidTest - @AndroidTestVersions(minVersion = TestVersions.AGP.AGP_71) - @GradleTestVersions(minVersion = TestVersions.Gradle.G_7_2) // due AGP version limit ^ + @AndroidTestVersions(minVersion = TestVersions.AGP.AGP_71, additionalVersions = [TestVersions.AGP.NEXT_RELEASE]) + @GradleTestVersions( + minVersion = TestVersions.Gradle.G_7_2, maxVersion = TestVersions.Gradle.NEXT_RELEASE, + additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED] + ) // due AGP version limit ^ fun testAssociateCompilationDependenciesArePassedToAndroidTestCompilations( gradleVersion: GradleVersion, agpVersion: String, diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/MultiplatformAndroidSourceSetLayoutV2IT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/MultiplatformAndroidSourceSetLayoutV2IT.kt index b67882730ac..54ba0ef6a00 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/MultiplatformAndroidSourceSetLayoutV2IT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/MultiplatformAndroidSourceSetLayoutV2IT.kt @@ -17,8 +17,12 @@ class MultiplatformAndroidSourceSetLayoutV2IT : KGPBaseTest() { @GradleAndroidTest @DisplayName("test Android project with flavors") - @AndroidTestVersions(minVersion = "7.0.4") - @GradleTestVersions(minVersion = TestVersions.Gradle.G_7_0) // due AGP version limit ^ + @AndroidTestVersions(minVersion = "7.0.4", additionalVersions = [TestVersions.AGP.NEXT_RELEASE]) + @GradleTestVersions( + minVersion = TestVersions.Gradle.G_7_0, + maxVersion = TestVersions.Gradle.NEXT_RELEASE, + additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED] + ) // due AGP version limit ^ fun testProjectWithFlavors(gradleVersion: GradleVersion, agpVersion: String, jdkVersion: JdkVersions.ProvidedJdk) { project( "multiplatformAndroidSourceSetLayout2", diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/BrokenLazyConfigurationIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/BrokenLazyConfigurationIT.kt index 8493cdd7ec8..ea80cef6a7c 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/BrokenLazyConfigurationIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/BrokenLazyConfigurationIT.kt @@ -10,6 +10,10 @@ import org.jetbrains.kotlin.gradle.testbase.* import org.junit.jupiter.api.DisplayName @MppGradlePluginTests +@GradleTestVersions( + maxVersion = TestVersions.Gradle.NEXT_RELEASE, + additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED] +) @DisplayName("Broken task configuration avoidance doesn't lead to build failures at least with simple setups") class BrokenLazyConfigurationIT : KGPBaseTest() { @GradleTest diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppCompositeBuildIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppCompositeBuildIT.kt index 8aa98cf7cfc..78f48be8f29 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppCompositeBuildIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppCompositeBuildIT.kt @@ -16,6 +16,10 @@ import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.condition.OS @MppGradlePluginTests +@GradleTestVersions( + maxVersion = TestVersions.Gradle.NEXT_RELEASE, + additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED] +) @DisplayName("Tests for multiplatform with composite builds") class MppCompositeBuildIT : KGPBaseTest() { @GradleTest diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppDiagnosticsIt.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppDiagnosticsIt.kt index f87c20e0584..fb5a09ea384 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppDiagnosticsIt.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppDiagnosticsIt.kt @@ -14,6 +14,10 @@ import kotlin.test.assertFalse import kotlin.test.assertTrue @MppGradlePluginTests +@GradleTestVersions( + maxVersion = TestVersions.Gradle.NEXT_RELEASE, + additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED] +) class MppDiagnosticsIt : KGPBaseTest() { @GradleTest fun testDeprecatedProperties(gradleVersion: GradleVersion) { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppSharedNativeCompileIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppSharedNativeCompileIT.kt index eda36563929..b0bc3059bf8 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppSharedNativeCompileIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppSharedNativeCompileIT.kt @@ -15,6 +15,10 @@ import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.fail @MppGradlePluginTests +@GradleTestVersions( + maxVersion = TestVersions.Gradle.NEXT_RELEASE, + additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED] +) @DisplayName("Tests for multiplatform | shared native compilations") class MppSharedNativeCompileIT : KGPBaseTest() { /** diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppTestsIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppTestsIT.kt index 08ab82efa07..af8af993013 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppTestsIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppTestsIT.kt @@ -14,7 +14,10 @@ import org.junit.jupiter.api.DisplayName @DisplayName("Tests for multiplatform testing") class MppTestsIT : KGPBaseTest() { @DisplayName("KT-54634: MPP testing logic is compatible with API changes in Gradle 7.6") - @GradleTestVersions(additionalVersions = [TestVersions.Gradle.G_7_5, TestVersions.Gradle.G_7_6]) + @GradleTestVersions( + maxVersion = TestVersions.Gradle.NEXT_RELEASE, + additionalVersions = [TestVersions.Gradle.G_7_5, TestVersions.Gradle.G_7_6] + ) @GradleTest fun testKt54634(gradleVersion: GradleVersion) { project( diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/AppleFrameworkIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/AppleFrameworkIT.kt index 15b99f1b383..5361b945baf 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/AppleFrameworkIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/AppleFrameworkIT.kt @@ -28,7 +28,7 @@ class AppleFrameworkIT : BaseGradleIT() { override val defaultGradleVersion = GradleVersionRequired.FOR_MPP_SUPPORT override fun defaultBuildOptions() = super.defaultBuildOptions().copy( androidHome = KtTestUtil.findAndroidSdk(), - androidGradlePluginVersion = AGPVersion.v4_2_0 + androidGradlePluginVersion = AGPVersion.v7_4_0 ) @Test diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CinteropIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CinteropIT.kt index 3d1f9a89bab..c5da87e5d0f 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CinteropIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CinteropIT.kt @@ -9,6 +9,10 @@ import org.gradle.util.GradleVersion import org.jetbrains.kotlin.gradle.testbase.* @MppGradlePluginTests +@GradleTestVersions( + maxVersion = TestVersions.Gradle.NEXT_RELEASE, + additionalVersions = [TestVersions.Gradle.MAX_SUPPORTED] +) class CinteropIT : KGPBaseTest() { @GradleTest diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/XCFrameworkIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/XCFrameworkIT.kt index d5fa391e58e..523d1347057 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/XCFrameworkIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/XCFrameworkIT.kt @@ -28,7 +28,7 @@ class XCFrameworkIT : BaseGradleIT() { override val defaultGradleVersion = GradleVersionRequired.FOR_MPP_SUPPORT override fun defaultBuildOptions() = super.defaultBuildOptions().copy( androidHome = KtTestUtil.findAndroidSdk(), - androidGradlePluginVersion = AGPVersion.v4_2_0 + androidGradlePluginVersion = AGPVersion.v7_4_0 ) @Test diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Android/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Android/build.gradle index 9f7ad578ad9..0ccbcd22314 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Android/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Android/build.gradle @@ -5,8 +5,13 @@ plugins { id 'org.jetbrains.kotlin.android' } +java { + toolchain.languageVersion.set(JavaLanguageVersion.of(8)) +} + android { compileSdkVersion 22 + namespace 'org.jetbrains.kotlin.gradle.test.androidalfa' sourceSets { main.java.srcDirs += 'src/main/java2' diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Android/src/main/AndroidManifest.xml b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Android/src/main/AndroidManifest.xml index 2f4f61a15e5..3df33c246de 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Android/src/main/AndroidManifest.xml +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Android/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Lib/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Lib/build.gradle index fa6f52c688a..bae3cf9d4b3 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Lib/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Lib/build.gradle @@ -11,8 +11,13 @@ dependencies { implementation 'com.loopj.android:android-async-http:1.4.9' } +java { + toolchain.languageVersion.set(JavaLanguageVersion.of(8)) +} + android { compileSdkVersion 22 + namespace "org.jetbrains.kotlin.gradle.test.android.libalfa" defaultConfig { minSdkVersion 7 diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Test/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Test/build.gradle index a4cfb0f9584..c82f653856e 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Test/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Test/build.gradle @@ -9,8 +9,13 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } +java { + toolchain.languageVersion.set(JavaLanguageVersion.of(8)) +} + android { compileSdkVersion 22 + namespace 'org.jetbrains.kotlin.gradle.test.android.test' defaultConfig { minSdkVersion 7 diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Test/src/main/AndroidManifest.xml b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Test/src/main/AndroidManifest.xml index b409c91e568..9b65eb06cff 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Test/src/main/AndroidManifest.xml +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Test/src/main/AndroidManifest.xml @@ -1 +1 @@ - + diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/gradle.properties index 59b261a6689..e69de29bb2d 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/gradle.properties +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/gradle.properties @@ -1 +0,0 @@ -org.gradle.jvmargs=-XX:MaxPermSize=512m \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlinToolingMetadataAndroid/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlinToolingMetadataAndroid/build.gradle.kts index e715b49058f..c6b2f62b005 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlinToolingMetadataAndroid/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlinToolingMetadataAndroid/build.gradle.kts @@ -11,6 +11,7 @@ repositories { android { compileSdkVersion(23) + namespace = "kotlin.multiplatform.projects" compileOptions { sourceCompatibility = JavaVersion.VERSION_1_8 diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kt-49877/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kt-49877/build.gradle.kts index 4934fedc981..3dd7c90dc08 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kt-49877/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kt-49877/build.gradle.kts @@ -9,8 +9,13 @@ repositories { google() } +java { + toolchain.languageVersion.set(JavaLanguageVersion.of(8)) +} + android { compileSdk = 30 + namespace = "foo.bar" } kotlin { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformAndroidSourceSetLayout2/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformAndroidSourceSetLayout2/build.gradle.kts index 0a6adc2dc9c..6112b88550d 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformAndroidSourceSetLayout2/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/multiplatformAndroidSourceSetLayout2/build.gradle.kts @@ -7,6 +7,9 @@ plugins { kotlin("multiplatform") } +java { + toolchain.languageVersion.set(JavaLanguageVersion.of(8)) +} android { compileSdk = 31 @@ -14,6 +17,7 @@ android { minSdk = 31 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } + namespace = "org.jetbrains.kotlin.sample" android.flavorDimensions.add("market") android.flavorDimensions.add("price") diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android-agp-compatibility/multiplatformAndroidConsumer/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android-agp-compatibility/multiplatformAndroidConsumer/build.gradle.kts index 5465beeaed6..5388852d19e 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android-agp-compatibility/multiplatformAndroidConsumer/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android-agp-compatibility/multiplatformAndroidConsumer/build.gradle.kts @@ -8,8 +8,13 @@ repositories { mavenCentral() } +java { + toolchain.languageVersion.set(JavaLanguageVersion.of(8)) +} + android { compileSdkVersion(30) + namespace = "com.example.plainAndroidConsumer" } kotlin { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android-agp-compatibility/plainAndroidConsumer/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android-agp-compatibility/plainAndroidConsumer/build.gradle.kts index 918d6bda99a..c717b898001 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android-agp-compatibility/plainAndroidConsumer/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android-agp-compatibility/plainAndroidConsumer/build.gradle.kts @@ -3,8 +3,13 @@ plugins { kotlin("android") } +java { + toolchain.languageVersion.set(JavaLanguageVersion.of(8)) +} + android { compileSdkVersion(30) + namespace = "com.example.plainAndroidConsumer" } repositories { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android-agp-compatibility/producer/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android-agp-compatibility/producer/build.gradle.kts index 66342187ef5..8eaeca68334 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android-agp-compatibility/producer/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android-agp-compatibility/producer/build.gradle.kts @@ -17,8 +17,13 @@ publishing { } } +java { + toolchain.languageVersion.set(JavaLanguageVersion.of(8)) +} + android { compileSdkVersion(30) + namespace = "com.example.producer" } kotlin { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android-source-sets/lib/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android-source-sets/lib/build.gradle.kts index fddf5ddbfab..44791f116b5 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android-source-sets/lib/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android-source-sets/lib/build.gradle.kts @@ -3,8 +3,13 @@ plugins { kotlin("multiplatform") } +java { + toolchain.languageVersion.set(JavaLanguageVersion.of(8)) +} + android { compileSdkVersion(28) + namespace = "io.sellmair.mpp" defaultConfig { minSdkVersion(21) targetSdkVersion(28) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/app/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/app/build.gradle index a4766a0990a..37a0bae96d2 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/app/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/app/build.gradle @@ -4,8 +4,13 @@ apply plugin: 'kotlin-multiplatform' group 'com.example' version '1.0' +java { + toolchain.languageVersion.set(JavaLanguageVersion.of(8)) +} + android { compileSdkVersion 27 + namespace 'app.example.com.app_sample' defaultConfig { applicationId "app.example.com.app_sample" minSdkVersion 21 diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/lib/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/lib/build.gradle index de85b6dcda6..8ba966aa520 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/lib/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/lib/build.gradle @@ -5,8 +5,13 @@ apply plugin: 'maven-publish' group 'com.example' version '1.0' +java { + toolchain.languageVersion.set(JavaLanguageVersion.of(8)) +} + android { compileSdkVersion 27 + namespace 'app.example.com.lib' defaultConfig { minSdkVersion 21