Merge branch 'feature/kotlin-2.0' into feature/api-validation

Author: Daeda88

.github/workflows/publish.yml

@@ -15,7 +15,7 @@ env:
 
 jobs:
   build:
-    runs-on: macos-14
+    runs-on: macos-latest
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK

.github/workflows/pull_request.yml

@@ -82,7 +82,7 @@ jobs:
           name: "Firebase Debug Log"
           path: "**/firebase-debug.log"
   build-ios:
-    runs-on: macos-14
+    runs-on: macos-latest
     steps:
       - uses: actions/checkout@v4
       - name: Cocoapods cache

firebase-crashlytics/src/commonTest/kotlin/dev/gitlive/firebase/crashlytics/crashlytics.kt

@@ -10,10 +10,12 @@ import dev.gitlive.firebase.apps
 import dev.gitlive.firebase.initialize
 import dev.gitlive.firebase.runBlockingTest
 import dev.gitlive.firebase.runTest
+import kotlinx.coroutines.delay
 import kotlin.test.AfterTest
 import kotlin.test.BeforeTest
 import kotlin.test.Test
 import kotlin.test.assertFalse
+import kotlin.time.Duration.Companion.seconds
 
 expect val emulatorHost: String
 expect val context: Any
@@ -51,36 +53,57 @@ class FirebaseCrashlyticsTest {
     @Test
     fun testRecordException() = runTest {
         crashlytics.recordException(Exception("Test Exception"))
+
+        // Delay to ensure Crashlytics completes
+        delay(1.seconds)
     }
 
     @Test
     fun testLog() = runTest {
         crashlytics.log("Test Log")
+
+        // Delay to ensure Crashlytics completes
+        delay(1.seconds)
     }
 
     @Test
     fun testSetUserId() = runTest {
         crashlytics.setUserId("Test User Id")
+
+        // Delay to ensure Crashlytics completes
+        delay(1.seconds)
     }
 
     @Test
     fun testSendUnsentReports() = runTest {
         crashlytics.sendUnsentReports()
+
+        // Delay to ensure Crashlytics completes
+        delay(1.seconds)
     }
 
     @Test
     fun testDeleteUnsentReports() = runTest {
         crashlytics.deleteUnsentReports()
+
+        // Delay to ensure Crashlytics completes
+        delay(1.seconds)
     }
 
     @Test
     fun testDidCrashOnPreviousExecution() = runTest {
         val didCrash = crashlytics.didCrashOnPreviousExecution()
         assertFalse { didCrash }
+
+        // Delay to ensure Crashlytics completes
+        delay(1.seconds)
     }
 
     @Test
     fun testSetCrashlyticsCollectionEnabled() = runTest {
         crashlytics.setCrashlyticsCollectionEnabled(true)
+
+        // Delay to ensure Crashlytics completes
+        delay(1.seconds)
     }
 }

firebase-storage/src/commonTest/kotlin/dev/gitlive/firebase/storage/storage.kt

@@ -9,6 +9,7 @@ import dev.gitlive.firebase.FirebaseOptions
 import dev.gitlive.firebase.apps
 import dev.gitlive.firebase.initialize
 import dev.gitlive.firebase.runBlockingTest
+import dev.gitlive.firebase.runTest
 import kotlin.test.AfterTest
 import kotlin.test.BeforeTest
 import kotlin.test.Test
@@ -58,14 +59,15 @@ class FirebaseStorageTest {
     }
 
     @Test
-    fun testUploadShouldNotCrash() = runBlockingTest {
+    fun testUploadShouldNotCrash() = runTest {
         val data = createTestData()
         val ref = storage.reference("test").child("testUploadShouldNotCrash.txt")
+
         ref.putData(data)
     }
 
     @Test
-    fun testUploadMetadata() = runBlockingTest {
+    fun testUploadMetadata() = runTest {
         val data = createTestData()
         val ref = storage.reference("test").child("testUploadMetadata.txt")
         val metadata = storageMetadata {
@@ -81,7 +83,7 @@ class FirebaseStorageTest {
     }
 
     @Test
-    fun testUploadCustomMetadata() = runBlockingTest {
+    fun testUploadCustomMetadata() = runTest {
         val data = createTestData()
         val ref = storage.reference("test").child("testUploadCustomMetadata.txt")
         val metadata = storageMetadata {

firebase-storage/src/iosTest/kotlin/dev/gitlive/firebase/storage/storage.kt

@@ -4,7 +4,7 @@
 
 package dev.gitlive.firebase.storage
 
-actual val emulatorHost: String = "127.0.0.1"
+actual val emulatorHost: String = "localhost"
 
 actual val context: Any = Unit