chore: Move both CrossAppLogin modules into a common parent module (#469)

Author: KevinBoulongne

CrossAppLogin/Back/build.gradle.kts

@@ -0,0 +1,65 @@
+plugins {
+    id("com.android.library")
+    alias(core.plugins.kotlin.android)
+    kotlin("plugin.serialization")
+}
+
+val coreCompileSdk: Int by rootProject.extra
+val coreMinSdk: Int by rootProject.extra
+val javaVersion: JavaVersion by rootProject.extra
+
+android {
+    namespace = "com.infomaniak.core.crossapplogin.back"
+    compileSdk = coreCompileSdk
+
+    defaultConfig {
+        minSdk = coreMinSdk
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles("consumer-rules.pro")
+    }
+
+    buildFeatures.buildConfig = true
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+        }
+    }
+    flavorDimensions += "distribution"
+    productFlavors {
+        create("standard") {
+            isDefault = true
+        }
+        create("fdroid")
+    }
+
+    compileOptions {
+        sourceCompatibility = javaVersion
+        targetCompatibility = javaVersion
+    }
+
+    kotlinOptions {
+        jvmTarget = javaVersion.toString()
+    }
+}
+
+dependencies {
+    api(core.kotlinx.coroutines.core)
+    api(core.androidx.lifecycle.runtime.ktx)
+    api(core.androidx.lifecycle.service)
+    api(core.kotlinx.serialization.protobuf)
+    api(core.androidx.work.runtime)
+
+    implementation(project(":Core"))
+    implementation(project(":Core:AppIntegrity"))
+    implementation(project(":Core:Legacy"))
+    implementation(core.splitties.mainthread)
+    implementation(core.ktor.client.core)
+    implementation(core.ktor.client.okhttp)
+    implementation(core.ktor.client.json)
+    implementation(core.ktor.client.content.negociation)
+
+    testImplementation(core.junit)
+    androidTestImplementation(core.androidx.junit)
+}

CrossAppLogin/consumer-rules.pro renamed to CrossAppLogin/Back/consumer-rules.pro

@@ -1,5 +1,5 @@
 /*
- * Infomaniak Login - Android
+ * Infomaniak Core - Android
  * Copyright (C) 2025 Infomaniak Network SA
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +16,7 @@
  */
 @file:OptIn(ExperimentalSerializationApi::class)
 
-package com.infomaniak.core.login.crossapp
+package com.infomaniak.core.crossapplogin.back
 
 import android.content.Intent
 import android.os.DeadObjectException
@@ -26,11 +26,11 @@ import android.os.Messenger
 import android.os.Process
 import androidx.lifecycle.LifecycleService
 import androidx.lifecycle.lifecycleScope
-import com.infomaniak.core.login.crossapp.internal.ChannelMessageHandler
-import com.infomaniak.core.login.crossapp.internal.DisposableMessage
-import com.infomaniak.core.login.crossapp.internal.certificates.AppCertificateChecker
-import com.infomaniak.core.login.crossapp.internal.deviceid.SharedDeviceIdManager
-import com.infomaniak.core.login.crossapp.internal.localAccountsFlow
+import com.infomaniak.core.crossapplogin.back.internal.ChannelMessageHandler
+import com.infomaniak.core.crossapplogin.back.internal.DisposableMessage
+import com.infomaniak.core.crossapplogin.back.internal.certificates.AppCertificateChecker
+import com.infomaniak.core.crossapplogin.back.internal.deviceid.SharedDeviceIdManager
+import com.infomaniak.core.crossapplogin.back.internal.localAccountsFlow
 import com.infomaniak.lib.core.utils.SentryLog
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.channels.Channel

CrossAppLogin/proguard-rules.pro renamed to CrossAppLogin/Back/proguard-rules.pro

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.infomaniak.core.login.crossapp
+package com.infomaniak.core.crossapplogin.back
 
 import android.os.Bundle
 import android.os.Message

CrossAppLogin/src/main/kotlin/com/infomaniak/core/login/crossapp/BaseCrossAppLoginService.kt renamed to CrossAppLogin/Back/src/main/kotlin/com/infomaniak/core/crossapplogin/back/BaseCrossAppLoginService.kt

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.infomaniak.core.login.crossapp
+package com.infomaniak.core.crossapplogin.back
 
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.Serializable

