Skip to content

Commit 34e5064

Browse files
author
Abduqodiri Qurbonzoda
committed
Switch JVM target of the standard libraries to 1.8 #KT-51907
1 parent 54980ce commit 34e5064

File tree

28 files changed

+44
-37
lines changed

28 files changed

+44
-37
lines changed

‎buildSrc/src/main/kotlin/common-configuration.gradle.kts

+2
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ fun Project.configureKotlinCompilationOptions() {
141141
val jvmCompilerArgs = listOf(
142142
"-Xno-optimized-callable-references",
143143
"-Xno-kotlin-nothing-value-exception",
144+
// Should this suppression be removed ?
144145
"-Xsuppress-deprecated-jvm-target-warning" // Remove as soon as there are no modules for JDK 1.6 & 1.7
145146
)
146147

@@ -200,6 +201,7 @@ fun Project.configureKotlinCompilationOptions() {
200201
}
201202
}
202203

204+
// Should the workaround be removed ?
203205
// Still compile stdlib, reflect, kotlin.test and scripting runtimes
204206
// with JVM target 1.6 to simplify migration from Kotlin 1.6 to 1.7.
205207
fun Project.applyFixForStdlib16() {

‎compiler/compiler.version/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ plugins {
77

88
// This module does not apply Kotlin plugin, so we are setting toolchain via
99
// java extension
10-
configureJavaOnlyToolchain(JdkMajorVersion.JDK_1_6)
10+
configureJavaOnlyToolchain(JdkMajorVersion.JDK_1_8)
1111

1212
val kotlinVersion: String by rootProject.extra
1313

‎compiler/tests-common-jvm6/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
id("jps-compatible")
44
}
55

6-
project.updateJvmTarget("1.6")
6+
project.updateJvmTarget("1.6") // Should this project be removed altogether ?
77

88
dependencies {
99
api(kotlinStdlib())

‎compiler/tests-different-jdk/build.gradle.kts

+1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ fun Project.codegenTest(
5050
group = "verification"
5151
}
5252

53+
// Should the tests with target = 6 be removed ?
5354
codegenTest(
5455
target = 6,
5556
jdk = JdkMajorVersion.JDK_1_8,

‎core/compiler.common.jvm/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
id("jps-compatible")
44
}
55

6-
project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
6+
project.configureJvmToolchain(JdkMajorVersion.JDK_1_8)
77

88
dependencies {
99
api(project(":core:compiler.common"))

‎core/compiler.common/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
id("jps-compatible")
44
}
55

6-
project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
6+
project.configureJvmToolchain(JdkMajorVersion.JDK_1_8)
77

88
dependencies {
99
api(project(":core:util.runtime"))

‎core/descriptors.jvm/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
id("jps-compatible")
44
}
55

6-
project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
6+
project.configureJvmToolchain(JdkMajorVersion.JDK_1_8)
77

88
dependencies {
99
api(project(":kotlin-annotations-jvm"))

‎core/descriptors.runtime/build.gradle.kts

+1-11
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,7 @@ plugins {
55
id("jps-compatible")
66
}
77

8-
tasks
9-
.matching { it.name == "compileKotlin" && it is KotlinCompile }
10-
.configureEach {
11-
(this as KotlinCompile).configureTaskToolchain(chooseJdk18ForJpsBuild(JdkMajorVersion.JDK_1_6))
12-
}
13-
14-
tasks
15-
.matching { it.name == "compileJava" && it is JavaCompile }
16-
.configureEach {
17-
(this as JavaCompile).configureTaskToolchain(chooseJdk18ForJpsBuild(JdkMajorVersion.JDK_1_6))
18-
}
8+
project.configureJvmToolchain(JdkMajorVersion.JDK_1_8)
199

2010
dependencies {
2111
compileOnly(project(":core:util.runtime"))

‎core/descriptors/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
id("jps-compatible")
44
}
55

6-
project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
6+
project.configureJvmToolchain(JdkMajorVersion.JDK_1_8)
77

88
dependencies {
99
api(project(":core:compiler.common"))

‎core/deserialization.common.jvm/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
id("jps-compatible")
44
}
55

6-
project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
6+
project.configureJvmToolchain(JdkMajorVersion.JDK_1_8)
77

88
dependencies {
99
api(project(":core:metadata.jvm"))

‎core/deserialization.common/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
id("jps-compatible")
44
}
55

6-
project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
6+
project.configureJvmToolchain(JdkMajorVersion.JDK_1_8)
77

88
dependencies {
99
api(project(":core:compiler.common"))

‎core/deserialization/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
id("jps-compatible")
44
}
55

6-
project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
6+
project.configureJvmToolchain(JdkMajorVersion.JDK_1_8)
77

88
dependencies {
99
api(project(":core:metadata"))

‎core/metadata.jvm/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
id("jps-compatible")
44
}
55

6-
project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
6+
project.configureJvmToolchain(JdkMajorVersion.JDK_1_8)
77

88
dependencies {
99
api(project(":core:metadata"))

‎core/metadata/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
id("jps-compatible")
44
}
55

6-
project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
6+
project.configureJvmToolchain(JdkMajorVersion.JDK_1_8)
77

88
dependencies {
99
api(protobufLite())

‎core/util.runtime/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
id("jps-compatible")
44
}
55

6-
project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
6+
project.configureJvmToolchain(JdkMajorVersion.JDK_1_8)
77

88
dependencies {
99
compileOnly(kotlinStdlib())

‎libraries/kotlin.test/annotations-common/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ description = 'Kotlin Test Annotations Common'
22

33
apply plugin: 'kotlin-platform-common'
44

5-
JvmToolchain.updateJvmTarget(project, "1.6")
5+
JvmToolchain.updateJvmTarget(project, "1.8")
66

77
dependencies {
88
api kotlinStdlib("common")

‎libraries/kotlin.test/common/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ description = 'Kotlin Test Common'
22

33
apply plugin: 'kotlin-platform-common'
44

5-
JvmToolchain.updateJvmTarget(project, "1.6")
5+
JvmToolchain.updateJvmTarget(project, "1.8")
66

77
dependencies {
88
api kotlinStdlib("common")

‎libraries/kotlin.test/junit/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ description = 'Kotlin Test JUnit'
22

33
apply plugin: 'kotlin-platform-jvm'
44

5-
JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_6)
5+
JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_8)
66

77
def includeJava9 = BuildPropertiesExtKt.getIncludeJava9(project.kotlinBuildProperties)
88

‎libraries/kotlin.test/jvm/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apply plugin: 'kotlin-platform-jvm'
44

55
archivesBaseName = 'kotlin-test'
66

7-
JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_6)
7+
JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_8)
88

99
def includeJava9 = BuildPropertiesExtKt.getIncludeJava9(project.kotlinBuildProperties)
1010

‎libraries/kotlin.test/testng/build.gradle

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ description = 'Kotlin Test TestNG'
22

33
apply plugin: 'kotlin-platform-jvm'
44

5-
JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_7)
6-
JvmToolchain.updateJvmTarget(project, "1.6")
5+
JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_8)
76

