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 all 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
18 changes: 3 additions & 15 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
import org.apache.tools.ant.taskdefs.condition.Os
import org.gradle.api.tasks.testing.logging.TestExceptionFormat
import org.gradle.api.tasks.testing.logging.TestLogEvent
Expand Down Expand Up @@ -26,15 +25,6 @@ buildscript {
val targetSdkVersion by extra(30)
val minSdkVersion by extra(16)

// TODO: Hierarchical project structures are not fully supported in IDEA, enable only for a regular built (https://youtrack.jetbrains.com/issue/KT-35011)
// add idea.active=true for local development
val _ideaActive = gradleLocalProperties(rootDir)["idea.active"] == "true"

//if (!_ideaActive) {
// ext["kotlin.mpp.enableGranularSourceSetsMetadata"] = "true"
// ext["kotlin.native.enableDependencyPropagation"] = "false"
//}

tasks {
val updateVersions by registering {
dependsOn(
Expand All @@ -51,8 +41,6 @@ tasks {

subprojects {

val ideaActive by extra(_ideaActive)

group = "dev.gitlive"

apply(plugin="com.adarshr.test-logger")
Expand Down Expand Up @@ -207,12 +195,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
24 changes: 16 additions & 8 deletions firebase-app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,13 @@ android {
}
}

val KonanTarget.archVariant: String
get() = if (this is KonanTarget.IOS_X64 || this is KonanTarget.IOS_SIMULATOR_ARM64) {
"ios-arm64_i386_x86_64-simulator"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As I understand it, this slice should be correct for x86 and arm simulators

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚨 This doesn't build locally - the issue appears to be at the :firebase-app:cinteropFirebaseCoreIosArm64 task, which I don't quite understand how to get a verbose output from as it runs in another Java process (I'm probably past my level of understanding here 😅).

I've pushed the changes anyway in case there is something obvious I have missed? @Reedyuk

Copy link
Contributor

@tiagonuneslx tiagonuneslx Sep 23, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pauldavies83 It compiles in my machine. I've had that error happen to me a number of times because of cinterop tasks caching incorrectly. Try Clean Project, it usually fixes it :)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤔 Hmmm, I get the same error after a clean...

./gradlew clean build --no-build-cache

I found an issue from reading the CI log anyway, which I've fixed here

} else {
"ios-arm64_armv7"
}

kotlin {

android {
Expand All @@ -65,9 +72,7 @@ kotlin {
"nanopb",
"PromisesObjC"
).map {
val archVariant = if (konanTarget is KonanTarget.IOS_X64) "ios-arm64_i386_x86_64-simulator" else "ios-arm64_armv7"

projectDir.resolve("src/nativeInterop/cinterop/Carthage/Build/$it.xcframework/$archVariant")
projectDir.resolve("src/nativeInterop/cinterop/Carthage/Build/$it.xcframework/${konanTarget.archVariant}")
}
)

Expand All @@ -86,11 +91,8 @@ kotlin {
}
}

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

js {
useCommonJs()
Expand Down Expand Up @@ -132,6 +134,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
}
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"
}
}
28 changes: 17 additions & 11 deletions firebase-auth/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,13 @@ android {
// logEmulatorOutput(false)
//}

val KonanTarget.archVariant: String
get() = if (this is KonanTarget.IOS_X64 || this is KonanTarget.IOS_SIMULATOR_ARM64) {
"ios-arm64_i386_x86_64-simulator"
} else {
"ios-arm64_armv7"
}

kotlin {

android {
Expand All @@ -88,18 +95,14 @@ kotlin {
"nanopb",
"PromisesObjC"
).map {
val archVariant = if (konanTarget is KonanTarget.IOS_X64) "ios-arm64_i386_x86_64-simulator" else "ios-arm64_armv7"

rootProject.project("firebase-app").projectDir.resolve("src/nativeInterop/cinterop/Carthage/Build/$it.xcframework/$archVariant")
rootProject.project("firebase-app").projectDir.resolve("src/nativeInterop/cinterop/Carthage/Build/$it.xcframework/${konanTarget.archVariant}")
}
).plus(
listOf(
"FirebaseAuth",
"GTMSessionFetcher"
).map {
val archVariant = if (konanTarget is KonanTarget.IOS_X64) "ios-arm64_i386_x86_64-simulator" else "ios-arm64_armv7"

projectDir.resolve("src/nativeInterop/cinterop/Carthage/Build/$it.xcframework/$archVariant")
projectDir.resolve("src/nativeInterop/cinterop/Carthage/Build/$it.xcframework/${konanTarget.archVariant}")
}
)

Expand All @@ -118,11 +121,8 @@ kotlin {
}
}

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

js {
useCommonJs()
Expand Down Expand Up @@ -166,6 +166,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
}
Expand Down
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"
}
}
29 changes: 18 additions & 11 deletions firebase-config/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
*/

import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
import org.jetbrains.kotlin.konan.target.KonanTarget

version = project.property("firebase-config.version") as String

Expand Down Expand Up @@ -55,6 +56,13 @@ android {
// logEmulatorOutput(false)
//}

val KonanTarget.archVariant: String
get() = if (this is KonanTarget.IOS_X64 || this is KonanTarget.IOS_SIMULATOR_ARM64) {
"ios-arm64_i386_x86_64-simulator"
} else {
"ios-arm64_armv7"
}

kotlin {

android {
Expand All @@ -73,17 +81,13 @@ kotlin {
"PromisesObjC",
"nanopb"
).map {
val archVariant =
if (konanTarget is org.jetbrains.kotlin.konan.target.KonanTarget.IOS_X64) "ios-arm64_i386_x86_64-simulator" else "ios-arm64_armv7"
rootProject.project("firebase-app").projectDir.resolve("src/nativeInterop/cinterop/Carthage/Build/$it.xcframework/$archVariant")
rootProject.project("firebase-app").projectDir.resolve("src/nativeInterop/cinterop/Carthage/Build/$it.xcframework/${konanTarget.archVariant}")
}.plus(
listOf(
"FirebaseABTesting",
"FirebaseRemoteConfig"
).map {
val archVariant =
if (konanTarget is org.jetbrains.kotlin.konan.target.KonanTarget.IOS_X64) "ios-arm64_i386_x86_64-simulator" else "ios-arm64_armv7"
projectDir.resolve("src/nativeInterop/cinterop/Carthage/Build/$it.xcframework/$archVariant")
projectDir.resolve("src/nativeInterop/cinterop/Carthage/Build/$it.xcframework/${konanTarget.archVariant}")
}
)

Expand All @@ -102,11 +106,8 @@ kotlin {
}
}

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

js {
useCommonJs()
Expand Down Expand Up @@ -143,6 +144,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
}
Expand Down
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"
}
}
28 changes: 17 additions & 11 deletions firebase-database/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,13 @@ android {
}
}

val KonanTarget.archVariant: String
get() = if (this is KonanTarget.IOS_X64 || this is KonanTarget.IOS_SIMULATOR_ARM64) {
"ios-arm64_i386_x86_64-simulator"
} else {
"ios-arm64_armv7"
}

kotlin {

android {
Expand All @@ -64,18 +71,14 @@ kotlin {
"nanopb",
"PromisesObjC"
).map {
val archVariant = if (konanTarget is KonanTarget.IOS_X64) "ios-arm64_i386_x86_64-simulator" else "ios-arm64_armv7"

rootProject.project("firebase-app").projectDir.resolve("src/nativeInterop/cinterop/Carthage/Build/$it.xcframework/$archVariant")
rootProject.project("firebase-app").projectDir.resolve("src/nativeInterop/cinterop/Carthage/Build/$it.xcframework/${konanTarget.archVariant}")
}
).plus(
listOf(
"FirebaseDatabase",
"leveldb-library"
).map {
val archVariant = if (konanTarget is KonanTarget.IOS_X64) "ios-arm64_i386_x86_64-simulator" else "ios-arm64_armv7"

projectDir.resolve("src/nativeInterop/cinterop/Carthage/Build/$it.xcframework/$archVariant")
projectDir.resolve("src/nativeInterop/cinterop/Carthage/Build/$it.xcframework/${konanTarget.archVariant}")
}
)

Expand All @@ -94,11 +97,8 @@ kotlin {
}
}

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

js {
useCommonJs()
Expand Down Expand Up @@ -144,6 +144,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
}
Expand Down
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"
}
}
Loading