Merge remote-tracking branch 'GitLiveApp/master' into feature/api-validation

Author: Daeda88

.github/workflows/pull_request.yml

@@ -39,6 +39,9 @@ jobs:
           sudo udevadm trigger --name-match=kvm
       - name: Setup test environment
         uses: ./.github/actions/setup_test_action
+      - name: Set Artifact Name
+        run: |
+          echo "ARCHIVE_KEY=$(echo ${{ matrix.gradle_tasks }} | cut -d: -f2)" >> $GITHUB_ENV
       - name: Apply Android licenses
         run: ./gradlew ciSdkManagerLicenses
       - name: Run Android Instrumented Tests
@@ -47,13 +50,13 @@ jobs:
         uses: actions/upload-artifact@v4
         if: failure()
         with:
-          name: Android ${{ matrix.gradle_tasks }} Test Report HTML
+          name: Android ${{ env.ARCHIVE_KEY }} Test Report HTML
           path: "**/build/reports/androidTests/"
       - name: Upload Firebase Debug Log
         uses: actions/upload-artifact@v4
         if: failure()
         with:
-          name: Android ${{ matrix.gradle_tasks }} Firebase Debug Log
+          name: Android ${{ env.ARCHIVE_KEY }} Firebase Debug Log
           path: "**/firebase-debug.log"
   build-js:
     runs-on: ubuntu-latest

firebase-auth/build.gradle.kts

@@ -2,6 +2,8 @@ import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompilerOptions
 import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSetTree
+import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTargetWithSimulatorTests
+import org.jetbrains.kotlin.gradle.targets.native.tasks.KotlinNativeSimulatorTest
 
 /*
  * Copyright (c) 2020 GitLive Ltd.  Use of this source code is governed by the Apache 2.0 license.
@@ -77,8 +79,8 @@ kotlin {
 
     if (supportIosTarget) {
         iosArm64()
-        iosX64()
-        iosSimulatorArm64()
+        iosX64().enableKeychainForTests()
+        iosSimulatorArm64().enableKeychainForTests()
         cocoapods {
             ios.deploymentTarget = "12.0"
             framework {
@@ -162,6 +164,29 @@ if (project.property("firebase-auth.skipJsTests") == "true") {
     }
 }
 
+if (supportIosTarget) {
+    tasks.create<Exec>("launchIosSimulator") {
+        commandLine("open", "-a", "Simulator")
+    }
+
+    tasks.withType<KotlinNativeSimulatorTest>().configureEach {
+        dependsOn("launchIosSimulator")
+        standalone.set(false)
+        device.set("booted")
+    }
+}
+
+fun KotlinNativeTargetWithSimulatorTests.enableKeychainForTests() {
+    testRuns.configureEach {
+        executionSource.binary.linkerOpts(
+            "-sectcreate",
+            "__TEXT",
+            "__entitlements",
+            file("$projectDir/src/commonTest/resources/entitlements.plist").absolutePath
+        )
+    }
+}
+
 signing {
     val signingKey: String? by project
     val signingPassword: String? by project

firebase-auth/src/commonTest/resources/entitlements.plist

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>application-identifier</key>
+	<string>{PERSONAL_ID}.bundle.id</string>
+	<key>keychain-access-groups</key>
+	<array>
+		<string>{PERSONAL_ID}.bundle.id</string>
+	</array>
+</dict>
+</plist>

gradle.properties

@@ -25,7 +25,7 @@ skipIosTarget=false
 firebase-analytics.skipIosTests=true
 firebase-app.skipIosTests=false
 # We are skipping auth ios tests due to an issue with keychain and simulator.
-firebase-auth.skipIosTests=true
+firebase-auth.skipIosTests=false
 firebase-common.skipIosTests=false
 firebase-common-internal.skipIosTests=false
 firebase-config.skipIosTests=false