Merge branch 'master' into feature/firestor-add-databaseid

Author: nbransby

.github/workflows/pull_request.yml

@@ -22,7 +22,7 @@ jobs:
       - name: run apiCheck
         run: ./gradlew apiCheck
   jobMatrixSetup:
-    runs-on: ubuntu-latest
+    runs-on: macos-latest
     outputs:
       emulator_jobs_matrix: ${{ steps.dataStep.outputs.emulator_jobs_matrix }}
       ios_test_jobs_matrix: ${{ steps.dataStep.outputs.ios_test_jobs_matrix }}
@@ -128,6 +128,9 @@ jobs:
             */build/cocoapods
             */build/classes
           key: cocoapods-cache-v2
+      - uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: latest-stable
       - name: Setup test environment
         uses: ./.github/actions/setup_test_action
       - name: Set Artifact Name

convention-plugin-test-option/src/main/kotlin/EmulatorJobsMatrix.kt

@@ -36,11 +36,7 @@ class EmulatorJobsMatrix {
                     (rootProject.property("${subProject.name}.skipIosTests") == "true").not()
         }.map { subProject ->
             when (val osArch = System.getProperty("os.arch")) {
-                "x86", "i386", "ia-32", "i686" -> "${subProject.path}:iosX86Test"
-                "x86_64", "amd64", "x64", "x86-64" -> "${subProject.path}:iosX64Test"
-                "arm", "arm-v7", "armv7", "arm32",
                 "arm64", "arm-v8", "aarch64" -> "${subProject.path}:iosSimulatorArm64Test"
-
                 else -> throw Error("Unexpected System.getProperty(\"os.arch\") = $osArch")
             }
         }.map { listOf("cleanTest", it) }

firebase-analytics/build.gradle.kts

