Skip to content

Commit 3ccffbf

Browse files
committed
upgrade kotlin
1 parent e7704bc commit 3ccffbf

File tree

11 files changed

+42
-42
lines changed

11 files changed

+42
-42
lines changed

build.gradle.kts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import org.jetbrains.kotlin.gradle.dsl.KotlinCompile
22

33
plugins {
4-
kotlin("multiplatform") version "1.3.61" apply false
4+
kotlin("multiplatform") version "1.3.70" apply false
55
}
66

77
buildscript {
@@ -39,15 +39,15 @@ subprojects {
3939
afterEvaluate {
4040
dependencies {
4141
"commonMainImplementation"(kotlin("stdlib-common"))
42-
"commonMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core-common:1.3.3")
42+
"commonMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core-common:1.3.4")
4343
"jsMainImplementation"(kotlin("stdlib-js"))
44-
"jsMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core-js:1.3.3")
45-
"androidMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.3")
46-
"androidMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.3.3")
44+
"jsMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core-js:1.3.4")
45+
"androidMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.4")
46+
"androidMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.3.4")
4747
"jvmMainImplementation"(kotlin("stdlib-jdk8"))
48-
"jvmMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.3")
49-
"jvmMainApi"("app.teamhub:firebase-java:0.3.0")
50-
"jvmMainApi"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.3.3")
48+
"jvmMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.4")
49+
"jvmMainApi"("app.teamhub:firebase-java:0.3.1")
50+
"jvmMainApi"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.3.4")
5151
}
5252
}
5353
}

firebase-app/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
"dependencies": {
2626
"@teamhubapp/firebase-common": "0.1.0-dev12",
2727
"firebase": "6.2.3",
28-
"kotlin": "1.3.61",
29-
"kotlinx-coroutines-core": "1.3.2"
28+
"kotlin": "1.3.70",
29+
"kotlinx-coroutines-core": "1.3.4"
3030
}
3131
}
3232

firebase-auth/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
"dependencies": {
2626
"@teamhubapp/firebase-app": "0.1.0-dev12",
2727
"firebase": "6.2.3",
28-
"kotlin": "1.3.61",
29-
"kotlinx-coroutines-core": "1.3.2"
28+
"kotlin": "1.3.70",
29+
"kotlinx-coroutines-core": "1.3.4"
3030
}
3131
}
3232

