From 5ebb829fd7dadf686d1bdc697ce308ff9d49f331 Mon Sep 17 00:00:00 2001 From: Travis Reitter Date: Mon, 23 Jun 2025 22:49:09 -0700 Subject: [PATCH 1/3] bump Firebase Cocoapods from 11.4.0 to 11.8.0 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1b38073d8..0269ab11a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -16,7 +16,7 @@ kotlinx-datetime = "0.6.1" kotlinter = "4.4.1" settings-api = "2.0" settings-language = "2.0" -firebase-cocoapods = "11.4.0" +firebase-cocoapods = "11.8.0" ios-deploymentTarget = "13.0" test-logger-plugin = "4.0.0" dokka = "1.9.20" From 26198709d8899b09b04dd4e449e170302f9dab19 Mon Sep 17 00:00:00 2001 From: Travis Reitter Date: Mon, 23 Jun 2025 22:54:52 -0700 Subject: [PATCH 2/3] bump Firebase BOM from 33.10.0 to 33.15.0 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0269ab11a..4c8edb298 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ androidx-test-core = "1.6.1" androidx-test-junit = "1.2.1" androidx-test-runner = "1.6.2" ben-manes-versions = "0.51.0" -firebase-bom = "33.10.0" +firebase-bom = "33.15.0" gitlive-firebase-java-sdk = "0.4.6" gson = "2.11.0" junit = "4.13.2" From ef183fce24c786f8450ceb5378dc35c5a6943fc5 Mon Sep 17 00:00:00 2001 From: Travis Reitter Date: Mon, 23 Jun 2025 22:51:34 -0700 Subject: [PATCH 3/3] auth: support ActionCodeSettings.linkDomain property Platforms supported: * android * ios * js * NOT jvm --- .../src/androidMain/kotlin/dev/gitlive/firebase/auth/auth.kt | 1 + .../src/commonMain/kotlin/dev/gitlive/firebase/auth/auth.kt | 1 + .../src/iosMain/kotlin/dev/gitlive/firebase/auth/auth.kt | 1 + .../src/jsMain/kotlin/dev/gitlive/firebase/auth/auth.kt | 1 + 4 files changed, 4 insertions(+) diff --git a/firebase-auth/src/androidMain/kotlin/dev/gitlive/firebase/auth/auth.kt b/firebase-auth/src/androidMain/kotlin/dev/gitlive/firebase/auth/auth.kt index cc4f2957d..77ce57110 100644 --- a/firebase-auth/src/androidMain/kotlin/dev/gitlive/firebase/auth/auth.kt +++ b/firebase-auth/src/androidMain/kotlin/dev/gitlive/firebase/auth/auth.kt @@ -165,6 +165,7 @@ internal fun ActionCodeSettings.toAndroid() = com.google.firebase.auth.ActionCod .setUrl(url) .also { androidPackageName?.run { it.setAndroidPackageName(packageName, installIfNotAvailable, minimumVersion) } } .also { dynamicLinkDomain?.run { it.setDynamicLinkDomain(this) } } + .also { linkDomain?.run { it.setLinkDomain(this) } } .setHandleCodeInApp(canHandleCodeInApp) .also { iOSBundleId?.run { it.setIOSBundleId(this) } } .build() diff --git a/firebase-auth/src/commonMain/kotlin/dev/gitlive/firebase/auth/auth.kt b/firebase-auth/src/commonMain/kotlin/dev/gitlive/firebase/auth/auth.kt index 2665d2eb8..628971a73 100644 --- a/firebase-auth/src/commonMain/kotlin/dev/gitlive/firebase/auth/auth.kt +++ b/firebase-auth/src/commonMain/kotlin/dev/gitlive/firebase/auth/auth.kt @@ -77,6 +77,7 @@ public data class ActionCodeSettings( val dynamicLinkDomain: String? = null, val canHandleCodeInApp: Boolean = false, val iOSBundleId: String? = null, + val linkDomain: String? = null, ) public data class AndroidPackageName( diff --git a/firebase-auth/src/iosMain/kotlin/dev/gitlive/firebase/auth/auth.kt b/firebase-auth/src/iosMain/kotlin/dev/gitlive/firebase/auth/auth.kt index 30ff27bc1..c2bf2462e 100644 --- a/firebase-auth/src/iosMain/kotlin/dev/gitlive/firebase/auth/auth.kt +++ b/firebase-auth/src/iosMain/kotlin/dev/gitlive/firebase/auth/auth.kt @@ -161,6 +161,7 @@ internal fun ActionCodeSettings.toIos() = FIRActionCodeSettings().also { it.setURL(NSURL.URLWithString(url)) androidPackageName?.run { it.setAndroidPackageName(packageName, installIfNotAvailable, minimumVersion) } it.setDynamicLinkDomain(dynamicLinkDomain) + it.setLinkDomain(linkDomain) it.setHandleCodeInApp(canHandleCodeInApp) iOSBundleId?.run { it.setIOSBundleID(this) } } diff --git a/firebase-auth/src/jsMain/kotlin/dev/gitlive/firebase/auth/auth.kt b/firebase-auth/src/jsMain/kotlin/dev/gitlive/firebase/auth/auth.kt index 4d0223d28..f2ef334e5 100644 --- a/firebase-auth/src/jsMain/kotlin/dev/gitlive/firebase/auth/auth.kt +++ b/firebase-auth/src/jsMain/kotlin/dev/gitlive/firebase/auth/auth.kt @@ -188,6 +188,7 @@ public actual class AuthTokenResult(internal val js: IdTokenResult) { internal fun ActionCodeSettings.toJson() = json( "url" to url, "android" to (androidPackageName?.run { json("installApp" to installIfNotAvailable, "minimumVersion" to minimumVersion, "packageName" to packageName) } ?: undefined), + "linkDomain" to (linkDomain ?: undefined), "dynamicLinkDomain" to (dynamicLinkDomain ?: undefined), "handleCodeInApp" to canHandleCodeInApp, "ios" to (iOSBundleId?.run { json("bundleId" to iOSBundleId) } ?: undefined),