Skip to content

Commit 5cbb969

Browse files
committed
Bump Kotlin to 2.1.0-Beta1
1 parent fddfd7e commit 5cbb969

File tree

14 files changed

+1191
-706
lines changed

14 files changed

+1191
-706
lines changed

gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,5 @@ org.gradle.parallel=true
3030

3131
kotlin.wasm.stability.nowarn=true
3232
dev.adamko.dokkatoo.tasks.logHtmlPublicationLinkEnabled=false
33+
34+
ksp.useKSP2=true

gradle/libraries.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ javaPoet = "1.13.0"
2626
jetbrains-annotations = "24.0.1"
2727
junit = "4.13.2"
2828
kotlin-plugin-min = "1.9.0"
29-
kotlin-plugin = "2.0.20"
30-
kotlin-plugin-max = "2.0.20"
29+
kotlin-plugin = "2.1.0-Beta1"
30+
kotlin-plugin-max = "2.1.0-Beta1"
3131
kotlin-stdlib = "2.0.0"
3232
kotlinx-coroutines = "1.8.0"
3333
kotlinx-datetime = "0.5.0"
3434
kotlinx-serialization-runtime = "1.6.2"
35-
ksp = "2.0.20-1.0.24"
35+
ksp = "2.1.0-Beta1-1.0.25"
3636
ktor = "2.3.11"
3737
moshix = "0.14.1"
3838
node-fetch = "2.6.7"
@@ -142,7 +142,7 @@ kotlinx-datetime = { group = "org.jetbrains.kotlinx", name = "kotlinx-datetime",
142142
kotlin-node = "org.jetbrains.kotlin-wrappers:kotlin-node:18.16.12-pre.634"
143143
kotlinx-serialization-plugin = { group = "org.jetbrains.kotlin", name = "kotlin-serialization", version.ref = "kotlin-plugin" }
144144
kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinx-serialization-runtime" }
145-
kotlinx-binarycompatibilityvalidator = { group = "org.jetbrains.kotlinx", name = "binary-compatibility-validator", version = "0.15.0-Beta.2" }
145+
kotlinx-binarycompatibilityvalidator = { group = "org.jetbrains.kotlinx", name = "binary-compatibility-validator", version = "0.16.3" }
146146
ksp = { module = "com.google.devtools.ksp:symbol-processing-gradle-plugin", version.ref = "ksp" }
147147
ktor-client-core = { group = "io.ktor", name= "ktor-client-core", version.ref = "ktor" }
148148
ktor-client-okhttp = { group = "io.ktor", name = "ktor-client-okhttp", version.ref = "ktor" }

kotlin-js-store-2.0/yarn.lock renamed to kotlin-js-store-2.1/yarn.lock

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,11 @@ brace-expansion@^2.0.1:
6767
balanced-match "^1.0.0"
6868

6969
braces@~3.0.2:
70-
version "3.0.2"
71-
resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
72-
integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
70+
version "3.0.3"
71+
resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
72+
integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
7373
dependencies:
74-
fill-range "^7.0.1"
74+
fill-range "^7.1.1"
7575

7676
browser-stdout@^1.3.1:
7777
version "1.3.1"
@@ -133,11 +133,11 @@ color-name@~1.1.4:
133133
integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
134134

135135
debug@^4.3.5:
136-
version "4.3.6"
137-
resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.6.tgz#2ab2c38fbaffebf8aa95fdfe6d88438c7a13c52b"
138-
integrity sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==
136+
version "4.3.7"
137+
resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.7.tgz#87945b4151a011d76d95a198d7111c865c360a52"
138+
integrity sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==
139139
dependencies:
140-
ms "2.1.2"
140+
ms "^2.1.3"
141141

142142
decamelize@^4.0.0:
143143
version "4.0.0"
@@ -155,9 +155,9 @@ emoji-regex@^8.0.0:
155155
integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
156156

157157
escalade@^3.1.1:
158-
version "3.1.2"
159-
resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.2.tgz#54076e9ab29ea5bf3d8f1ed62acffbb88272df27"
160-
integrity sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==
158+
version "3.2.0"
159+
resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.2.0.tgz#011a3f69856ba189dffa7dc8fcce99d2a87903e5"
160+
integrity sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==
161161

162162
escape-string-regexp@^4.0.0:
163163
version "4.0.0"
@@ -169,10 +169,10 @@ event-target-shim@^5.0.0:
169169
resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789"
170170
integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==
171171

172-
fill-range@^7.0.1:
173-
version "7.0.1"
174-
resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
175-
integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
172+
fill-range@^7.1.1:
173+
version "7.1.1"
174+
resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
175+
integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
176176
dependencies:
177177
to-regex-range "^5.0.1"
178178

@@ -296,6 +296,13 @@ js-yaml@^4.1.0:
296296
dependencies:
297297
argparse "^2.0.1"
298298

299+
300+
version "2.0.0"
301+
resolved "https://registry.yarnpkg.com/kotlin-web-helpers/-/kotlin-web-helpers-2.0.0.tgz#b112096b273c1e733e0b86560998235c09a19286"
302+
integrity sha512-xkVGl60Ygn/zuLkDPx+oHj7jeLR7hCvoNF99nhwXMn8a3ApB4lLiC9pk4ol4NHPjyoCbvQctBqvzUcp8pkqyWw==
303+
dependencies:
304+
format-util "^1.0.5"
305+
299306
locate-path@^6.0.0:
300307
version "6.0.0"
301308
resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
@@ -344,11 +351,6 @@ [email protected]:
344351
yargs-parser "^20.2.9"
345352
yargs-unparser "^2.0.0"
346353

347-
348-
version "2.1.2"
349-
resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
350-
integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
351-
352354
ms@^2.1.3:
353355
version "2.1.3"
354356
resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"

libraries/apollo-adapters/api/apollo-adapters.klib.api

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,33 +7,40 @@
77
// - Show declarations: true
88

99
// Library unique name: <com.apollographql.apollo:apollo-adapters>
10-
final fun (com.apollographql.apollo.adapter/BigDecimal).com.apollographql.apollo.adapter/toNumber(): kotlin/Number // com.apollographql.apollo.adapter/toNumber|[email protected](){}[0]
1110
final object com.apollographql.apollo.adapter/BigDecimalAdapter : com.apollographql.apollo.api/Adapter<com.apollographql.apollo.adapter/BigDecimal> { // com.apollographql.apollo.adapter/BigDecimalAdapter|null[0]
1211
final fun fromJson(com.apollographql.apollo.api.json/JsonReader, com.apollographql.apollo.api/CustomScalarAdapters): com.apollographql.apollo.adapter/BigDecimal // com.apollographql.apollo.adapter/BigDecimalAdapter.fromJson|fromJson(com.apollographql.apollo.api.json.JsonReader;com.apollographql.apollo.api.CustomScalarAdapters){}[0]
1312
final fun toJson(com.apollographql.apollo.api.json/JsonWriter, com.apollographql.apollo.api/CustomScalarAdapters, com.apollographql.apollo.adapter/BigDecimal) // com.apollographql.apollo.adapter/BigDecimalAdapter.toJson|toJson(com.apollographql.apollo.api.json.JsonWriter;com.apollographql.apollo.api.CustomScalarAdapters;com.apollographql.apollo.adapter.BigDecimal){}[0]
1413
}
14+
1515
final object com.apollographql.apollo.adapter/KotlinxInstantAdapter : com.apollographql.apollo.api/Adapter<kotlinx.datetime/Instant> { // com.apollographql.apollo.adapter/KotlinxInstantAdapter|null[0]
1616
final fun fromJson(com.apollographql.apollo.api.json/JsonReader, com.apollographql.apollo.api/CustomScalarAdapters): kotlinx.datetime/Instant // com.apollographql.apollo.adapter/KotlinxInstantAdapter.fromJson|fromJson(com.apollographql.apollo.api.json.JsonReader;com.apollographql.apollo.api.CustomScalarAdapters){}[0]
1717
final fun toJson(com.apollographql.apollo.api.json/JsonWriter, com.apollographql.apollo.api/CustomScalarAdapters, kotlinx.datetime/Instant) // com.apollographql.apollo.adapter/KotlinxInstantAdapter.toJson|toJson(com.apollographql.apollo.api.json.JsonWriter;com.apollographql.apollo.api.CustomScalarAdapters;kotlinx.datetime.Instant){}[0]
1818
}
19+
1920
final object com.apollographql.apollo.adapter/KotlinxLocalDateAdapter : com.apollographql.apollo.api/Adapter<kotlinx.datetime/LocalDate> { // com.apollographql.apollo.adapter/KotlinxLocalDateAdapter|null[0]
2021
final fun fromJson(com.apollographql.apollo.api.json/JsonReader, com.apollographql.apollo.api/CustomScalarAdapters): kotlinx.datetime/LocalDate // com.apollographql.apollo.adapter/KotlinxLocalDateAdapter.fromJson|fromJson(com.apollographql.apollo.api.json.JsonReader;com.apollographql.apollo.api.CustomScalarAdapters){}[0]
2122
final fun toJson(com.apollographql.apollo.api.json/JsonWriter, com.apollographql.apollo.api/CustomScalarAdapters, kotlinx.datetime/LocalDate) // com.apollographql.apollo.adapter/KotlinxLocalDateAdapter.toJson|toJson(com.apollographql.apollo.api.json.JsonWriter;com.apollographql.apollo.api.CustomScalarAdapters;kotlinx.datetime.LocalDate){}[0]
2223
}
24+
2325
final object com.apollographql.apollo.adapter/KotlinxLocalDateTimeAdapter : com.apollographql.apollo.api/Adapter<kotlinx.datetime/LocalDateTime> { // com.apollographql.apollo.adapter/KotlinxLocalDateTimeAdapter|null[0]
2426
final fun fromJson(com.apollographql.apollo.api.json/JsonReader, com.apollographql.apollo.api/CustomScalarAdapters): kotlinx.datetime/LocalDateTime // com.apollographql.apollo.adapter/KotlinxLocalDateTimeAdapter.fromJson|fromJson(com.apollographql.apollo.api.json.JsonReader;com.apollographql.apollo.api.CustomScalarAdapters){}[0]
2527
final fun toJson(com.apollographql.apollo.api.json/JsonWriter, com.apollographql.apollo.api/CustomScalarAdapters, kotlinx.datetime/LocalDateTime) // com.apollographql.apollo.adapter/KotlinxLocalDateTimeAdapter.toJson|toJson(com.apollographql.apollo.api.json.JsonWriter;com.apollographql.apollo.api.CustomScalarAdapters;kotlinx.datetime.LocalDateTime){}[0]
2628
}
29+
2730
final object com.apollographql.apollo.adapter/KotlinxLocalTimeAdapter : com.apollographql.apollo.api/Adapter<kotlinx.datetime/LocalTime> { // com.apollographql.apollo.adapter/KotlinxLocalTimeAdapter|null[0]
2831
final fun fromJson(com.apollographql.apollo.api.json/JsonReader, com.apollographql.apollo.api/CustomScalarAdapters): kotlinx.datetime/LocalTime // com.apollographql.apollo.adapter/KotlinxLocalTimeAdapter.fromJson|fromJson(com.apollographql.apollo.api.json.JsonReader;com.apollographql.apollo.api.CustomScalarAdapters){}[0]
2932
final fun toJson(com.apollographql.apollo.api.json/JsonWriter, com.apollographql.apollo.api/CustomScalarAdapters, kotlinx.datetime/LocalTime) // com.apollographql.apollo.adapter/KotlinxLocalTimeAdapter.toJson|toJson(com.apollographql.apollo.api.json.JsonWriter;com.apollographql.apollo.api.CustomScalarAdapters;kotlinx.datetime.LocalTime){}[0]
3033
}
34+
35+
final fun (com.apollographql.apollo.adapter/BigDecimal).com.apollographql.apollo.adapter/toNumber(): kotlin/Number // com.apollographql.apollo.adapter/toNumber|[email protected](){}[0]
36+
3137
// Targets: [apple]
3238
final class com.apollographql.apollo.adapter/BigDecimal : kotlin/Number { // com.apollographql.apollo.adapter/BigDecimal|null[0]
3339
constructor <init>(kotlin/Double) // com.apollographql.apollo.adapter/BigDecimal.<init>|<init>(kotlin.Double){}[0]
3440
constructor <init>(kotlin/Int) // com.apollographql.apollo.adapter/BigDecimal.<init>|<init>(kotlin.Int){}[0]
3541
constructor <init>(kotlin/Long) // com.apollographql.apollo.adapter/BigDecimal.<init>|<init>(kotlin.Long){}[0]
3642
constructor <init>(kotlin/String) // com.apollographql.apollo.adapter/BigDecimal.<init>|<init>(kotlin.String){}[0]
43+
3744
final fun add(com.apollographql.apollo.adapter/BigDecimal): com.apollographql.apollo.adapter/BigDecimal // com.apollographql.apollo.adapter/BigDecimal.add|add(com.apollographql.apollo.adapter.BigDecimal){}[0]
3845
final fun divide(com.apollographql.apollo.adapter/BigDecimal): com.apollographql.apollo.adapter/BigDecimal // com.apollographql.apollo.adapter/BigDecimal.divide|divide(com.apollographql.apollo.adapter.BigDecimal){}[0]
3946
final fun equals(kotlin/Any?): kotlin/Boolean // com.apollographql.apollo.adapter/BigDecimal.equals|equals(kotlin.Any?){}[0]
@@ -50,13 +57,15 @@ final class com.apollographql.apollo.adapter/BigDecimal : kotlin/Number { // com
5057
final fun toShort(): kotlin/Short // com.apollographql.apollo.adapter/BigDecimal.toShort|toShort(){}[0]
5158
final fun toString(): kotlin/String // com.apollographql.apollo.adapter/BigDecimal.toString|toString(){}[0]
5259
}
60+
5361
// Targets: [js, wasmJs]
5462
final class com.apollographql.apollo.adapter/BigDecimal { // com.apollographql.apollo.adapter/BigDecimal|null[0]
5563
constructor <init>() // com.apollographql.apollo.adapter/BigDecimal.<init>|<init>(){}[0]
5664
constructor <init>(kotlin/Double) // com.apollographql.apollo.adapter/BigDecimal.<init>|<init>(kotlin.Double){}[0]
5765
constructor <init>(kotlin/Int) // com.apollographql.apollo.adapter/BigDecimal.<init>|<init>(kotlin.Int){}[0]
5866
constructor <init>(kotlin/Long) // com.apollographql.apollo.adapter/BigDecimal.<init>|<init>(kotlin.Long){}[0]
5967
constructor <init>(kotlin/String) // com.apollographql.apollo.adapter/BigDecimal.<init>|<init>(kotlin.String){}[0]
68+
6069
final fun add(com.apollographql.apollo.adapter/BigDecimal): com.apollographql.apollo.adapter/BigDecimal // com.apollographql.apollo.adapter/BigDecimal.add|add(com.apollographql.apollo.adapter.BigDecimal){}[0]
6170
final fun divide(com.apollographql.apollo.adapter/BigDecimal): com.apollographql.apollo.adapter/BigDecimal // com.apollographql.apollo.adapter/BigDecimal.divide|divide(com.apollographql.apollo.adapter.BigDecimal){}[0]
6271
final fun equals(kotlin/Any?): kotlin/Boolean // com.apollographql.apollo.adapter/BigDecimal.equals|equals(kotlin.Any?){}[0]

libraries/apollo-annotations/api/apollo-annotations.klib.api

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,19 @@
88
// Library unique name: <com.apollographql.apollo:apollo-annotations>
99
open annotation class com.apollographql.apollo.annotations/ApolloAdaptableWith : kotlin/Annotation { // com.apollographql.apollo.annotations/ApolloAdaptableWith|null[0]
1010
constructor <init>(kotlin.reflect/KClass<*>) // com.apollographql.apollo.annotations/ApolloAdaptableWith.<init>|<init>(kotlin.reflect.KClass<*>){}[0]
11+
1112
final val adapter // com.apollographql.apollo.annotations/ApolloAdaptableWith.adapter|{}adapter[0]
1213
final fun <get-adapter>(): kotlin.reflect/KClass<*> // com.apollographql.apollo.annotations/ApolloAdaptableWith.adapter.<get-adapter>|<get-adapter>(){}[0]
1314
}
15+
1416
open annotation class com.apollographql.apollo.annotations/ApolloExperimental : kotlin/Annotation { // com.apollographql.apollo.annotations/ApolloExperimental|null[0]
1517
constructor <init>() // com.apollographql.apollo.annotations/ApolloExperimental.<init>|<init>(){}[0]
1618
}
19+
1720
open annotation class com.apollographql.apollo.annotations/ApolloInternal : kotlin/Annotation { // com.apollographql.apollo.annotations/ApolloInternal|null[0]
1821
constructor <init>() // com.apollographql.apollo.annotations/ApolloInternal.<init>|<init>(){}[0]
1922
}
23+
2024
open annotation class com.apollographql.apollo.annotations/ApolloRequiresOptIn : kotlin/Annotation { // com.apollographql.apollo.annotations/ApolloRequiresOptIn|null[0]
2125
constructor <init>() // com.apollographql.apollo.annotations/ApolloRequiresOptIn.<init>|<init>(){}[0]
2226
}

libraries/apollo-api/api/apollo-api.api

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,6 @@ public final class com/apollographql/apollo/api/CompiledVariable {
402402
public final class com/apollographql/apollo/api/CustomScalarAdapters : com/apollographql/apollo/api/ExecutionContext$Element {
403403
public static final field Empty Lcom/apollographql/apollo/api/CustomScalarAdapters;
404404
public static final field Key Lcom/apollographql/apollo/api/CustomScalarAdapters$Key;
405-
public static final field PassThrough Lcom/apollographql/apollo/api/CustomScalarAdapters;
406405
public final field deferredFragmentIdentifiers Ljava/util/Set;
407406
public final field errors Ljava/util/List;
408407
public final field falseVariables Ljava/util/Set;

0 commit comments

Comments
 (0)