firebase-common/build.gradle.kts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
id("com.android.library")
55
kotlin("multiplatform")
66
kotlin("native.cocoapods")
7-
kotlin("plugin.serialization") version "1.3.61"
7+
kotlin("plugin.serialization") version "1.3.70"
88
`maven-publish`
99
}
1010
repositories {
@@ -60,24 +60,24 @@ kotlin {
6060
sourceSets {
6161
val commonMain by getting {
6262
dependencies {
63-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime-common:0.14.0")
63+
implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime-common:0.20.0")
6464
}
6565
}
6666
val androidMain by getting {
6767
dependencies {
6868
api("com.google.firebase:firebase-common:19.2.0")
69-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.14.0")
69+
implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.20.0")
7070
}
7171
}
7272
val jsMain by getting {
7373
dependencies {
7474
// implementation(npm("firebase", "6.2.3"))
75-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime-js:0.14.0")
75+
implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime-js:0.20.0")
7676
}
7777
}
7878
val jvmMain by getting {
7979
dependencies {
80-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.14.0")
80+
implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.20.0")
8181
}
8282
kotlin.srcDir("src/androidMain/kotlin")
8383
}
@@ -89,7 +89,7 @@ kotlin {
8989
}
9090
val iosMain by creating {
9191
dependencies {
92-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime-native:0.14.0")
92+
implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime-native:0.20.0")
9393
}
9494
}
9595
configure(listOf(iosArm64, iosX64)) {

firebase-common/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
"homepage": "https://github.com/TeamHubApp/firebase-kotlin-multiplatform-sdk",
2525
"dependencies": {
2626
"firebase": "6.2.3",
27-
"kotlin": "1.3.61",
28-
"kotlinx-coroutines-core": "1.3.2",
29-
"@cachet/kotlinx-serialization-runtime": "0.14.0-rc.2"
27+
"kotlin": "1.3.70",
28+
"kotlinx-coroutines-core": "1.3.4",
29+
"@cachet/kotlinx-serialization-runtime": "0.20.0"
3030
}
3131
}
3232

firebase-database/build.gradle.kts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,29 +56,29 @@ kotlin {
5656
dependencies {
5757
api(project(":firebase-app"))
5858
implementation(project(":firebase-common"))
59-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime-common:0.14.0")
59+
implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime-common:0.20.0")
6060
}
6161
}
6262
val androidMain by getting {
6363
dependencies {
6464
api("com.google.firebase:firebase-database:17.0.0")
65-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.14.0")
65+
implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.20.0")
6666
}
6767
}
6868
val jvmMain by getting {
6969
dependencies {
70-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.14.0")
70+
implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.20.0")
7171
}
7272
kotlin.srcDir("src/androidMain/kotlin")
7373
}
7474
val jsMain by getting {
7575
dependencies {
76-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime-js:0.14.0")
76+
implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime-js:0.20.0")
7777
}
7878
}
7979
val iosMain by creating {
8080
dependencies {
81-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime-native:0.14.0")
81+
implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime-native:0.20.0")
8282
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-native:1.3.3")
8383
}
8484
}

firebase-database/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
"dependencies": {
2626
"@teamhubapp/firebase-app": "0.1.0-dev12",
2727
"firebase": "6.2.3",
28-
"kotlin": "1.3.61",
29-
"kotlinx-coroutines-core": "1.3.2"
28+
"kotlin": "1.3.70",
29+
"kotlinx-coroutines-core": "1.3.4"
3030
}
3131
}
3232

firebase-firestore/build.gradle.kts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,30 +56,30 @@ kotlin {
5656
dependencies {
5757
api(project(":firebase-app"))
5858
implementation(project(":firebase-common"))
59-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime-common:0.14.0")
59+
implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime-common:0.20.0")
6060
}
6161
}
6262
val androidMain by getting {
6363
dependencies {
6464
api("com.google.firebase:firebase-firestore:19.0.2")
65-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.14.0")
65+
implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.20.0")
6666
}
6767
}
6868
val iosMain by creating {
6969
dependencies {
70-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime-native:0.14.0")
70+
implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime-native:0.20.0")
7171
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-native:1.3.3")
7272
}
7373
}
7474
val jvmMain by getting {
7575
dependencies {
76-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.14.0")
76+
implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.20.0")
7777
}
7878
kotlin.srcDir("src/androidMain/kotlin")
7979
}
8080
val jsMain by getting {
8181
dependencies {
82-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime-js:0.14.0")
82+
implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime-js:0.20.0")
8383
}
8484
}
8585

firebase-firestore/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
"dependencies": {
2626
"@teamhubapp/firebase-app": "0.1.0-dev12",
2727
"firebase": "6.2.3",
28-
"kotlin": "1.3.61",
29-
"kotlinx-coroutines-core": "1.3.2"
28+
"kotlin": "1.3.70",
29+
"kotlinx-coroutines-core": "1.3.4"
3030
}
3131
}
3232

firebase-functions/build.gradle.kts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,29 +56,29 @@ kotlin {
5656
dependencies {
5757
api(project(":firebase-app"))
5858
implementation(project(":firebase-common"))
59-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime-common:0.14.0")
59+
implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime-common:0.20.0")
6060
}
6161
}
6262
val androidMain by getting {
6363
dependencies {
6464
api("com.google.firebase:firebase-functions:19.0.1")
65-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.14.0")
65+
implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.20.0")
6666
}
6767
}
6868
val iosMain by creating {
6969
dependencies {
70-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime-native:0.14.0")
70+
implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime-native:0.20.0")
7171
}
7272
}
7373
val jvmMain by getting {
7474
dependencies {
75-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.14.0")
75+
implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.20.0")
7676
}
7777
kotlin.srcDir("src/androidMain/kotlin")
7878
}
7979
val jsMain by getting {
8080
dependencies {
81-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime-js:0.14.0")
81+
implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime-js:0.20.0")
8282
}
8383
}
8484

0 commit comments

Comments
 (0)