[Metadata] Use kotlinc 1.8 as max supported and 1.6 as min-supported This will move kotlinc 1.5 to our old bot testing. Fixed: b/266177488 Change-Id: I8d4428b92958266d2f2563a07ce022629472f135
diff --git a/src/test/java/com/android/tools/r8/KotlinCompilerTool.java b/src/test/java/com/android/tools/r8/KotlinCompilerTool.java index 737e8bd..36f3b07 100644 --- a/src/test/java/com/android/tools/r8/KotlinCompilerTool.java +++ b/src/test/java/com/android/tools/r8/KotlinCompilerTool.java
@@ -64,10 +64,11 @@ KOTLINC_1_5_0("kotlin-compiler-1.5.0"), KOTLINC_1_6_0("kotlin-compiler-1.6.0"), KOTLINC_1_7_0("kotlin-compiler-1.7.0"), + KOTLINC_1_8_0("kotlin-compiler-1.8.0"), KOTLIN_DEV("kotlin-compiler-dev"); - public static final KotlinCompilerVersion MIN_SUPPORTED_VERSION = KOTLINC_1_5_0; - public static final KotlinCompilerVersion MAX_SUPPORTED_VERSION = KOTLINC_1_7_0; + public static final KotlinCompilerVersion MIN_SUPPORTED_VERSION = KOTLINC_1_6_0; + public static final KotlinCompilerVersion MAX_SUPPORTED_VERSION = KOTLINC_1_8_0; private final String folder;
diff --git a/src/test/java/com/android/tools/r8/debug/KotlinStdLibCompilationTest.java b/src/test/java/com/android/tools/r8/debug/KotlinStdLibCompilationTest.java index abe31f8..2376a81 100644 --- a/src/test/java/com/android/tools/r8/debug/KotlinStdLibCompilationTest.java +++ b/src/test/java/com/android/tools/r8/debug/KotlinStdLibCompilationTest.java
@@ -10,6 +10,7 @@ import com.android.tools.r8.CompilationMode; import com.android.tools.r8.DiagnosticsMatcher; import com.android.tools.r8.KotlinCompilerTool.KotlinCompiler; +import com.android.tools.r8.KotlinCompilerTool.KotlinCompilerVersion; import com.android.tools.r8.KotlinTestParameters; import com.android.tools.r8.TestBase; import com.android.tools.r8.TestParameters; @@ -50,7 +51,7 @@ .setMinApi(parameters.getApiLevel()) .compileWithExpectedDiagnostics( diagnostics -> { - if (kotlinTestParameters.isKotlinDev() + if (kotlinTestParameters.isNewerThanOrEqualTo(KotlinCompilerVersion.KOTLINC_1_8_0) && parameters.isDexRuntime() && parameters.getApiLevel().isLessThan(AndroidApiLevel.N)) { diagnostics.assertWarningsCount(2); @@ -75,7 +76,8 @@ .setMode(CompilationMode.DEBUG) .setMinApi(parameters.getApiLevel()) .applyIf( - parameters.isCfRuntime() && kotlinTestParameters.isKotlinDev(), + parameters.isCfRuntime() + && kotlinTestParameters.isNewerThanOrEqualTo(KotlinCompilerVersion.KOTLINC_1_8_0), TestShrinkerBuilder::addDontWarnJavaLangInvokeLambdaMetadataFactory) .compile() .assertAllWarningMessagesMatch(equalTo("Resource 'META-INF/MANIFEST.MF' already exists."));
diff --git a/src/test/java/com/android/tools/r8/kotlin/ProcessKotlinStdlibTest.java b/src/test/java/com/android/tools/r8/kotlin/ProcessKotlinStdlibTest.java index 214b507..0095c21 100644 --- a/src/test/java/com/android/tools/r8/kotlin/ProcessKotlinStdlibTest.java +++ b/src/test/java/com/android/tools/r8/kotlin/ProcessKotlinStdlibTest.java
@@ -5,6 +5,7 @@ import static org.hamcrest.CoreMatchers.equalTo; +import com.android.tools.r8.KotlinCompilerTool.KotlinCompilerVersion; import com.android.tools.r8.KotlinTestBase; import com.android.tools.r8.KotlinTestParameters; import com.android.tools.r8.TestParameters; @@ -41,7 +42,9 @@ .addLibraryFiles(ToolHelper.getAndroidJar(AndroidApiLevel.LATEST)) .addKeepRules(rules) .applyIf( - notShrinking && kotlinParameters.isKotlinDev() && parameters.isCfRuntime(), + notShrinking + && kotlinParameters.isNewerThanOrEqualTo(KotlinCompilerVersion.KOTLINC_1_8_0) + && parameters.isCfRuntime(), TestShrinkerBuilder::addDontWarnJavaLangInvokeLambdaMetadataFactory) .addKeepAttributes(ProguardKeepAttributes.SIGNATURE) .addKeepAttributes(ProguardKeepAttributes.INNER_CLASSES)
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteDelegatedPropertyTest.java b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteDelegatedPropertyTest.java index 87dc848..7b07978 100644 --- a/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteDelegatedPropertyTest.java +++ b/src/test/java/com/android/tools/r8/kotlin/metadata/MetadataRewriteDelegatedPropertyTest.java
@@ -5,7 +5,7 @@ package com.android.tools.r8.kotlin.metadata; import static com.android.tools.r8.KotlinCompilerTool.KotlinCompilerVersion.KOTLINC_1_4_20; -import static com.android.tools.r8.KotlinCompilerTool.KotlinCompilerVersion.KOTLINC_1_7_0; +import static com.android.tools.r8.KotlinCompilerTool.KotlinCompilerVersion.KOTLINC_1_8_0; import static com.android.tools.r8.utils.codeinspector.Matchers.isPresent; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.MatcherAssert.assertThat; @@ -130,7 +130,7 @@ .setOutputPath(temp.newFolder().toPath()) .compileRaw(); Assert.assertEquals(1, compileResult.exitCode); - if (kotlinParameters.isNewerThan(KOTLINC_1_7_0)) { + if (kotlinParameters.isNewerThan(KOTLINC_1_8_0)) { assertThat( compileResult.stderr, containsString("the feature \"references to synthetic java properties\""));
diff --git a/src/test/java/com/android/tools/r8/kotlin/reflection/KotlinReflectTest.java b/src/test/java/com/android/tools/r8/kotlin/reflection/KotlinReflectTest.java index 6078cef..ab2f10d 100644 --- a/src/test/java/com/android/tools/r8/kotlin/reflection/KotlinReflectTest.java +++ b/src/test/java/com/android/tools/r8/kotlin/reflection/KotlinReflectTest.java
@@ -5,6 +5,7 @@ package com.android.tools.r8.kotlin.reflection; import static com.android.tools.r8.KotlinCompilerTool.KotlinCompilerVersion.KOTLINC_1_3_72; +import static com.android.tools.r8.KotlinCompilerTool.KotlinCompilerVersion.KOTLINC_1_8_0; import static org.junit.Assume.assumeTrue; import com.android.tools.r8.DexIndexedConsumer.ArchiveConsumer; @@ -100,7 +101,7 @@ .allowDiagnosticMessages() .allowUnusedDontWarnKotlinReflectJvmInternal(kotlinc.isNot(KOTLINC_1_3_72)) .applyIf( - parameters.isCfRuntime() && kotlinParameters.isKotlinDev(), + parameters.isCfRuntime() && kotlinParameters.isNewerThanOrEqualTo(KOTLINC_1_8_0), TestShrinkerBuilder::addDontWarnJavaLangInvokeLambdaMetadataFactory) .compile() .assertNoErrorMessages()