Merge pull request #215 from michaelbel/develop

1.5.3
michaelbel · Feb 11, 2024 · 5fa4f5e · 5fa4f5e
2 parents fe9c8f9 + 767a85e
commit 5fa4f5e
Show file tree

Hide file tree

Showing 392 changed files with 6,408 additions and 2,731 deletions.
diff --git a/.github/workflows/check_pr.yml b/.github/workflows/check_pr.yml
@@ -72,7 +72,7 @@ jobs:
         run: ./gradlew spotlessCheck
 
       - name: Test
-        run: ./gradlew testDebug
+        run: ./gradlew testDebugUnitTest
 
       - name: Build
         run: ./gradlew compileDebugKotlin
diff --git a/.gitignore b/.gitignore
@@ -712,3 +712,10 @@
 /.idea/
 /buildSrc/build/classes/kotlin/main/ktx/
 /buildSrc/.gradle/
+/core/build/reports/detekt/detekt.html
+/core/build/reports/detekt/detekt.md
+/core/build/reports/detekt/detekt.sarif
+/core/build/reports/detekt/detekt.txt
+/core/build/reports/detekt/detekt.xml
+/buildSrc/build/classes/kotlin/main/MoviesBuildType.class
+/buildSrc/build/source-roots/buildSrc/source-roots.txt
diff --git a/app/.gitignore → android-app/.gitignore b/app/.gitignore → android-app/.gitignore
diff --git a/app/benchmark-rules.pro → android-app/benchmark-rules.pro b/app/benchmark-rules.pro → android-app/benchmark-rules.pro
diff --git a/app/build.gradle.kts → android-app/build.gradle.kts b/app/build.gradle.kts → android-app/build.gradle.kts
@@ -1,15 +1,13 @@
-import java.io.FileInputStream
+import com.google.firebase.appdistribution.gradle.AppDistributionExtension
 import org.apache.commons.io.output.ByteArrayOutputStream
 import org.jetbrains.kotlin.konan.properties.Properties
+import java.io.FileInputStream
 
 @Suppress("dsl_scope_violation")
 plugins {
     alias(libs.plugins.application)
     alias(libs.plugins.kotlin)
     alias(libs.plugins.androidx.navigation.safeargs)
-    alias(libs.plugins.google.services)
-    alias(libs.plugins.firebase.appdistribution)
-    alias(libs.plugins.firebase.crashlytics)
     alias(libs.plugins.palantir.git)
     id("movies-android-hilt")
 }