87
def includeJava9 = BuildPropertiesExtKt.getIncludeJava9(project.kotlinBuildProperties)
98

‎libraries/stdlib/common/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apply plugin: 'kotlin-platform-common'
44

55
configurePublishing(project)
66

7-
JvmToolchain.updateJvmTarget(project, "1.6")
7+
JvmToolchain.updateJvmTarget(project, "1.8")
88

99
def commonSrcDir = "../src"
1010
def commonTestSrcDir = "../test"

‎libraries/stdlib/jdk7/build.gradle

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ description = 'Kotlin Standard Library JDK 7 extension'
22

33
apply plugin: 'kotlin'
44

5-
JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_7)
6-
JvmToolchain.updateJvmTarget(project, "1.6")
5+
JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_8)
76

87
configurePublishing(project)
98
configureSourcesJar()

‎libraries/stdlib/jvm-minimal-for-test/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ plugins {
77
`maven-publish`
88
}
99

10-
project.configureJvmToolchain(JdkMajorVersion.JDK_1_6)
10+
project.configureJvmToolchain(JdkMajorVersion.JDK_1_8)
1111

1212
val builtins by configurations.creating {
1313
isCanBeResolved = true

‎libraries/stdlib/jvm/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apply plugin: 'kotlin-platform-jvm'
44

55
archivesBaseName = 'kotlin-stdlib'
66

7-
JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_6)
7+
JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_8)
88

99
configurePublishing(project)
1010
configureJavadocJar()

‎libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt

