From 12d3ef41dc85c6215e9dc4c29ec14de43ada1288 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Tue, 30 Aug 2022 22:29:06 +0200 Subject: [PATCH] Use older JDK toolchains for compiling stdlib and stdlib-jdk7 To prevent using newer JDK API in kotlin sources of these projects. Note that java sources (of stdlib mainly) are still compiled with JDK 8. #KT-51907 --- libraries/stdlib/jdk7/build.gradle | 2 ++ libraries/stdlib/jvm/build.gradle | 2 ++ .../kotlin-stdlib-runtime-merged.txt | 16 ---------------- 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/libraries/stdlib/jdk7/build.gradle b/libraries/stdlib/jdk7/build.gradle index 65dfcc577ce..3d0399f67fc 100644 --- a/libraries/stdlib/jdk7/build.gradle +++ b/libraries/stdlib/jdk7/build.gradle @@ -57,6 +57,8 @@ artifacts { } compileKotlin { + kotlinJavaToolchain.toolchain.use(JvmToolchain.getToolchainLauncherFor(project, JdkMajorVersion.JDK_1_7)) + kotlinOptions.jvmTarget = "1.8" kotlinOptions.freeCompilerArgs = [ "-Xallow-kotlin-package", "-Xmultifile-parts-inherit", diff --git a/libraries/stdlib/jvm/build.gradle b/libraries/stdlib/jvm/build.gradle index f56b1284e07..9bdf312695a 100644 --- a/libraries/stdlib/jvm/build.gradle +++ b/libraries/stdlib/jvm/build.gradle @@ -105,7 +105,9 @@ DexMethodCountKt.dexMethodCount(project) { task -> } compileKotlin { + kotlinJavaToolchain.toolchain.use(JvmToolchain.getToolchainLauncherFor(project, JdkMajorVersion.JDK_1_6)) kotlinOptions { + jvmTarget = "1.8" freeCompilerArgs = [ "-Xallow-kotlin-package", "-Xmultifile-parts-inherit", diff --git a/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt b/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt index 381e0a1b6a0..f2283dc353c 100644 --- a/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt +++ b/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt @@ -321,7 +321,6 @@ public final class kotlin/UByteArray : java/util/Collection, kotlin/jvm/internal public static fun iterator-impl ([B)Ljava/util/Iterator; public fun remove (Ljava/lang/Object;)Z public fun removeAll (Ljava/util/Collection;)Z - public fun removeIf (Ljava/util/function/Predicate;)Z public fun retainAll (Ljava/util/Collection;)Z public static final fun set-VurrAj0 ([BIB)V public synthetic fun size ()I @@ -381,7 +380,6 @@ public final class kotlin/UIntArray : java/util/Collection, kotlin/jvm/internal/ public static fun iterator-impl ([I)Ljava/util/Iterator; public fun remove (Ljava/lang/Object;)Z public fun removeAll (Ljava/util/Collection;)Z - public fun removeIf (Ljava/util/function/Predicate;)Z public fun retainAll (Ljava/util/Collection;)Z public static final fun set-VXSXFK8 ([III)V public synthetic fun size ()I @@ -441,7 +439,6 @@ public final class kotlin/ULongArray : java/util/Collection, kotlin/jvm/internal public static fun iterator-impl ([J)Ljava/util/Iterator; public fun remove (Ljava/lang/Object;)Z public fun removeAll (Ljava/util/Collection;)Z - public fun removeIf (Ljava/util/function/Predicate;)Z public fun retainAll (Ljava/util/Collection;)Z public static final fun set-k8EXiF4 ([JIJ)V public synthetic fun size ()I @@ -501,7 +498,6 @@ public final class kotlin/UShortArray : java/util/Collection, kotlin/jvm/interna public static fun iterator-impl ([S)Ljava/util/Iterator; public fun remove (Ljava/lang/Object;)Z public fun removeAll (Ljava/util/Collection;)Z - public fun removeIf (Ljava/util/function/Predicate;)Z public fun retainAll (Ljava/util/Collection;)Z public static final fun set-01HTLdE ([SIS)V public synthetic fun size ()I @@ -602,7 +598,6 @@ public abstract class kotlin/collections/AbstractCollection : java/util/Collecti public abstract fun iterator ()Ljava/util/Iterator; public fun remove (Ljava/lang/Object;)Z public fun removeAll (Ljava/util/Collection;)Z - public fun removeIf (Ljava/util/function/Predicate;)Z public fun retainAll (Ljava/util/Collection;)Z public final fun size ()I public fun toArray ()[Ljava/lang/Object; @@ -634,18 +629,13 @@ public abstract class kotlin/collections/AbstractList : kotlin/collections/Abstr public fun listIterator ()Ljava/util/ListIterator; public fun listIterator (I)Ljava/util/ListIterator; public fun remove (I)Ljava/lang/Object; - public fun replaceAll (Ljava/util/function/UnaryOperator;)V public fun set (ILjava/lang/Object;)Ljava/lang/Object; - public fun sort (Ljava/util/Comparator;)V public fun subList (II)Ljava/util/List; } public abstract class kotlin/collections/AbstractMap : java/util/Map, kotlin/jvm/internal/markers/KMappedMarker { protected fun ()V public fun clear ()V - public fun compute (Ljava/lang/Object;Ljava/util/function/BiFunction;)Ljava/lang/Object; - public fun computeIfAbsent (Ljava/lang/Object;Ljava/util/function/Function;)Ljava/lang/Object; - public fun computeIfPresent (Ljava/lang/Object;Ljava/util/function/BiFunction;)Ljava/lang/Object; public fun containsKey (Ljava/lang/Object;)Z public fun containsValue (Ljava/lang/Object;)Z public final fun entrySet ()Ljava/util/Set; @@ -658,15 +648,9 @@ public abstract class kotlin/collections/AbstractMap : java/util/Map, kotlin/jvm public fun hashCode ()I public fun isEmpty ()Z public final fun keySet ()Ljava/util/Set; - public fun merge (Ljava/lang/Object;Ljava/lang/Object;Ljava/util/function/BiFunction;)Ljava/lang/Object; public fun put (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; public fun putAll (Ljava/util/Map;)V - public fun putIfAbsent (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; public fun remove (Ljava/lang/Object;)Ljava/lang/Object; - public fun remove (Ljava/lang/Object;Ljava/lang/Object;)Z - public fun replace (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; - public fun replace (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z - public fun replaceAll (Ljava/util/function/BiFunction;)V public final fun size ()I public fun toString ()Ljava/lang/String; public final fun values ()Ljava/util/Collection;