Skip to content

Commit 7bbf408

Browse files
suntrixsuntrix
committed
updated Kotlin to 1.6.10, Android target SDK to 31, Android Gradle Plugin to 7.1.0 & dependencies
1 parent c7bebbd commit 7bbf408

File tree

23 files changed

+67
-69
lines changed

23 files changed

+67
-69
lines changed

‎build.gradle.kts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat
33
import org.gradle.api.tasks.testing.logging.TestLogEvent
44

55
plugins {
6-
kotlin("multiplatform") version "1.5.31" apply false
6+
kotlin("multiplatform") version "1.6.10" apply false
77
id("base")
88
}
99

@@ -17,12 +17,12 @@ buildscript {
1717
}
1818
}
1919
dependencies {
20-
classpath("com.android.tools.build:gradle:7.0.3")
20+
classpath("com.android.tools.build:gradle:7.1.0")
2121
classpath("com.adarshr:gradle-test-logger-plugin:2.1.1")
2222
}
2323
}
2424

25-
val targetSdkVersion by extra(30)
25+
val targetSdkVersion by extra(31)
2626
val minSdkVersion by extra(19)
2727

2828
tasks {
@@ -44,7 +44,7 @@ subprojects {
4444

4545
group = "dev.gitlive"
4646

47-
apply(plugin="com.adarshr.test-logger")
47+
apply(plugin = "com.adarshr.test-logger")
4848

4949
repositories {
5050
mavenLocal()
@@ -107,7 +107,7 @@ subprojects {
107107
into.writeText(
108108
from.readText()
109109
.replace("require('firebase-kotlin-sdk-", "require('@gitlive/")
110-
// .replace("require('kotlinx-serialization-kotlinx-serialization-runtime')", "require('@gitlive/kotlinx-serialization-runtime')")
110+
// .replace("require('kotlinx-serialization-kotlinx-serialization-runtime')", "require('@gitlive/kotlinx-serialization-runtime')")
111111
)
112112
}
113113
}
@@ -197,12 +197,12 @@ subprojects {
197197
}
198198

199199
dependencies {
200-
"commonMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2-native-mt")
201-
"androidMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.5.2-native-mt")
202-
"androidMainImplementation"(platform("com.google.firebase:firebase-bom:29.0.1"))
200+
"commonMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0-native-mt")
201+
"androidMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.6.0-native-mt")
202+
"androidMainImplementation"(platform("com.google.firebase:firebase-bom:29.3.0"))
203203
"commonTestImplementation"(kotlin("test-common"))
204204
"commonTestImplementation"(kotlin("test-annotations-common"))
205-
"commonTestImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2-native-mt")
205+
"commonTestImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0-native-mt")
206206
"jsTestImplementation"(kotlin("test-js"))
207207
"androidAndroidTestImplementation"(kotlin("test-junit"))
208208
"androidAndroidTestImplementation"("junit:junit:4.13.2")

‎firebase-app/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ android {
4040
resources.pickFirsts.add("META-INF/LGPL2.1")
4141
}
4242
lint {
43-
isAbortOnError = false
43+
abortOnError = false
4444
}
4545
}
4646

@@ -120,8 +120,8 @@ kotlin {
120120
sourceSets {
121121
all {
122122
languageSettings.apply {
123-
apiVersion = "1.5"
124-
languageVersion = "1.5"
123+
apiVersion = "1.6"
124+
languageVersion = "1.6"
125125
progressiveMode = true
126126
}
127127
}

‎firebase-app/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
"homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",
2525
"dependencies": {
2626
"@gitlive/firebase-common": "1.5.0",
27-
"firebase": "9.4.1",
28-
"kotlin": "1.5.31",
29-
"kotlinx-coroutines-core": "1.5.2-native-mt"
27+
"firebase": "9.6.10",
28+
"kotlin": "1.6.10",
29+
"kotlinx-coroutines-core": "1.6.0-native-mt"
3030
}
3131
}

‎firebase-app/src/nativeInterop/cinterop/Cartfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAnalyticsBinary.json" == 8.9.1
1+
binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAnalyticsBinary.json" == 8.14.0

‎firebase-auth/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ android {
5050
resources.pickFirsts.add("META-INF/LGPL2.1")
5151
}
5252
lint {
53-
isAbortOnError = false
53+
abortOnError = false
5454
}
5555
}
5656