CrossAppLogin/src/main/kotlin/com/infomaniak/core/login/crossapp/BasicDataParceling.kt renamed to CrossAppLogin/Back/src/main/kotlin/com/infomaniak/core/crossapplogin/back/BasicDataParceling.kt

@@ -1,5 +1,5 @@
 /*
- * Infomaniak Login - Android
+ * Infomaniak Core - Android
  * Copyright (C) 2025 Infomaniak Network SA
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.infomaniak.core.login.crossapp
+package com.infomaniak.core.crossapplogin.back
 
 import android.content.Context
-import com.infomaniak.core.login.crossapp.internal.deviceid.SharedDeviceIdManager
+import com.infomaniak.core.crossapplogin.back.internal.deviceid.SharedDeviceIdManager
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.serialization.ExperimentalSerializationApi

CrossAppLogin/src/main/kotlin/com/infomaniak/core/login/crossapp/CrossAppDeviceIdRequest.kt renamed to CrossAppLogin/Back/src/main/kotlin/com/infomaniak/core/crossapplogin/back/CrossAppDeviceIdRequest.kt

@@ -17,7 +17,7 @@
  */
 @file:OptIn(ExperimentalSplittiesApi::class)
 
-package com.infomaniak.core.login.crossapp
+package com.infomaniak.core.crossapplogin.back
 
 import android.content.Context
 import android.content.Intent
@@ -28,10 +28,10 @@ import com.infomaniak.core.android.service.OnBindingIssue
 import com.infomaniak.core.android.service.OnServiceDisconnectionBehavior
 import com.infomaniak.core.android.service.withBoundService
 import com.infomaniak.core.cancellable
-import com.infomaniak.core.login.crossapp.internal.ChannelMessageHandler
-import com.infomaniak.core.login.crossapp.internal.DisposableMessage
-import com.infomaniak.core.login.crossapp.internal.certificates.AppCertificateChecker
-import com.infomaniak.core.login.crossapp.internal.deviceid.SharedDeviceIdManager
+import com.infomaniak.core.crossapplogin.back.internal.ChannelMessageHandler
+import com.infomaniak.core.crossapplogin.back.internal.DisposableMessage
+import com.infomaniak.core.crossapplogin.back.internal.certificates.AppCertificateChecker
+import com.infomaniak.core.crossapplogin.back.internal.deviceid.SharedDeviceIdManager
 import com.infomaniak.lib.core.room.UserDatabase
 import com.infomaniak.lib.core.utils.SentryLog
 import kotlinx.coroutines.CoroutineScope

CrossAppLogin/src/main/kotlin/com/infomaniak/core/login/crossapp/CrossAppLogin.kt renamed to CrossAppLogin/Back/src/main/kotlin/com/infomaniak/core/crossapplogin/back/CrossAppLogin.kt

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.infomaniak.core.login.crossapp
+package com.infomaniak.core.crossapplogin.back
 
 import com.infomaniak.core.Xor
 import com.infomaniak.core.appintegrity.exceptions.IntegrityException

CrossAppLogin/src/main/kotlin/com/infomaniak/core/login/crossapp/CrossAppLoginImpl.kt renamed to CrossAppLogin/Back/src/main/kotlin/com/infomaniak/core/crossapplogin/back/CrossAppLoginImpl.kt

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.infomaniak.core.login.crossapp
+package com.infomaniak.core.crossapplogin.back
 
 import com.google.gson.Gson
 import com.google.gson.JsonParser
@@ -26,7 +26,7 @@ import com.infomaniak.core.appintegrity.AppIntegrityManager.Companion.APP_INTEGR
 import com.infomaniak.core.appintegrity.exceptions.IntegrityException
 import com.infomaniak.core.appintegrity.exceptions.NetworkException
 import com.infomaniak.core.cancellable
-import com.infomaniak.core.login.crossapp.DerivedTokenGenerator.Issue
+import com.infomaniak.core.crossapplogin.back.DerivedTokenGenerator.Issue
 import com.infomaniak.lib.core.utils.SentryLog
 import com.infomaniak.lib.core.utils.await
 import com.infomaniak.lib.login.ApiToken