Skip to content

Commit 1406944

Browse files
authored
Kotlin 1.8 (square#7575)
* Kotlin 1.8 testing * Kotlin 1.8 testing * fix api * Updates * Updates * Workaround build issue
1 parent c6a4280 commit 1406944

File tree

8 files changed

+37
-918
lines changed

8 files changed

+37
-918
lines changed

buildSrc/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/tasks/KotlinJvmTest.kt

Lines changed: 0 additions & 50 deletions
This file was deleted.

gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,7 @@ org.gradle.parallel=true
44
android.enableJetifier=true
55
android.useAndroidX=true
66
kotlin.mpp.stability.nowarn=true
7+
kotlin.js.compiler=ir
8+
kotlin.incremental.js.ir=true
79
androidBuild=false
810
graalBuild=false

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ graalvm = "22.3.0"
88
org-bouncycastle = "1.72"
99
org-conscrypt = "2.5.2"
1010
org-jetbrains-coroutines = "1.6.4"
11-
org-jetbrains-kotlin = "1.7.10"
11+
org-jetbrains-kotlin = "1.8.0"
1212
org-junit-jupiter = "5.9.1"
1313

1414
[libraries]

kotlin-js-store/yarn.lock

Lines changed: 30 additions & 861 deletions
Large diffs are not rendered by default.

mockwebserver-deprecated/api/mockwebserver.api

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,17 +74,13 @@ public final class okhttp3/mockwebserver/MockWebServer : org/junit/rules/Externa
7474
public fun close ()V
7575
public final fun enqueue (Lokhttp3/mockwebserver/MockResponse;)V
7676
public final fun getBodyLimit ()J
77-
public static fun getBodyLimit$delegate (Lokhttp3/mockwebserver/MockWebServer;)Ljava/lang/Object;
7877
public final fun getDelegate ()Lmockwebserver3/MockWebServer;
7978
public final fun getDispatcher ()Lokhttp3/mockwebserver/Dispatcher;
8079
public final fun getHostName ()Ljava/lang/String;
8180
public final fun getPort ()I
8281
public final fun getProtocolNegotiationEnabled ()Z
83-
public static fun getProtocolNegotiationEnabled$delegate (Lokhttp3/mockwebserver/MockWebServer;)Ljava/lang/Object;
8482
public final fun getRequestCount ()I
85-
public static fun getRequestCount$delegate (Lokhttp3/mockwebserver/MockWebServer;)Ljava/lang/Object;
8683
public final fun getServerSocketFactory ()Ljavax/net/ServerSocketFactory;
87-
public static fun getServerSocketFactory$delegate (Lokhttp3/mockwebserver/MockWebServer;)Ljava/lang/Object;
8884
public final fun noClientAuth ()V
8985
public final fun protocols ()Ljava/util/List;
9086
public final fun requestClientAuth ()V

okhttp-android/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ dependencies {
4343
api(projects.okhttp)
4444
compileOnly(libs.androidx.annotation)
4545
compileOnly(libs.findbugs.jsr305)
46+
debugImplementation(libs.androidx.annotation)
47+
debugImplementation(libs.findbugs.jsr305)
4648
compileOnly(libs.animalsniffer.annotations)
4749
compileOnly(libs.robolectric.android)
4850

okhttp/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ kotlin {
1414
withJava()
1515
}
1616
if (kmpJsEnabled) {
17-
js {
17+
js(IR) {
1818
compilations.all {
1919
kotlinOptions {
2020
moduleKind = "umd"

samples/tlssurvey/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
kotlin("jvm")
33
application
4-
id("com.google.devtools.ksp").version("1.7.10-1.0.6")
4+
id("com.google.devtools.ksp").version("1.8.0-1.0.8")
55
}
66

77
application {

0 commit comments

Comments
 (0)