@@ -149,8 +149,8 @@ kotlin {
149149
sourceSets {
150150
all {
151151
languageSettings.apply {
152-
apiVersion = "1.5"
153-
languageVersion = "1.5"
152+
apiVersion = "1.6"
153+
languageVersion = "1.6"
154154
progressiveMode = true
155155
optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
156156
}

‎firebase-auth/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
"homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",
2525
"dependencies": {
2626
"@gitlive/firebase-app": "1.5.0",
27-
"firebase": "9.4.1",
28-
"kotlin": "1.5.31",
29-
"kotlinx-coroutines-core": "1.5.2-native-mt"
27+
"firebase": "9.6.10",
28+
"kotlin": "1.6.10",
29+
"kotlinx-coroutines-core": "1.6.0-native-mt"
3030
}
3131
}

‎firebase-auth/src/nativeInterop/cinterop/Cartfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAuthBinary.json" == 8.9.1
1+
binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAuthBinary.json" == 8.14.0

‎firebase-common/build.gradle.kts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ version = project.property("firebase-common.version") as String
99
plugins {
1010
id("com.android.library")
1111
kotlin("multiplatform")
12-
kotlin("plugin.serialization") version "1.5.31"
12+
kotlin("plugin.serialization") version "1.6.10"
1313
}
1414

1515
android {
@@ -36,7 +36,7 @@ android {
3636
resources.pickFirsts.add("META-INF/LGPL2.1")
3737
}
3838
lint {
39-
isAbortOnError = false
39+
abortOnError = false
4040
}
4141
}
4242

@@ -74,8 +74,8 @@ kotlin {
7474
sourceSets {
7575
all {
7676
languageSettings.apply {
77-
apiVersion = "1.5"
78-
languageVersion = "1.5"
77+
apiVersion = "1.6"
78+
languageVersion = "1.6"
7979
progressiveMode = true
8080
optIn("kotlin.Experimental")
8181
optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
@@ -86,7 +86,7 @@ kotlin {
8686

8787
val commonMain by getting {
8888
dependencies {
89-
api("org.jetbrains.kotlinx:kotlinx-serialization-core:1.3.0")
89+
api("org.jetbrains.kotlinx:kotlinx-serialization-core:1.3.2")
9090
}
9191
}
9292

‎firebase-common/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
},
2424
"homepage": "https://github.com/GitLiveApp/firebase-kotlin-multiplatform-sdk",
2525
"dependencies": {
26-
"firebase": "9.4.1",
27-
"kotlin": "1.5.31",
28-
"kotlinx-coroutines-core": "1.5.2-native-mt",
29-
"kotlinx-serialization-kotlinx-serialization-runtime": "1.3.0"
26+
"firebase": "9.6.10",
27+
"kotlin": "1.6.10",
28+
"kotlinx-coroutines-core": "1.6.0-native-mt",
29+
"kotlinx-serialization-kotlinx-serialization-runtime": "1.3.2"
3030
}
3131
}

‎firebase-config/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ android {
3939
resources.pickFirsts.add("META-INF/LGPL2.1")
4040
}
4141
lint {
42-
isAbortOnError = false
42+
abortOnError = false
4343
}
4444
}
4545

@@ -127,8 +127,8 @@ kotlin {
127127
sourceSets {
128128
all {
129129
languageSettings.apply {
130-
apiVersion = "1.5"
131-
languageVersion = "1.5"
130+
apiVersion = "1.6"
131+
languageVersion = "1.6"
132132
progressiveMode = true
133133
optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
134134
}

0 commit comments

Comments
 (0)