Added explicitApi tests: positive and negative cases Remove minVersion to run tests on all AGP versions Set min AGP to 8.13 and migrate to buildScriptInjection Improve readability Add js target, improve coverage and code optimization Move to external android target test folder Added more test cases Updated asserts and namings Split warning test on implicit declarations
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/externalAndroidTarget/ExplicitApiExternalAndroidTargetIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/externalAndroidTarget/ExplicitApiExternalAndroidTargetIT.kt new file mode 100644 index 0000000..d50917b --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/externalAndroidTarget/ExplicitApiExternalAndroidTargetIT.kt
@@ -0,0 +1,410 @@ +/* + * Copyright 2010-2026 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.android.externalAndroidTarget + +import com.android.build.api.dsl.androidLibrary +import org.gradle.api.logging.LogLevel +import org.gradle.kotlin.dsl.kotlin +import org.gradle.util.GradleVersion +import org.jetbrains.kotlin.gradle.testbase.* + +@AndroidTestVersions(minVersion = TestVersions.AGP.AGP_813) +@AndroidGradlePluginTests +class ExplicitApiExternalAndroidTargetIT : KGPBaseTest() { + + @GradleAndroidTest + fun `test - disabled - builds with implicit declarations`( + gradleVersion: GradleVersion, androidVersion: String, jdkVersion: JdkVersions.ProvidedJdk, + ) { + project( + "empty", + gradleVersion, + buildOptions = defaultBuildOptions.copy(androidVersion = androidVersion), + buildJdk = jdkVersion.location, + ) { + plugins { + kotlin("multiplatform") + id("com.android.kotlin.multiplatform.library") + } + buildScriptInjection { + kotlinMultiplatform.apply { + androidLibrary { + compileSdk = 34 + namespace = "org.jetbrains.sample" + } + iosArm64() + } + } + buildScriptInjection { + val androidMain = kotlinMultiplatform.sourceSets.getByName("androidMain") + androidMain.compileSource( + """ + import android.content.Context + + class AndroidMain(val context: Context) { + val counter = 0 + fun increment() = counter + 1 + } + """.trimIndent() + ) + } + build(":compileAndroidMain") { + assertTasksExecuted(":compileAndroidMain") + assertNoCompilerArgument(":compileAndroidMain", "-Xexplicit-api=", LogLevel.INFO) + } + } + } + + @GradleAndroidTest + fun `test - strict - fails with implicit declarations in androidMain`( + gradleVersion: GradleVersion, androidVersion: String, jdkVersion: JdkVersions.ProvidedJdk, + ) { + project( + "empty", + gradleVersion, + buildOptions = defaultBuildOptions.copy(androidVersion = androidVersion), + buildJdk = jdkVersion.location, + ) { + plugins { + kotlin("multiplatform") + id("com.android.kotlin.multiplatform.library") + } + buildScriptInjection { + kotlinMultiplatform.apply { + androidLibrary { + compileSdk = 34 + namespace = "org.jetbrains.sample" + } + iosArm64() + explicitApi() + } + } + buildScriptInjection { + val commonMain = kotlinMultiplatform.sourceSets.getByName("commonMain") + commonMain.compileSource( + """ + public object CommonMain { + public val greeting: String = "Hello" + public fun greet(name: String): String = "${'$'}greeting, ${'$'}name" + } + """.trimIndent() + ) + val androidMain = kotlinMultiplatform.sourceSets.getByName("androidMain") + androidMain.compileSource( + """ + import android.content.Context + + class AndroidMain(val context: Context) { + fun increment() = 1 + } + """.trimIndent() + ) + } + build(":compileCommonMainKotlinMetadata") { + assertTasksExecuted(":compileCommonMainKotlinMetadata") + assertCompilerArgument(":compileCommonMainKotlinMetadata", "-Xexplicit-api=strict", LogLevel.INFO) + assertOutputDoesNotContain("Visibility must be specified in explicit API mode") + assertOutputDoesNotContain("Return type must be specified in explicit API mode") + } + buildAndFail(":compileAndroidMain") { + assertTasksFailed(":compileAndroidMain") + assertCompilerArgument(":compileAndroidMain", "-Xexplicit-api=strict", LogLevel.INFO) + assertOutputContains("Visibility must be specified in explicit API mode") + assertOutputContains("Return type must be specified in explicit API mode") + } + } + } + + @GradleAndroidTest + fun `test - strict - fails with implicit declarations in commonMain`( + gradleVersion: GradleVersion, androidVersion: String, jdkVersion: JdkVersions.ProvidedJdk, + ) { + project( + "empty", + gradleVersion, + buildOptions = defaultBuildOptions.copy(androidVersion = androidVersion), + buildJdk = jdkVersion.location, + ) { + plugins { + kotlin("multiplatform") + id("com.android.kotlin.multiplatform.library") + } + buildScriptInjection { + kotlinMultiplatform.apply { + androidLibrary { + compileSdk = 34 + namespace = "org.jetbrains.sample" + } + iosArm64() + explicitApi() + } + } + buildScriptInjection { + val commonMain = kotlinMultiplatform.sourceSets.getByName("commonMain") + commonMain.compileSource( + """ + val version = 1 + fun compute() = version + 1 + """.trimIndent() + ) + val androidMain = kotlinMultiplatform.sourceSets.getByName("androidMain") + androidMain.compileSource( + """ + import android.content.Context + + public class AndroidMain(public val context: Context) { + public fun increment(): Int = 1 + } + """.trimIndent() + ) + } + buildAndFail(":compileCommonMainKotlinMetadata") { + assertTasksFailed(":compileCommonMainKotlinMetadata") + assertCompilerArgument(":compileCommonMainKotlinMetadata", "-Xexplicit-api=strict", LogLevel.INFO) + assertOutputContains("Visibility must be specified in explicit API mode") + assertOutputContains("Return type must be specified in explicit API mode") + } + buildAndFail(":compileAndroidMain") { + assertTasksFailed(":compileAndroidMain") + assertCompilerArgument(":compileAndroidMain", "-Xexplicit-api=strict", LogLevel.INFO) + assertOutputContains("Visibility must be specified in explicit API mode") + assertOutputContains("Return type must be specified in explicit API mode") + } + } + } + + @GradleAndroidTest + fun `test - warning - warns on implicit declarations in androidMain`( + gradleVersion: GradleVersion, androidVersion: String, jdkVersion: JdkVersions.ProvidedJdk, + ) { + project( + "empty", + gradleVersion, + buildOptions = defaultBuildOptions.copy(androidVersion = androidVersion), + buildJdk = jdkVersion.location, + ) { + plugins { + kotlin("multiplatform") + id("com.android.kotlin.multiplatform.library") + } + buildScriptInjection { + kotlinMultiplatform.apply { + androidLibrary { + compileSdk = 34 + namespace = "org.jetbrains.sample" + } + iosArm64() + explicitApiWarning() + } + } + buildScriptInjection { + val commonMain = kotlinMultiplatform.sourceSets.getByName("commonMain") + commonMain.compileSource( + """ + public object CommonMain { + public val greeting: String = "Hello" + public fun greet(name: String): String = "${'$'}greeting, ${'$'}name" + } + """.trimIndent() + ) + val androidMain = kotlinMultiplatform.sourceSets.getByName("androidMain") + androidMain.compileSource( + """ + import android.content.Context + + class AndroidMain(val context: Context) { + fun increment() = 1 + } + """.trimIndent() + ) + } + build(":compileCommonMainKotlinMetadata") { + assertTasksExecuted(":compileCommonMainKotlinMetadata") + assertCompilerArgument(":compileCommonMainKotlinMetadata", "-Xexplicit-api=warning", LogLevel.INFO) + assertOutputDoesNotContain("Visibility must be specified in explicit API mode") + assertOutputDoesNotContain("Return type must be specified in explicit API mode") + } + build(":compileAndroidMain") { + assertTasksExecuted(":compileAndroidMain") + assertCompilerArgument(":compileAndroidMain", "-Xexplicit-api=warning", LogLevel.INFO) + assertOutputContains("Visibility must be specified in explicit API mode") + assertOutputContains("Return type must be specified in explicit API mode") + } + } + } + + @GradleAndroidTest + fun `test - warning - warns on implicit declarations in commonMain`( + gradleVersion: GradleVersion, androidVersion: String, jdkVersion: JdkVersions.ProvidedJdk, + ) { + project( + "empty", + gradleVersion, + buildOptions = defaultBuildOptions.copy(androidVersion = androidVersion), + buildJdk = jdkVersion.location, + ) { + plugins { + kotlin("multiplatform") + id("com.android.kotlin.multiplatform.library") + } + buildScriptInjection { + kotlinMultiplatform.apply { + androidLibrary { + compileSdk = 34 + namespace = "org.jetbrains.sample" + } + iosArm64() + explicitApiWarning() + } + } + buildScriptInjection { + val commonMain = kotlinMultiplatform.sourceSets.getByName("commonMain") + commonMain.compileSource( + """ + val version = 1 + fun compute() = version + 1 + """.trimIndent() + ) + val androidMain = kotlinMultiplatform.sourceSets.getByName("androidMain") + androidMain.compileSource( + """ + import android.content.Context + + public class AndroidMain(public val context: Context) { + public fun increment(): Int = 1 + } + """.trimIndent() + ) + } + build(":compileCommonMainKotlinMetadata") { + assertTasksExecuted(":compileCommonMainKotlinMetadata") + assertCompilerArgument(":compileCommonMainKotlinMetadata", "-Xexplicit-api=warning", LogLevel.INFO) + assertOutputContains("Visibility must be specified in explicit API mode") + assertOutputContains("Return type must be specified in explicit API mode") + } + build(":compileAndroidMain") { + assertTasksExecuted(":compileAndroidMain") + assertCompilerArgument(":compileAndroidMain", "-Xexplicit-api=warning", LogLevel.INFO) + assertOutputContains("Visibility must be specified in explicit API mode") + assertOutputContains("Return type must be specified in explicit API mode") + } + } + } + + @GradleAndroidTest + fun `test - warning - builds on explicit declarations`( + gradleVersion: GradleVersion, androidVersion: String, jdkVersion: JdkVersions.ProvidedJdk, + ) { + project( + "empty", + gradleVersion, + buildOptions = defaultBuildOptions.copy(androidVersion = androidVersion), + buildJdk = jdkVersion.location, + ) { + plugins { + kotlin("multiplatform") + id("com.android.kotlin.multiplatform.library") + } + buildScriptInjection { + kotlinMultiplatform.apply { + androidLibrary { + compileSdk = 34 + namespace = "org.jetbrains.sample" + } + iosArm64() + explicitApiWarning() + } + } + buildScriptInjection { + val commonMain = kotlinMultiplatform.sourceSets.getByName("commonMain") + commonMain.compileSource( + """ + public object CommonMain { + public fun greet(name: String): String = name + } + """.trimIndent() + ) + val androidMain = kotlinMultiplatform.sourceSets.getByName("androidMain") + androidMain.compileSource( + """ + public class AndroidMain { + public fun increment(): Int = 1 + } + """.trimIndent() + ) + } + build(":compileCommonMainKotlinMetadata") { + assertTasksExecuted(":compileCommonMainKotlinMetadata") + assertCompilerArgument(":compileCommonMainKotlinMetadata", "-Xexplicit-api=warning", LogLevel.INFO) + assertOutputDoesNotContain("Visibility must be specified in explicit API mode") + assertOutputDoesNotContain("Return type must be specified in explicit API mode") + } + build(":compileAndroidMain") { + assertTasksExecuted(":compileAndroidMain") + assertCompilerArgument(":compileAndroidMain", "-Xexplicit-api=warning", LogLevel.INFO) + assertOutputDoesNotContain("Visibility must be specified in explicit API mode") + assertOutputDoesNotContain("Return type must be specified in explicit API mode") + } + } + } + + @GradleAndroidTest + fun `test - strict - builds on explicit declarations`( + gradleVersion: GradleVersion, androidVersion: String, jdkVersion: JdkVersions.ProvidedJdk, + ) { + project( + "empty", + gradleVersion, + buildOptions = defaultBuildOptions.copy(androidVersion = androidVersion), + buildJdk = jdkVersion.location, + ) { + plugins { + kotlin("multiplatform") + id("com.android.kotlin.multiplatform.library") + } + buildScriptInjection { + kotlinMultiplatform.apply { + androidLibrary { + compileSdk = 34 + namespace = "org.jetbrains.sample" + } + iosArm64() + explicitApi() + } + } + buildScriptInjection { + val commonMain = kotlinMultiplatform.sourceSets.getByName("commonMain") + commonMain.compileSource( + """ + public object CommonMain { + public fun greet(name: String): String = name + } + """.trimIndent() + ) + val androidMain = kotlinMultiplatform.sourceSets.getByName("androidMain") + androidMain.compileSource( + """ + public class AndroidMain { + public fun increment(): Int = 1 + } + """.trimIndent() + ) + } + build(":compileCommonMainKotlinMetadata") { + assertTasksExecuted(":compileCommonMainKotlinMetadata") + assertCompilerArgument(":compileCommonMainKotlinMetadata", "-Xexplicit-api=strict", LogLevel.INFO) + assertOutputDoesNotContain("Visibility must be specified in explicit API mode") + assertOutputDoesNotContain("Return type must be specified in explicit API mode") + } + build(":compileAndroidMain") { + assertTasksExecuted(":compileAndroidMain") + assertCompilerArgument(":compileAndroidMain", "-Xexplicit-api=strict", LogLevel.INFO) + assertOutputDoesNotContain("Visibility must be specified in explicit API mode") + assertOutputDoesNotContain("Return type must be specified in explicit API mode") + } + } + } +}
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/ExternalAndroidTargetIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/externalAndroidTarget/ExternalAndroidTargetIT.kt similarity index 99% rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/ExternalAndroidTargetIT.kt rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/externalAndroidTarget/ExternalAndroidTargetIT.kt index 56ec719..28a035a 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/ExternalAndroidTargetIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/externalAndroidTarget/ExternalAndroidTargetIT.kt
@@ -3,7 +3,7 @@ * 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.android +package org.jetbrains.kotlin.gradle.android.externalAndroidTarget import org.gradle.api.provider.ValueSource import org.gradle.api.provider.ValueSourceParameters