@@ -46,7 +44,8 @@ afterEvaluate {
 }
 
 android {
-    namespace = "org.michaelbel.moviemade"
+    namespace = "org.michaelbel.movies.app"
+    flavorDimensions += "version"
 
     defaultConfig {
         applicationId = "org.michaelbel.moviemade"
@@ -98,21 +97,22 @@ android {
                 "okhttp3.pro",
                 "coroutines.pro"
             )
-            firebaseAppDistribution {
+            /*firebaseAppDistribution {
                 appId = "1:770317857182:android:876190afbc53df31"
                 artifactType = "APK"
                 testers = "[email protected]"
                 groups = "qa"
                 //releaseNotesFile="$rootProject.rootDir/releaseNotes.txt"
                 //serviceCredentialsFile = "$rootDir/config/firebase-app-distribution.json"
-            }
+            }*/
         }
         debug {
             isDebuggable = true
             isMinifyEnabled = false
             isShrinkResources = false
             applicationIdSuffix = MoviesBuildType.DEBUG.applicationIdSuffix
             manifestPlaceholders += mapOf("appName" to "@string/app_name_dev")
+            isDefault = true
         }
         create("benchmark") {
             initWith(getByName("release"))
@@ -130,6 +130,22 @@ android {
         compose = true
     }
 
+    productFlavors {
+        create("gms") {
+            dimension = "version"
+            applicationId = "org.michaelbel.moviemade"
+            isDefault = true
+        }
+        create("hms") {
+            dimension = "version"
+            applicationId = "org.michaelbel.movies"
+        }
+        create("foss") {
+            dimension = "version"
+            applicationId = "org.michaelbel.movies"
+        }
+    }
+
     dynamicFeatures += setOf(":instant")
 
     composeOptions {
@@ -150,26 +166,63 @@ android {
     }
 }
 
+val gmsImplementation: Configuration by configurations
+val hmsImplementation: Configuration by configurations
+val fossImplementation: Configuration by configurations
 dependencies {
+    gmsImplementation(project(":core:platform-services:inject"))
+    hmsImplementation(project(":core:platform-services:inject"))
+    fossImplementation(project(":core:platform-services:inject"))
+
     implementation(project(":core:analytics"))
     implementation(project(":core:common"))
     implementation(project(":core:interactor"))
     implementation(project(":core:navigation"))
-    implementation(project(":core:notifications"))
+    implementation(project(":core:platform-services:interactor"))
     implementation(project(":core:ui"))
     implementation(project(":core:work"))
     implementation(project(":feature:auth"))
     implementation(project(":feature:account"))
     implementation(project(":feature:details"))
     implementation(project(":feature:feed"))
     implementation(project(":feature:gallery"))
+    implementation(project(":feature:search"))
     implementation(project(":feature:settings"))
 
+    implementation(libs.kotlin.reflect)
+
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.test.ext.junit.ktx)
     androidTestImplementation(libs.androidx.espresso.core)
     androidTestImplementation(libs.androidx.compose.ui.test.junit4)
     androidTestImplementation(libs.androidx.benchmark.junit)
 
     lintChecks(libs.lint.checks)
+}
+
+val hasGmsDebug: Boolean = gradle.startParameter.taskNames.any { it.contains("GmsDebug", ignoreCase = true) }
+val hasGmsRelease: Boolean = gradle.startParameter.taskNames.any { it.contains("GmsRelease", ignoreCase = true) }
+val hasGmsBenchmark: Boolean = gradle.startParameter.taskNames.any { it.contains("GmsBenchmark", ignoreCase = true) }
+
+if (hasGmsDebug || hasGmsRelease || hasGmsBenchmark) {
+    apply(plugin = libs.plugins.google.services.get().pluginId)
+    apply(plugin = libs.plugins.firebase.crashlytics.get().pluginId)
+    apply(plugin = libs.plugins.firebase.appdistribution.get().pluginId)
+}
+
+if (hasGmsRelease) {
+    configure<AppDistributionExtension> {
+        appId = "1:770317857182:android:876190afbc53df31"
+        artifactType = "APK"
+        testers = "[email protected]"
+        groups = "qa"
+    }
+}
+
+val hasHmsDebug: Boolean = gradle.startParameter.taskNames.any { it.contains("HmsDebug", ignoreCase = true) }
+val hasHmsRelease: Boolean = gradle.startParameter.taskNames.any { it.contains("HmsRelease", ignoreCase = true) }
+val hasHmsBenchmark: Boolean = gradle.startParameter.taskNames.any { it.contains("HmsBenchmark", ignoreCase = true) }
+
+if (hasHmsDebug || hasHmsRelease || hasHmsBenchmark) {
+    //apply(plugin = libs.plugins.huawei.services.get().pluginId)
 }
diff --git a/app/coroutines.pro → android-app/coroutines.pro b/app/coroutines.pro → android-app/coroutines.pro
diff --git a/app/okhttp3.pro → android-app/okhttp3.pro b/app/okhttp3.pro → android-app/okhttp3.pro
diff --git a/app/proguard-rules.pro → android-app/proguard-rules.pro b/app/proguard-rules.pro → android-app/proguard-rules.pro
diff --git a/app/retrofit2.pro → android-app/retrofit2.pro b/app/retrofit2.pro → android-app/retrofit2.pro
diff --git a/app/src/debug/google-services.json → android-app/src/debug/google-services.json b/app/src/debug/google-services.json → android-app/src/debug/google-services.json
diff --git a/app/google-services.json → ...app/src/gmsBenchmark/google-services.json b/app/google-services.json → ...app/src/gmsBenchmark/google-services.json
diff --git a/android-app/src/gmsDebug/google-services.json b/android-app/src/gmsDebug/google-services.json
@@ -0,0 +1,94 @@
+{
+  "project_info": {
+    "project_number": "770317857182",
+    "firebase_url": "https://fir-moviemade.firebaseio.com",
+    "project_id": "firebase-moviemade",
+    "storage_bucket": "firebase-moviemade.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:770317857182:android:876190afbc53df31",
+        "android_client_info": {
+          "package_name": "org.michaelbel.moviemade"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "770317857182-ra2roi7lhsd8vl4mbk8kdbdvdgfnmpfg.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "org.michaelbel.moviemade",
+            "certificate_hash": "13b59c3892a3fb6ffd9627bd660de5f51f7327c0"
+          }
+        },
+        {
+          "client_id": "770317857182-4jq65b5vb04ocgdo2pveiua7b64lp2mn.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "org.michaelbel.moviemade",
+            "certificate_hash": "b861ce301449dcac09e522caa68deef9467cc702"
+          }
+        },
+        {
+          "client_id": "770317857182-v9pds8nn803n26p5ta3r4i949vkciqv9.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyC1Th1aOV2nV88wuyzm2GtxItVfTvAIh8U"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "770317857182-v9pds8nn803n26p5ta3r4i949vkciqv9.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      },
+      "admob_app_id": "ca-app-pub-3651393080934289~1447245983"
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:770317857182:android:df63120ae349fa2f",
+        "android_client_info": {
+          "package_name": "org.michaelbel.moviemade.beta"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "770317857182-09e8on7fl9s2phnnulblfg5e0h06gre2.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "org.michaelbel.moviemade.beta",
+            "certificate_hash": "b861ce301449dcac09e522caa68deef9467cc702"
+          }
+        },
+        {
+          "client_id": "770317857182-v9pds8nn803n26p5ta3r4i949vkciqv9.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyC1Th1aOV2nV88wuyzm2GtxItVfTvAIh8U"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "770317857182-v9pds8nn803n26p5ta3r4i949vkciqv9.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}
diff --git a/android-app/src/gmsRelease/google-services.json b/android-app/src/gmsRelease/google-services.json
@@ -0,0 +1,94 @@
+{
+  "project_info": {
+    "project_number": "770317857182",
+    "firebase_url": "https://fir-moviemade.firebaseio.com",
+    "project_id": "firebase-moviemade",
+    "storage_bucket": "firebase-moviemade.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:770317857182:android:876190afbc53df31",
+        "android_client_info": {
+          "package_name": "org.michaelbel.moviemade"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "770317857182-ra2roi7lhsd8vl4mbk8kdbdvdgfnmpfg.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "org.michaelbel.moviemade",
+            "certificate_hash": "13b59c3892a3fb6ffd9627bd660de5f51f7327c0"
+          }
+        },
+        {
+          "client_id": "770317857182-4jq65b5vb04ocgdo2pveiua7b64lp2mn.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "org.michaelbel.moviemade",
+            "certificate_hash": "b861ce301449dcac09e522caa68deef9467cc702"
+          }
+        },
+        {
+          "client_id": "770317857182-v9pds8nn803n26p5ta3r4i949vkciqv9.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyC1Th1aOV2nV88wuyzm2GtxItVfTvAIh8U"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "770317857182-v9pds8nn803n26p5ta3r4i949vkciqv9.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      },
+      "admob_app_id": "ca-app-pub-3651393080934289~1447245983"
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:770317857182:android:df63120ae349fa2f",
+        "android_client_info": {
+          "package_name": "org.michaelbel.moviemade.beta"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "770317857182-09e8on7fl9s2phnnulblfg5e0h06gre2.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "org.michaelbel.moviemade.beta",
+            "certificate_hash": "b861ce301449dcac09e522caa68deef9467cc702"
+          }
+        },
+        {
+          "client_id": "770317857182-v9pds8nn803n26p5ta3r4i949vkciqv9.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyC1Th1aOV2nV88wuyzm2GtxItVfTvAIh8U"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "770317857182-v9pds8nn803n26p5ta3r4i949vkciqv9.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}