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

Build: update kotlinLanguageVersion to 1.6

Browse Source 
Update binary-compatibility-validator dependency to 0.7.1 to allow it to
read Kotlin metadata of version 1.6.

 #KT-48445
This commit is contained in:
Alexander Udalov
2021-08-02 15:22:52 +02:00
parent 019001ca20
commit 6c400ce864
6 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle.kts
+1 -1
View File
@@ -63,7 +63,7 @@ val kotlinVersion by extra(
} ?: buildNumber
)
val kotlinLanguageVersion by extra("1.5")
val kotlinLanguageVersion by extra("1.6")
allprojects {
group = "org.jetbrains.kotlin"
compiler/fir/resolve/build.gradle.kts
+10
View File
@@ -19,3 +19,13 @@ sourceSets {
"main" { projectDefault() }
"test" { none() }
}
tasks {
val compileKotlin by existing(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class) {
kotlinOptions {
// Workaround for KT-48445.
languageVersion = "1.5"
apiVersion = "1.5"
}
}
}
gradle/verification-metadata.xml
+4 -4
View File
@@ -7383,10 +7383,10 @@
<sha256 value="7a6bd3e09a63d6a57725cc3016465d2148b8febb82a6b165b33956f8a15e0b94" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlinx" name="binary-compatibility-validator" version="0.5.0">
<artifact name="binary-compatibility-validator-0.5.0.jar">
<md5 value="182080d1b43bf3328ad1566dd732780f" origin="Generated by Gradle"/>
<sha256 value="7febe38bd39cce08705c7d5b86b8ae369acaca64b54ca2ffc5211399efbc48f1" origin="Generated by Gradle"/>
<component group="org.jetbrains.kotlinx" name="binary-compatibility-validator" version="0.7.1">
<artifact name="binary-compatibility-validator-0.7.1.jar">
<md5 value="f188e849f683da58684012bbdc732abc" origin="Generated by Gradle"/>
<sha256 value="d6c3b8d52ae3653375140d67e859477ef90d193be48d44486b21efd70fa2eedc" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlinx" name="kotlinx-benchmark-plugin" version="0.3.1">
libraries/tools/binary-compatibility-validator/build.gradle
+1 -1
View File
@@ -6,7 +6,7 @@ configurations {
}
dependencies {
compile("org.jetbrains.kotlinx:binary-compatibility-validator:0.5.0")
compile("org.jetbrains.kotlinx:binary-compatibility-validator:0.7.1")
testCompile project(':kotlin-test:kotlin-test-junit')
libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt
-4
View File
@@ -605,7 +605,6 @@ public abstract class kotlin/collections/AbstractIterator : java/util/Iterator,
}
public abstract class kotlin/collections/AbstractList : kotlin/collections/AbstractCollection, java/util/List, kotlin/jvm/internal/markers/KMappedMarker {
public static final field Companion Lkotlin/collections/AbstractList$Companion;
protected fun <init> ()V
public fun add (ILjava/lang/Object;)V
public fun addAll (ILjava/util/Collection;)Z
@@ -624,7 +623,6 @@ public abstract class kotlin/collections/AbstractList : kotlin/collections/Abstr
}
public abstract class kotlin/collections/AbstractMap : java/util/Map, kotlin/jvm/internal/markers/KMappedMarker {
public static final field Companion Lkotlin/collections/AbstractMap$Companion;
protected fun <init> ()V
public fun clear ()V
public fun containsKey (Ljava/lang/Object;)Z
@@ -685,7 +683,6 @@ public abstract class kotlin/collections/AbstractMutableSet : java/util/Abstract
}
public abstract class kotlin/collections/AbstractSet : kotlin/collections/AbstractCollection, java/util/Set, kotlin/jvm/internal/markers/KMappedMarker {
public static final field Companion Lkotlin/collections/AbstractSet$Companion;
protected fun <init> ()V
public fun equals (Ljava/lang/Object;)Z
public fun hashCode ()I
@@ -693,7 +690,6 @@ public abstract class kotlin/collections/AbstractSet : kotlin/collections/Abstra
}
public final class kotlin/collections/ArrayDeque : kotlin/collections/AbstractMutableList {
public static final field Companion Lkotlin/collections/ArrayDeque$Companion;
public fun <init> ()V
public fun <init> (I)V
public fun <init> (Ljava/util/Collection;)V
libraries/tools/binary-compatibility-validator/src/test/kotlin/cases/companions/companions.txt
-2
View File
@@ -27,7 +27,6 @@ protected final class cases/companions/PublicClasses$AbstractProtectedCompanion$
}
public final class cases/companions/PublicClasses$InternalCompanion {
public static final field Companion Lcases/companions/PublicClasses$InternalCompanion$Companion;
public fun <init> ()V
}
@@ -52,7 +51,6 @@ public final class cases/companions/PublicInterfaces {
}
public abstract interface class cases/companions/PublicInterfaces$PrivateCompanion {
public static final synthetic field Companion Lcases/companions/PublicInterfaces$PrivateCompanion$Companion;
}
public abstract interface class cases/companions/PublicInterfaces$PublicCompanion {