Switch JVM target of the standard libraries to 1.8 #KT-51907
This commit is contained in:
@@ -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")
|
||||
|
||||
@@ -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")
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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()
|
||||
|
||||
+16
@@ -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;
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ plugins {
|
||||
id("jps-compatible")
|
||||
}
|
||||
|
||||
project.updateJvmTarget("1.6")
|
||||
project.updateJvmTarget("1.8")
|
||||
|
||||
sourceSets {
|
||||
"main" { projectDefault() }
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user