Rc v1.3.0 (#16)

* Fixing firebase exception crash * Res import fixing * Updating api * Koin version upgrade
mirzemehdi · Apr 10, 2024 · 7477fab · 7477fab
1 parent 1e08756
commit 7477fab
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 57 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -18,4 +18,4 @@ kotlin.mpp.enableCInteropCommonization=true
 #Development
 development=true
 
-kmpAuthVersion=1.2.0
+kmpAuthVersion=1.3.0
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 compose = "1.6.1"
-compose-plugin = "1.6.0-rc03"
+compose-plugin = "1.6.1"
 compose-compiler = "1.5.8"
 agp = "8.1.3"
 android-minSdk = "24"
@@ -14,14 +14,14 @@ androidx-constraintlayout = "2.1.4"
 androidx-test-junit = "1.1.5"
 androidx-espresso-core = "3.5.1"
 androidx-startup-runtime = "1.1.1"
-kotlin = "1.9.22"
+kotlin = "1.9.23"
 junit = "4.13.2"
-koin = "3.5.0"
+koin = "3.5.4"
 kotlinx-binary-validator = "0.13.2"
 dokka = "1.9.10"
 androidxCredential = "1.3.0-alpha01"
 googleIdIdentity="1.1.0"
-koinCompose = "1.1.0"
+koinCompose = "1.1.3-RC2"
 googleServices = "4.4.0"
 firebaseGitLiveAuth = "1.10.4"
 

diff --git a/.../src/commonMain/kotlin/com/mmk/kmpauth/firebase/google/GoogleButtonUiContainerFirebase.kt b/.../src/commonMain/kotlin/com/mmk/kmpauth/firebase/google/GoogleButtonUiContainerFirebase.kt
@@ -11,6 +11,7 @@ import dev.gitlive.firebase.Firebase
 import dev.gitlive.firebase.auth.FirebaseUser
 import dev.gitlive.firebase.auth.GoogleAuthProvider
 import dev.gitlive.firebase.auth.auth
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.launch
 
 /**
@@ -48,9 +49,14 @@ public fun GoogleButtonUiContainerFirebase(
         }
         val authCredential = GoogleAuthProvider.credential(idToken, accessToken)
         coroutineScope.launch {
-            val result = Firebase.auth.signInWithCredential(authCredential)
-            if (result.user == null) updatedOnResult(Result.failure(IllegalStateException("Firebase Null user")))
-            else updatedOnResult(Result.success(result.user))
+            try {
+                val result = Firebase.auth.signInWithCredential(authCredential)
+                if (result.user == null) updatedOnResult(Result.failure(IllegalStateException("Firebase Null user")))
+                else updatedOnResult(Result.success(result.user))
+            } catch (e: Exception) {
+                if (e is CancellationException) throw e
+                updatedOnResult(Result.failure(e))
+            }
         }
 
     }, content = content)

diff --git a/kmpauth-firebase/src/iosMain/kotlin/com/mmk/kmpauth/firebase/apple/AppleButtonUiContainer.kt b/kmpauth-firebase/src/iosMain/kotlin/com/mmk/kmpauth/firebase/apple/AppleButtonUiContainer.kt
@@ -99,46 +99,6 @@ public actual fun AppleButtonUiContainer(
 
 }
 
-
-@OptIn(ExperimentalForeignApi::class)
-@Composable
-internal fun SignInWithAppleButton2(
-    modifier: Modifier,
-    onResult: (Result<FirebaseUser?>) -> Unit,
-) {
-
-    val updatedOnResultFunc by rememberUpdatedState(onResult)
-
-    UIKitView(modifier = Modifier.sizeIn(maxHeight = 56.dp), factory = {
-        val presentationContextProvider = PresentationContextProvider()
-        val asAuthorizationControllerDelegate =
-            ASAuthorizationControllerDelegate(updatedOnResultFunc)
-        val uiStackView = object : UIStackView(CGRectMake(0.0, 0.0, 0.0, 0.0)) {
-            @ObjCAction
-            fun clicked() {
-//                signIn(
-//                    withPasswordProvider = false,
-//                    authorizationController = asAuthorizationControllerDelegate,
-//                    presentationContextProvider = presentationContextProvider
-//                )
-            }
-        }
-
-        val button = ASAuthorizationAppleIDButton()
-        button.addTarget(
-            uiStackView,
-            NSSelectorFromString(uiStackView::clicked.name),
-            UIControlEventTouchUpInside
-        )
-        uiStackView.addArrangedSubview(button)
-
-        uiStackView
-
-    })
-
-}
-
-
 private fun signIn(
     requestScopes: List<AppleSignInRequestScope>,
     authorizationController: ASAuthorizationControllerDelegate,

diff --git a/kmpauth-google/kmpauth_google.podspec b/kmpauth-google/kmpauth_google.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
     spec.name                     = 'kmpauth_google'
-    spec.version                  = '1.2.0'
+    spec.version                  = '1.3.0'
     spec.homepage                 = ''
     spec.source                   = { :http=> ''}
     spec.authors                  = ''

diff --git a/kmpauth-uihelper/src/commonMain/kotlin/com/mmk/kmpauth/uihelper/apple/AppleSignInButton.kt b/kmpauth-uihelper/src/commonMain/kotlin/com/mmk/kmpauth/uihelper/apple/AppleSignInButton.kt
@@ -29,11 +29,10 @@ import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import com.mmk.kmpauth.uihelper.google.GoogleButtonMode
 import com.mmk.kmpauth.uihelper.theme.Fonts
-import io.github.mirzemehdi.`kmpauth-uihelper`.generated.resources.Res
-import io.github.mirzemehdi.`kmpauth-uihelper`.generated.resources.ic_apple_logo_black
-import io.github.mirzemehdi.`kmpauth-uihelper`.generated.resources.ic_apple_logo_white
+import io.github.mirzemehdi.kmpauth_uihelper.generated.resources.Res
+import io.github.mirzemehdi.kmpauth_uihelper.generated.resources.ic_apple_logo_black
+import io.github.mirzemehdi.kmpauth_uihelper.generated.resources.ic_apple_logo_white
 import org.jetbrains.compose.resources.ExperimentalResourceApi
 import org.jetbrains.compose.resources.painterResource
 import kotlin.math.roundToInt

diff --git a/kmpauth-uihelper/src/commonMain/kotlin/com/mmk/kmpauth/uihelper/google/GoogleSignInButton.kt b/kmpauth-uihelper/src/commonMain/kotlin/com/mmk/kmpauth/uihelper/google/GoogleSignInButton.kt
@@ -23,8 +23,8 @@ import androidx.compose.ui.unit.sp
 import com.mmk.kmpauth.core.KMPAuthInternalApi
 import com.mmk.kmpauth.core.di.isAndroidPlatform
 import com.mmk.kmpauth.uihelper.theme.Fonts
-import io.github.mirzemehdi.`kmpauth-uihelper`.generated.resources.Res
-import io.github.mirzemehdi.`kmpauth-uihelper`.generated.resources.ic_google
+import io.github.mirzemehdi.kmpauth_uihelper.generated.resources.Res
+import io.github.mirzemehdi.kmpauth_uihelper.generated.resources.ic_google
 import org.jetbrains.compose.resources.DrawableResource
 import org.jetbrains.compose.resources.ExperimentalResourceApi
 import org.jetbrains.compose.resources.painterResource

diff --git a/kmpauth-uihelper/src/commonMain/kotlin/com/mmk/kmpauth/uihelper/theme/Typography.kt b/kmpauth-uihelper/src/commonMain/kotlin/com/mmk/kmpauth/uihelper/theme/Typography.kt
@@ -4,8 +4,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.font.FontWeight
-import io.github.mirzemehdi.`kmpauth-uihelper`.generated.resources.Res
-import io.github.mirzemehdi.`kmpauth-uihelper`.generated.resources.roboto_medium
+import io.github.mirzemehdi.kmpauth_uihelper.generated.resources.Res
+import io.github.mirzemehdi.kmpauth_uihelper.generated.resources.roboto_medium
 import org.jetbrains.compose.resources.ExperimentalResourceApi
 import org.jetbrains.compose.resources.Font