Skip to content

Commit 47d280b

Browse files
shepelievshepeliev
committed
Merge branch 'master' into remote_config
2 parents e6e651a + 83fe1f0 commit 47d280b

File tree

18 files changed

+87
-30
lines changed

18 files changed

+87
-30
lines changed

‎build.gradle.kts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@ plugins {
1010

1111
buildscript {
1212
repositories {
13-
jcenter()
1413
google()
14+
mavenCentral()
1515
gradlePluginPortal()
1616
maven {
1717
url = uri("https://plugins.gradle.org/m2/")
1818
}
19+
jcenter()
1920
}
2021
dependencies {
2122
classpath("com.android.tools.build:gradle:4.2.1")
@@ -59,8 +60,8 @@ subprojects {
5960

6061
repositories {
6162
mavenLocal()
62-
mavenCentral()
6363
google()
64+
mavenCentral()
6465
jcenter()
6566
}
6667

‎firebase-app/build.gradle.kts‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
*/
44

55
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
6+
import org.jetbrains.kotlin.konan.target.KonanTarget
67

78
version = project.property("firebase-app.version") as String
89

@@ -12,8 +13,8 @@ plugins {
1213
}
1314

1415
repositories {
15-
mavenCentral()
1616
google()
17+
mavenCentral()
1718
jcenter()
1819
}
1920

@@ -53,6 +54,22 @@ kotlin {
5354
fun nativeTargetConfig(): KotlinNativeTarget.() -> Unit = {
5455
val nativeFrameworkPaths = listOf(
5556
projectDir.resolve("src/nativeInterop/cinterop/Carthage/Build/iOS")
57+
).plus(
58+
listOf(
59+
"FirebaseAnalytics",
60+
"FirebaseCore",
61+
"FirebaseCoreDiagnostics",
62+
"FirebaseInstallations",
63+
"GoogleAppMeasurement",
64+
"GoogleDataTransport",
65+
"GoogleUtilities",
66+
"nanopb",
67+
"PromisesObjC"
68+
).map {
69+
val archVariant = if (konanTarget is KonanTarget.IOS_X64) "ios-arm64_i386_x86_64-simulator" else "ios-arm64_armv7"
70+
71+
projectDir.resolve("src/nativeInterop/cinterop/Carthage/Build/$it.xcframework/$archVariant")
72+
}
5673
)
5774

5875
binaries {
@@ -111,7 +128,7 @@ kotlin {
111128

112129
val androidMain by getting {
113130
dependencies {
114-
api("com.google.firebase:firebase-common:19.5.0")
131+
api("com.google.firebase:firebase-common:20.0.0")
115132
}
116133
}
117134

‎firebase-app/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",
2525
"dependencies": {
2626
"@gitlive/firebase-common": "1.3.1",
27-
"firebase": "8.5.0",
27+
"firebase": "8.6.7",
2828
"kotlin": "1.5.10",
2929
"kotlinx-coroutines-core": "1.5.0"
3030
}

‎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" == 7.4.0
1+
binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAnalyticsBinary.json" == 8.1.1

‎firebase-auth/build.gradle.kts‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
*/
44

55
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
6+
import org.jetbrains.kotlin.konan.target.KonanTarget
67

78
version = project.property("firebase-auth.version") as String
89

@@ -75,8 +76,16 @@ kotlin {
7576

7677
fun nativeTargetConfig(): KotlinNativeTarget.() -> Unit = {
7778
val nativeFrameworkPaths = listOf(
78-
rootProject.project("firebase-app").projectDir.resolve("src/nativeInterop/cinterop/Carthage/Build/iOS"),
79-
projectDir.resolve("src/nativeInterop/cinterop/Carthage/Build/iOS")
79+
rootProject.project("firebase-app").projectDir.resolve("src/nativeInterop/cinterop/Carthage/Build/iOS")
80+
).plus(
81+
listOf(
82+
"FirebaseAuth",
83+
"GTMSessionFetcher"
84+
).map {
85+
val archVariant = if (konanTarget is KonanTarget.IOS_X64) "ios-arm64_i386_x86_64-simulator" else "ios-arm64_armv7"
86+
87+
projectDir.resolve("src/nativeInterop/cinterop/Carthage/Build/$it.xcframework/$archVariant")
88+
}
8089
)
8190

8291
binaries {
@@ -137,7 +146,7 @@ kotlin {
137146

138147
val androidMain by getting {
139148
dependencies {
140-
api("com.google.firebase:firebase-auth:20.0.4")
149+
api("com.google.firebase:firebase-auth:21.0.1")
141150
}
142151
}
143152

‎firebase-auth/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",
2525
"dependencies": {
2626
"@gitlive/firebase-app": "1.3.1",
27-
"firebase": "8.5.0",
27+
"firebase": "8.6.7",
2828
"kotlin": "1.5.10",
2929
"kotlinx-coroutines-core": "1.5.0"
3030
}

‎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" == 7.11.0
1+
binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAuthBinary.json" == 8.1.0

‎firebase-common/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ kotlin {
9595

9696
val androidMain by getting {
9797
dependencies {
98-
api("com.google.firebase:firebase-common:19.5.0")
98+
api("com.google.firebase:firebase-common:20.0.0")
9999
}
100100
}
101101

‎firebase-common/package.json‎

Lines changed: 2 additions & 2 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": "8.5.0",
26+
"firebase": "8.6.7",
2727
"kotlin": "1.5.10",
2828
"kotlinx-coroutines-core": "1.5.0",
29-
"kotlinx-serialization-kotlinx-serialization-runtime": "1.1.0"
29+
"kotlinx-serialization-kotlinx-serialization-runtime": "1.2.0"
3030
}
3131
}

‎firebase-database/build.gradle.kts‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
*/
44

55
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
6+
import org.jetbrains.kotlin.konan.target.KonanTarget
67

78
version = project.property("firebase-database.version") as String
89

@@ -12,8 +13,8 @@ plugins {
1213
}
1314

1415
repositories {
15-
mavenCentral()
1616
google()
17+
mavenCentral()
1718
jcenter()
1819
}
1920

@@ -51,8 +52,16 @@ kotlin {
5152

5253
fun nativeTargetConfig(): KotlinNativeTarget.() -> Unit = {
5354
val nativeFrameworkPaths = listOf(
54-
rootProject.project("firebase-app").projectDir.resolve("src/nativeInterop/cinterop/Carthage/Build/iOS"),
55-
projectDir.resolve("src/nativeInterop/cinterop/Carthage/Build/iOS")
55+
rootProject.project("firebase-app").projectDir.resolve("src/nativeInterop/cinterop/Carthage/Build/iOS")
56+
).plus(
57+
listOf(
58+
"FirebaseDatabase",
59+
"leveldb-library"
60+
).map {
61+
val archVariant = if (konanTarget is KonanTarget.IOS_X64) "ios-arm64_i386_x86_64-simulator" else "ios-arm64_armv7"
62+
63+
projectDir.resolve("src/nativeInterop/cinterop/Carthage/Build/$it.xcframework/$archVariant")
64+
}
5665
)
5766

5867
binaries {
@@ -115,7 +124,7 @@ kotlin {
115124

116125
val androidMain by getting {
117126
dependencies {
118-
api("com.google.firebase:firebase-database:19.7.0")
127+
api("com.google.firebase:firebase-database:20.0.0")
119128
}
120129
}
121130

0 commit comments

Comments
 (0)