azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch JVM target of the standard libraries to 1.8 #KT-51907

Browse Source
This commit is contained in:
Abduqodiri Qurbonzoda
2022-07-11 22:58:30 +03:00
parent 54980ce0d5
commit 34e50649e8
28 changed files with 44 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/src/main/kotlin/common-configuration.gradle.kts
+2
View File
@@ -141,6 +141,7 @@ fun Project.configureKotlinCompilationOptions() {
val jvmCompilerArgs = listOf(
"-Xno-optimized-callable-references",
"-Xno-kotlin-nothing-value-exception",
// Should this suppression be removed ?
"-Xsuppress-deprecated-jvm-target-warning" // Remove as soon as there are no modules for JDK 1.6 & 1.7
)
@@ -200,6 +201,7 @@ fun Project.configureKotlinCompilationOptions() {
}
}
// Should the workaround be removed ?
// Still compile stdlib, reflect, kotlin.test and scripting runtimes
// with JVM target 1.6 to simplify migration from Kotlin 1.6 to 1.7.
fun Project.applyFixForStdlib16() {
compiler/compiler.version/build.gradle.kts
+1 -1
View File
@@ -7,7 +7,7 @@ plugins {
// This module does not apply Kotlin plugin, so we are setting toolchain via
// java extension
configureJavaOnlyToolchain(JdkMajorVersion.JDK_1_6)
configureJavaOnlyToolchain(JdkMajorVersion.JDK_1_8)
val kotlinVersion: String by rootProject.extra
compiler/tests-common-jvm6/build.gradle.kts
+1 -1
View File
@@ -3,7 +3,7 @@ plugins {
id("jps-compatible")
}
project.updateJvmTarget("1.6")
project.updateJvmTarget("1.6") // Should this project be removed altogether ?
dependencies {
api(kotlinStdlib())
compiler/tests-different-jdk/build.gradle.kts
+1
View File
@@ -50,6 +50,7 @@ fun Project.codegenTest(
group = "verification"
}
// Should the tests with target = 6 be removed ?
codegenTest(
target = 6,
jdk = JdkMajorVersion.JDK_1_8,
core/compiler.common.jvm/build.gradle.kts
+1 -1
View File
@@ -3,7 +3,7 @@ plugins {
id("jps-compatible")
}
project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
project.configureJvmToolchain(JdkMajorVersion.JDK_1_8)
dependencies {
api(project(":core:compiler.common"))
core/compiler.common/build.gradle.kts
+1 -1
View File
@@ -3,7 +3,7 @@ plugins {
id("jps-compatible")
}
project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
project.configureJvmToolchain(JdkMajorVersion.JDK_1_8)
dependencies {
api(project(":core:util.runtime"))
core/descriptors.jvm/build.gradle.kts
+1 -1
View File
@@ -3,7 +3,7 @@ plugins {
id("jps-compatible")
}
project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
project.configureJvmToolchain(JdkMajorVersion.JDK_1_8)
dependencies {
api(project(":kotlin-annotations-jvm"))
core/descriptors.runtime/build.gradle.kts
+1 -11
View File
@@ -5,17 +5,7 @@ plugins {
id("jps-compatible")
}
tasks
.matching { it.name == "compileKotlin" && it is KotlinCompile }
.configureEach {
(this as KotlinCompile).configureTaskToolchain(chooseJdk18ForJpsBuild(JdkMajorVersion.JDK_1_6))
}
tasks
.matching { it.name == "compileJava" && it is JavaCompile }
.configureEach {
(this as JavaCompile).configureTaskToolchain(chooseJdk18ForJpsBuild(JdkMajorVersion.JDK_1_6))
}
project.configureJvmToolchain(JdkMajorVersion.JDK_1_8)
dependencies {
compileOnly(project(":core:util.runtime"))
core/descriptors/build.gradle.kts
+1 -1
View File
@@ -3,7 +3,7 @@ plugins {
id("jps-compatible")
}
project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
project.configureJvmToolchain(JdkMajorVersion.JDK_1_8)
dependencies {
api(project(":core:compiler.common"))
core/deserialization.common.jvm/build.gradle.kts
+1 -1
View File
@@ -3,7 +3,7 @@ plugins {
id("jps-compatible")
}
project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
project.configureJvmToolchain(JdkMajorVersion.JDK_1_8)
dependencies {
api(project(":core:metadata.jvm"))
core/deserialization.common/build.gradle.kts
+1 -1
View File
@@ -3,7 +3,7 @@ plugins {
id("jps-compatible")
}
project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
project.configureJvmToolchain(JdkMajorVersion.JDK_1_8)
dependencies {
api(project(":core:compiler.common"))
core/deserialization/build.gradle.kts
+1 -1
View File
@@ -3,7 +3,7 @@ plugins {
id("jps-compatible")
}
project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
project.configureJvmToolchain(JdkMajorVersion.JDK_1_8)
dependencies {
api(project(":core:metadata"))
core/metadata.jvm/build.gradle.kts
+1 -1
View File
@@ -3,7 +3,7 @@ plugins {
id("jps-compatible")
}
project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
project.configureJvmToolchain(JdkMajorVersion.JDK_1_8)
dependencies {
api(project(":core:metadata"))
core/metadata/build.gradle.kts
+1 -1
View File
@@ -3,7 +3,7 @@ plugins {
id("jps-compatible")
}
project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
project.configureJvmToolchain(JdkMajorVersion.JDK_1_8)
dependencies {
api(protobufLite())
core/util.runtime/build.gradle.kts
+1 -1
View File
@@ -3,7 +3,7 @@ plugins {
id("jps-compatible")
}
project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
project.configureJvmToolchain(JdkMajorVersion.JDK_1_8)
dependencies {
compileOnly(kotlinStdlib())
libraries/kotlin.test/annotations-common/build.gradle
+1 -1
View File
@@ -2,7 +2,7 @@ description = 'Kotlin Test Annotations Common'
apply plugin: 'kotlin-platform-common'
JvmToolchain.updateJvmTarget(project, "1.6")
JvmToolchain.updateJvmTarget(project, "1.8")
dependencies {
api kotlinStdlib("common")
libraries/kotlin.test/common/build.gradle
+1 -1
View File
@@ -2,7 +2,7 @@ description = 'Kotlin Test Common'
apply plugin: 'kotlin-platform-common'
JvmToolchain.updateJvmTarget(project, "1.6")
JvmToolchain.updateJvmTarget(project, "1.8")
dependencies {
api kotlinStdlib("common")
libraries/kotlin.test/junit/build.gradle
+1 -1
View File
@@ -2,7 +2,7 @@ description = 'Kotlin Test JUnit'
apply plugin: 'kotlin-platform-jvm'
JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_6)
JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_8)
def includeJava9 = BuildPropertiesExtKt.getIncludeJava9(project.kotlinBuildProperties)
libraries/kotlin.test/jvm/build.gradle
+1 -1
View File
@@ -4,7 +4,7 @@ apply plugin: 'kotlin-platform-jvm'
archivesBaseName = 'kotlin-test'
JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_6)
JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_8)
def includeJava9 = BuildPropertiesExtKt.getIncludeJava9(project.kotlinBuildProperties)
libraries/kotlin.test/testng/build.gradle
+1 -2
View File
@@ -2,8 +2,7 @@ description = 'Kotlin Test TestNG'
apply plugin: 'kotlin-platform-jvm'
JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_7)
JvmToolchain.updateJvmTarget(project, "1.6")
JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_8)
def includeJava9 = BuildPropertiesExtKt.getIncludeJava9(project.kotlinBuildProperties)
libraries/stdlib/common/build.gradle
+1 -1
View File
@@ -4,7 +4,7 @@ apply plugin: 'kotlin-platform-common'
configurePublishing(project)
JvmToolchain.updateJvmTarget(project, "1.6")
JvmToolchain.updateJvmTarget(project, "1.8")
def commonSrcDir = "../src"
def commonTestSrcDir = "../test"
libraries/stdlib/jdk7/build.gradle
+1 -2
View File
@@ -2,8 +2,7 @@ description = 'Kotlin Standard Library JDK 7 extension'
apply plugin: 'kotlin'
JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_7)
JvmToolchain.updateJvmTarget(project, "1.6")
JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_8)
configurePublishing(project)
configureSourcesJar()
libraries/stdlib/jvm-minimal-for-test/build.gradle.kts
+1 -1
View File
@@ -7,7 +7,7 @@ plugins {
`maven-publish`
}
project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
project.configureJvmToolchain(JdkMajorVersion.JDK_1_8)
val builtins by configurations.creating {
isCanBeResolved = true
libraries/stdlib/jvm/build.gradle
+1 -1
View File
@@ -4,7 +4,7 @@ apply plugin: 'kotlin-platform-jvm'
archivesBaseName = 'kotlin-stdlib'
JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_6)
JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_8)
configurePublishing(project)
configureJavadocJar()
libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt
+16
View File
@@ -321,6 +321,7 @@ 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
@@ -380,6 +381,7 @@ 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
@@ -439,6 +441,7 @@ 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
@@ -498,6 +501,7 @@ 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
@@ -598,6 +602,7 @@ 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;
@@ -629,13 +634,18 @@ 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 <init> ()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;
@@ -648,9 +658,15 @@ 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;
libraries/tools/kotlin-annotations-jvm/build.gradle
+1 -1
View File
@@ -2,7 +2,7 @@ description = 'Kotlin annotations for JVM'
apply plugin: 'kotlin'
JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_6)
JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_8)
configurePublishing(project)
libraries/tools/mutability-annotations-compat/build.gradle.kts
+1 -1
View File
@@ -5,7 +5,7 @@ plugins {
id("jps-compatible")
}
project.updateJvmTarget("1.6")
project.updateJvmTarget("1.8")
sourceSets {
"main" { projectDefault() }
libraries/tools/script-runtime/build.gradle
+1 -1
View File
@@ -2,7 +2,7 @@ description 'Kotlin Script Runtime'
apply plugin: 'kotlin'
JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_6)
JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_8)
configurePublishing(project)