[Gradle] Fix Android tests for Jvm Toolchain

^KT-59587 In Progress
This commit is contained in:
Yahor Berdnikau
2023-06-28 10:01:45 +02:00
committed by Space Team
parent d433d1eb3f
commit 05ce873d2a
3 changed files with 12 additions and 6 deletions
@@ -529,7 +529,6 @@ class KotlinJavaToolchainTest : KGPBaseTest() {
@AndroidGradlePluginTests @AndroidGradlePluginTests
@DisplayName("Toolchain should take into account kotlin options that are set via android extension") @DisplayName("Toolchain should take into account kotlin options that are set via android extension")
@AndroidTestVersions(minVersion = TestVersions.AGP.AGP_42)
@GradleAndroidTest @GradleAndroidTest
internal fun kotlinOptionsAndroidAndToolchain( internal fun kotlinOptionsAndroidAndToolchain(
gradleVersion: GradleVersion, gradleVersion: GradleVersion,
@@ -729,8 +728,7 @@ class KotlinJavaToolchainTest : KGPBaseTest() {
} }
@AndroidGradlePluginTests @AndroidGradlePluginTests
@DisplayName("Toolchain should not override Jvm taget configured via kotlinOptions in android project") @DisplayName("Toolchain should not override Jvm target configured via kotlinOptions in android project")
@AndroidTestVersions(minVersion = TestVersions.AGP.AGP_42)
@GradleAndroidTest @GradleAndroidTest
internal fun kotlinOptionsAndroidAndToolchainNotOverrideJvmTarget( internal fun kotlinOptionsAndroidAndToolchainNotOverrideJvmTarget(
gradleVersion: GradleVersion, gradleVersion: GradleVersion,
@@ -751,6 +749,15 @@ class KotlinJavaToolchainTest : KGPBaseTest() {
""".trimMargin() """.trimMargin()
) )
// Otherwise jvm target validation on Gradle 8+ will fail
//language=properties
gradleProperties.append(
"""
# suppress inspection "UnusedProperty"
kotlin.jvm.target.validation.mode = warning
""".trimIndent()
)
build(":compileDebugKotlin") { build(":compileDebugKotlin") {
assertTasksExecuted(":compileDebugKotlin") assertTasksExecuted(":compileDebugKotlin")
assertCompilerArgument(":compileDebugKotlin", "-jvm-target 11") assertCompilerArgument(":compileDebugKotlin", "-jvm-target 11")
@@ -11,6 +11,7 @@ repositories {
android { android {
compileSdkVersion 30 compileSdkVersion 30
namespace "com.example.myapplication"
defaultConfig { defaultConfig {
applicationId "com.example.myapplication" applicationId "com.example.myapplication"
minSdkVersion 30 minSdkVersion 30
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest <manifest xmlns:android="http://schemas.android.com/apk/res/android">
xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.myapplication">
<application <application
android:name="example.App"> android:name="example.App">