@@ -77,7 +77,6 @@ kotlin {
 
     if (supportIosTarget) {
         iosArm64()
-        iosX64()
         iosSimulatorArm64()
         cocoapods {
             ios.deploymentTarget = libs.versions.ios.deploymentTarget.get()

firebase-analytics/src/androidMain/kotlin/dev/gitlive/firebase/analytics/analytics.kt

@@ -13,8 +13,7 @@ import kotlin.time.Duration
 public actual val Firebase.analytics: FirebaseAnalytics
     get() = FirebaseAnalytics(com.google.firebase.Firebase.analytics)
 
-public actual fun Firebase.analytics(app: FirebaseApp): FirebaseAnalytics =
-    FirebaseAnalytics(com.google.firebase.Firebase.analytics)
+public actual fun Firebase.analytics(app: FirebaseApp): FirebaseAnalytics = FirebaseAnalytics(com.google.firebase.Firebase.analytics)
 
 public val FirebaseAnalytics.android: com.google.firebase.analytics.FirebaseAnalytics get() = android
 

firebase-analytics/src/jsMain/kotlin/dev/gitlive/firebase/analytics/analytics.kt

@@ -11,8 +11,7 @@ import kotlin.time.Duration
 public actual val Firebase.analytics: FirebaseAnalytics
     get() = FirebaseAnalytics(getAnalytics())
 
-public actual fun Firebase.analytics(app: FirebaseApp): FirebaseAnalytics =
-    FirebaseAnalytics(getAnalytics(app.js))
+public actual fun Firebase.analytics(app: FirebaseApp): FirebaseAnalytics = FirebaseAnalytics(getAnalytics(app.js))
 
 public val FirebaseAnalytics.js: dev.gitlive.firebase.analytics.externals.FirebaseAnalytics get() = js
 

firebase-app/build.gradle.kts

@@ -78,7 +78,6 @@ kotlin {
 
     if (supportIosTarget) {
         iosArm64()
-        iosX64()
         iosSimulatorArm64()
 
         cocoapods {

firebase-app/src/androidMain/kotlin/dev/gitlive/firebase/firebase.kt

@@ -19,17 +19,13 @@ public val FirebaseApp.android: com.google.firebase.FirebaseApp get() = android
 public actual val Firebase.app: FirebaseApp
     get() = FirebaseApp(com.google.firebase.FirebaseApp.getInstance())
 
-public actual fun Firebase.app(name: String): FirebaseApp =
-    FirebaseApp(com.google.firebase.FirebaseApp.getInstance(name))
+public actual fun Firebase.app(name: String): FirebaseApp = FirebaseApp(com.google.firebase.FirebaseApp.getInstance(name))
 
-public actual fun Firebase.initialize(context: Any?): FirebaseApp? =
-    com.google.firebase.FirebaseApp.initializeApp(context as Context)?.let { FirebaseApp(it) }
+public actual fun Firebase.initialize(context: Any?): FirebaseApp? = com.google.firebase.FirebaseApp.initializeApp(context as Context)?.let { FirebaseApp(it) }
 
-public actual fun Firebase.initialize(context: Any?, options: FirebaseOptions, name: String): FirebaseApp =
-    FirebaseApp(com.google.firebase.FirebaseApp.initializeApp(context as Context, options.toAndroid(), name))
+public actual fun Firebase.initialize(context: Any?, options: FirebaseOptions, name: String): FirebaseApp = FirebaseApp(com.google.firebase.FirebaseApp.initializeApp(context as Context, options.toAndroid(), name))
 
-public actual fun Firebase.initialize(context: Any?, options: FirebaseOptions): FirebaseApp =
-    FirebaseApp(com.google.firebase.FirebaseApp.initializeApp(context as Context, options.toAndroid()))
+public actual fun Firebase.initialize(context: Any?, options: FirebaseOptions): FirebaseApp = FirebaseApp(com.google.firebase.FirebaseApp.initializeApp(context as Context, options.toAndroid()))
 
 public actual data class FirebaseApp internal constructor(internal val android: com.google.firebase.FirebaseApp) {
     actual val name: String

firebase-app/src/iosMain/kotlin/dev/gitlive/firebase/firebase.kt

@@ -17,17 +17,13 @@ public val FirebaseApp.ios: FIRApp get() = ios
 public actual val Firebase.app: FirebaseApp
     get() = FirebaseApp(FIRApp.defaultApp()!!)
 
-public actual fun Firebase.app(name: String): FirebaseApp =
-    FirebaseApp(FIRApp.appNamed(name)!!)
+public actual fun Firebase.app(name: String): FirebaseApp = FirebaseApp(FIRApp.appNamed(name)!!)
 
-public actual fun Firebase.initialize(context: Any?): FirebaseApp? =
-    FIRApp.configure().let { app }
+public actual fun Firebase.initialize(context: Any?): FirebaseApp? = FIRApp.configure().let { app }
 
-public actual fun Firebase.initialize(context: Any?, options: FirebaseOptions, name: String): FirebaseApp =
-    FIRApp.configureWithName(name, options.toIos()).let { app(name) }
+public actual fun Firebase.initialize(context: Any?, options: FirebaseOptions, name: String): FirebaseApp = FIRApp.configureWithName(name, options.toIos()).let { app(name) }
 
-public actual fun Firebase.initialize(context: Any?, options: FirebaseOptions): FirebaseApp =
-    FIRApp.configureWithOptions(options.toIos()).let { app }
+public actual fun Firebase.initialize(context: Any?, options: FirebaseOptions): FirebaseApp = FIRApp.configureWithOptions(options.toIos()).let { app }
 
 public actual data class FirebaseApp internal constructor(internal val ios: FIRApp) {
     actual val name: String

firebase-app/src/jsMain/kotlin/dev/gitlive/firebase/firebase.kt

@@ -14,17 +14,13 @@ import dev.gitlive.firebase.externals.FirebaseApp as JsFirebaseApp
 public actual val Firebase.app: FirebaseApp
     get() = FirebaseApp(getApp())
 
-public actual fun Firebase.app(name: String): FirebaseApp =
-    FirebaseApp(getApp(name))
+public actual fun Firebase.app(name: String): FirebaseApp = FirebaseApp(getApp(name))
 
-public actual fun Firebase.initialize(context: Any?): FirebaseApp? =
-    throw UnsupportedOperationException("Cannot initialize firebase without options in JS")
+public actual fun Firebase.initialize(context: Any?): FirebaseApp? = throw UnsupportedOperationException("Cannot initialize firebase without options in JS")
 
-public actual fun Firebase.initialize(context: Any?, options: FirebaseOptions, name: String): FirebaseApp =
-    FirebaseApp(initializeApp(options.toJson(), name))
+public actual fun Firebase.initialize(context: Any?, options: FirebaseOptions, name: String): FirebaseApp = FirebaseApp(initializeApp(options.toJson(), name))
 
-public actual fun Firebase.initialize(context: Any?, options: FirebaseOptions): FirebaseApp =
-    FirebaseApp(initializeApp(options.toJson()))
+public actual fun Firebase.initialize(context: Any?, options: FirebaseOptions): FirebaseApp = FirebaseApp(initializeApp(options.toJson()))
 
 public val FirebaseApp.js: JsFirebaseApp get() = js
 

firebase-auth/build.gradle.kts

@@ -78,7 +78,6 @@ kotlin {
 
     if (supportIosTarget) {
         iosArm64()
-        iosX64().enableKeychainForTests()
         iosSimulatorArm64().enableKeychainForTests()
         cocoapods {
             ios.deploymentTarget = libs.versions.ios.deploymentTarget.get()