Skip to content

➕ Add iosSimulatorArm64 target, introduced in KMM 1.5.30 #220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 23, 2021
Merged

➕ Add iosSimulatorArm64 target, introduced in KMM 1.5.30 #220

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b66b77f
➕ Add iosSimulatorArm64 target, introduced in KMM 1.5.30
pauldavies83 Sep 17, 2021
f938002
Merge branch 'master' into add_ios_native_targets
pauldavies83 Sep 23, 2021
2c207d1
♻️ replicate config to other modules
pauldavies83 Sep 23, 2021
1a4a7d2
Merge remote-tracking branch 'origin/add_ios_native_targets' into add…
pauldavies83 Sep 23, 2021
f340a86
🤦 remove erroneous `$`
pauldavies83 Sep 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,12 +207,12 @@ subprojects {
}

dependencies {
"commonMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1")
"androidMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.5.1")
"commonMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2")
"androidMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.5.2")
"androidMainImplementation"(platform("com.google.firebase:firebase-bom:28.4.0"))
"commonTestImplementation"(kotlin("test-common"))
"commonTestImplementation"(kotlin("test-annotations-common"))
"commonTestImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1")
"commonTestImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2")
"jsTestImplementation"(kotlin("test-js"))
"androidAndroidTestImplementation"(kotlin("test-junit"))
"androidAndroidTestImplementation"("junit:junit:4.13.2")
Expand Down
2 changes: 1 addition & 1 deletion firebase-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@
"@gitlive/firebase-common": "1.4.2",
"firebase": "8.10.0",
"kotlin": "1.5.30",
"kotlinx-coroutines-core": "1.5.1"
"kotlinx-coroutines-core": "1.5.2"
}
}
2 changes: 1 addition & 1 deletion firebase-auth/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@
"@gitlive/firebase-app": "1.4.2",
"firebase": "8.10.0",
"kotlin": "1.5.30",
"kotlinx-coroutines-core": "1.5.1"
"kotlinx-coroutines-core": "1.5.2"
}
}
19 changes: 9 additions & 10 deletions firebase-common/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,8 @@ kotlin {
publishAllLibraryVariants()
}

fun nativeTargetConfig(): KotlinNativeTarget.() -> Unit = {

}

if (project.extra["ideaActive"] as Boolean) {
iosX64("ios", nativeTargetConfig())
} else {
ios(configure = nativeTargetConfig())
}
ios()
iosSimulatorArm64()

js {
useCommonJs()
Expand Down Expand Up @@ -89,7 +82,7 @@ kotlin {

val commonMain by getting {
dependencies {
api("org.jetbrains.kotlinx:kotlinx-serialization-core:1.2.2")
api("org.jetbrains.kotlinx:kotlinx-serialization-core:1.3.0-RC")
}
}

Expand All @@ -100,6 +93,12 @@ kotlin {
}

val iosMain by getting
val iosSimulatorArm64Main by getting
iosSimulatorArm64Main.dependsOn(iosMain)

val iosTest by sourceSets.getting
val iosSimulatorArm64Test by sourceSets.getting
iosSimulatorArm64Test.dependsOn(iosTest)

val jsMain by getting {
dependencies {
Expand Down
2 changes: 1 addition & 1 deletion firebase-common/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"dependencies": {
"firebase": "8.10.0",
"kotlin": "1.5.30",
"kotlinx-coroutines-core": "1.5.1",
"kotlinx-coroutines-core": "1.5.2",
"kotlinx-serialization-kotlinx-serialization-runtime": "1.2.2"
}
}
2 changes: 1 addition & 1 deletion firebase-config/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@
"@gitlive/firebase-app": "1.4.2",
"firebase": "8.10.0",
"kotlin": "1.5.30",
"kotlinx-coroutines-core": "1.5.1"
"kotlinx-coroutines-core": "1.5.2"
}
}
2 changes: 1 addition & 1 deletion firebase-database/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@
"@gitlive/firebase-app": "1.4.2",
"firebase": "8.10.0",
"kotlin": "1.5.30",
"kotlinx-coroutines-core": "1.5.1"
"kotlinx-coroutines-core": "1.5.2"
}
}
2 changes: 1 addition & 1 deletion firebase-firestore/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@
"@gitlive/firebase-app": "1.4.2",
"firebase": "8.10.0",
"kotlin": "1.5.30",
"kotlinx-coroutines-core": "1.5.1"
"kotlinx-coroutines-core": "1.5.2"
}
}
2 changes: 1 addition & 1 deletion firebase-functions/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@
"@gitlive/firebase-app": "1.4.2",
"firebase": "8.10.0",
"kotlin": "1.5.30",
"kotlinx-coroutines-core": "1.5.1"
"kotlinx-coroutines-core": "1.5.2"
}
}