+16
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,7 @@ public final class kotlin/UByteArray : java/util/Collection, kotlin/jvm/internal
321321
public static fun iterator-impl ([B)Ljava/util/Iterator;
322322
public fun remove (Ljava/lang/Object;)Z
323323
public fun removeAll (Ljava/util/Collection;)Z
324+
public fun removeIf (Ljava/util/function/Predicate;)Z
324325
public fun retainAll (Ljava/util/Collection;)Z
325326
public static final fun set-VurrAj0 ([BIB)V
326327
public synthetic fun size ()I
@@ -380,6 +381,7 @@ public final class kotlin/UIntArray : java/util/Collection, kotlin/jvm/internal/
380381
public static fun iterator-impl ([I)Ljava/util/Iterator;
381382
public fun remove (Ljava/lang/Object;)Z
382383
public fun removeAll (Ljava/util/Collection;)Z
384+
public fun removeIf (Ljava/util/function/Predicate;)Z
383385
public fun retainAll (Ljava/util/Collection;)Z
384386
public static final fun set-VXSXFK8 ([III)V
385387
public synthetic fun size ()I
@@ -439,6 +441,7 @@ public final class kotlin/ULongArray : java/util/Collection, kotlin/jvm/internal
439441
public static fun iterator-impl ([J)Ljava/util/Iterator;
440442
public fun remove (Ljava/lang/Object;)Z
441443
public fun removeAll (Ljava/util/Collection;)Z
444+
public fun removeIf (Ljava/util/function/Predicate;)Z
442445
public fun retainAll (Ljava/util/Collection;)Z
443446
public static final fun set-k8EXiF4 ([JIJ)V
444447
public synthetic fun size ()I
@@ -498,6 +501,7 @@ public final class kotlin/UShortArray : java/util/Collection, kotlin/jvm/interna
498501
public static fun iterator-impl ([S)Ljava/util/Iterator;
499502
public fun remove (Ljava/lang/Object;)Z
500503
public fun removeAll (Ljava/util/Collection;)Z
504+
public fun removeIf (Ljava/util/function/Predicate;)Z
501505
public fun retainAll (Ljava/util/Collection;)Z
502506
public static final fun set-01HTLdE ([SIS)V
503507
public synthetic fun size ()I
@@ -598,6 +602,7 @@ public abstract class kotlin/collections/AbstractCollection : java/util/Collecti
598602
public abstract fun iterator ()Ljava/util/Iterator;
599603
public fun remove (Ljava/lang/Object;)Z
600604
public fun removeAll (Ljava/util/Collection;)Z
605+
public fun removeIf (Ljava/util/function/Predicate;)Z
601606
public fun retainAll (Ljava/util/Collection;)Z
602607
public final fun size ()I
603608
public fun toArray ()[Ljava/lang/Object;
@@ -629,13 +634,18 @@ public abstract class kotlin/collections/AbstractList : kotlin/collections/Abstr
629634
public fun listIterator ()Ljava/util/ListIterator;
630635
public fun listIterator (I)Ljava/util/ListIterator;
631636
public fun remove (I)Ljava/lang/Object;
637+
public fun replaceAll (Ljava/util/function/UnaryOperator;)V
632638
public fun set (ILjava/lang/Object;)Ljava/lang/Object;
639+
public fun sort (Ljava/util/Comparator;)V
633640
public fun subList (II)Ljava/util/List;
634641
}
635642

636643
public abstract class kotlin/collections/AbstractMap : java/util/Map, kotlin/jvm/internal/markers/KMappedMarker {
637644
protected fun <init> ()V
638645
public fun clear ()V
646+
public fun compute (Ljava/lang/Object;Ljava/util/function/BiFunction;)Ljava/lang/Object;
647+
public fun computeIfAbsent (Ljava/lang/Object;Ljava/util/function/Function;)Ljava/lang/Object;
648+
public fun computeIfPresent (Ljava/lang/Object;Ljava/util/function/BiFunction;)Ljava/lang/Object;
639649
public fun containsKey (Ljava/lang/Object;)Z
640650
public fun containsValue (Ljava/lang/Object;)Z
641651
public final fun entrySet ()Ljava/util/Set;
@@ -648,9 +658,15 @@ public abstract class kotlin/collections/AbstractMap : java/util/Map, kotlin/jvm
648658
public fun hashCode ()I
649659
public fun isEmpty ()Z
650660
public final fun keySet ()Ljava/util/Set;
661+
public fun merge (Ljava/lang/Object;Ljava/lang/Object;Ljava/util/function/BiFunction;)Ljava/lang/Object;
651662
public fun put (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
652663
public fun putAll (Ljava/util/Map;)V
664+
public fun putIfAbsent (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
653665
public fun remove (Ljava/lang/Object;)Ljava/lang/Object;
666+
public fun remove (Ljava/lang/Object;Ljava/lang/Object;)Z
667+
public fun replace (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
668+
public fun replace (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Z
669+
public fun replaceAll (Ljava/util/function/BiFunction;)V
654670
public final fun size ()I
655671
public fun toString ()Ljava/lang/String;
656672
public final fun values ()Ljava/util/Collection;

‎libraries/tools/kotlin-annotations-jvm/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ description = 'Kotlin annotations for JVM'
22

33
apply plugin: 'kotlin'
44

5-
JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_6)
5+
JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_8)
66

77
configurePublishing(project)
88

‎libraries/tools/mutability-annotations-compat/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55
id("jps-compatible")
66
}
77

8-
project.updateJvmTarget("1.6")
8+
project.updateJvmTarget("1.8")
99

1010
sourceSets {
1111
"main" { projectDefault() }

‎libraries/tools/script-runtime/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ description 'Kotlin Script Runtime'
22

33
apply plugin: 'kotlin'
44

5-
JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_6)
5+
JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_8)
66

77
configurePublishing(project)
88

0 commit comments

Comments
 (0)