Merge pull request rRemix#243 from Henry-ZHR/master

Better flavors & Room Gradle Plugin (trying to fix CI)
xfsb · Apr 16, 2024 · f335054 · f335054
2 parents d8777b1 + 2fe6efb
commit f335054
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 274 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -6,6 +6,7 @@ plugins {
     alias(libs.plugins.kotlin)
     alias(libs.plugins.kotlin.parcelize)
     alias(libs.plugins.ksp)
+    alias(libs.plugins.room)
 }
 
 fun readProperties(file: File): Properties {
@@ -46,10 +47,6 @@ android {
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled = true
 
-        ksp {
-            arg("room.schemaLocation", "$projectDir/schemas")
-        }
-
         buildConfigField(
             "String",
             "LASTFM_API_KEY",
@@ -151,17 +148,24 @@ android {
         }
     }
 
-    flavorDimensions += "channel"
+    flavorDimensions += listOf("channel", "updater")
     productFlavors {
-        create("nongoogle") {
+        create("nonGoogle") {
             dimension = "channel"
             isDefault = true
         }
         create("google") {
             dimension = "channel"
         }
-        create("noupdater") {
-            dimension = "channel"
+
+        create("withUpdater") {
+            dimension = "updater"
+            isDefault = true
+            buildConfigField("boolean", "ENABLE_UPDATER", "true")
+        }
+        create("withoutUpdater") {
+            dimension = "updater"
+            buildConfigField("boolean", "ENABLE_UPDATER", "false")
         }
     }
 
@@ -188,6 +192,24 @@ android {
     dependenciesInfo {
         includeInApk = false
     }
+
+    room {
+        schemaDirectory("$projectDir/schemas")
+    }
+}
+
+androidComponents {
+    beforeVariants { variantBuilder ->
+        if (variantBuilder.productFlavors.containsAll(
+                listOf(
+                    "channel" to "google",
+                    "updater" to "withUpdater"
+                )
+            )
+        ) {
+            variantBuilder.enable = false
+        }
+    }
 }
 
 dependencies {
@@ -241,7 +263,4 @@ dependencies {
 
     val googleImplementation by configurations
     googleImplementation(libs.billingclient)
-
-    val noupdaterImplementation by configurations
-    noupdaterImplementation(libs.billingclient)
 }
diff --git a/app/src/main/java/remix/myplayer/App.kt b/app/src/main/java/remix/myplayer/App.kt
@@ -154,7 +154,5 @@ class App : MultiDexApplication() {
     //是否是googlePlay版本
     val IS_GOOGLEPLAY =
         !BuildConfig.DEBUG && BuildConfig.FLAVOR == "google"
-
-    val ENABLE_UPDATER = BuildConfig.FLAVOR == "nonGoogle"
   }
 }
diff --git a/app/src/main/java/remix/myplayer/ui/activity/MainActivity.kt b/app/src/main/java/remix/myplayer/ui/activity/MainActivity.kt
@@ -28,7 +28,7 @@ import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
 import com.soundcloud.android.crop.Crop
 import remix.myplayer.App
-import remix.myplayer.App.Companion.ENABLE_UPDATER
+import remix.myplayer.BuildConfig
 import remix.myplayer.R
 import remix.myplayer.bean.misc.CustomCover
 import remix.myplayer.bean.misc.Library
@@ -699,7 +699,7 @@ class MainActivity : MenuActivity(), View.OnClickListener {
   }
 
   private fun checkUpdate() {
-    if (ENABLE_UPDATER && !alreadyCheck) {
+    if (BuildConfig.ENABLE_UPDATER && !alreadyCheck) {
       UpdateAgent.forceCheck = false
       UpdateAgent.listener = UpdateListener(this)
       alreadyCheck = true

diff --git a/app/src/main/java/remix/myplayer/ui/activity/SettingActivity.kt b/app/src/main/java/remix/myplayer/ui/activity/SettingActivity.kt
@@ -32,7 +32,6 @@ import io.reactivex.disposables.Disposable
 import io.reactivex.schedulers.Schedulers
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import remix.myplayer.App.Companion.ENABLE_UPDATER
 import remix.myplayer.App.Companion.IS_GOOGLEPLAY
 import remix.myplayer.BuildConfig
 import remix.myplayer.R
@@ -407,7 +406,7 @@ class SettingActivity : ToolbarActivity(), ColorChooserDialog.ColorCallback,
       }
     }.start()
 
-    if (!ENABLE_UPDATER) {
+    if (!BuildConfig.ENABLE_UPDATER) {
       binding.settingUpdateContainer.visibility = View.GONE
     }
 

diff --git a/app/src/nongoogle/AndroidManifest.xml → app/src/nonGoogle/AndroidManifest.xml b/app/src/nongoogle/AndroidManifest.xml → app/src/nonGoogle/AndroidManifest.xml
diff --git a/...x/myplayer/ui/activity/SupportActivity.kt → ...x/myplayer/ui/activity/SupportActivity.kt b/...x/myplayer/ui/activity/SupportActivity.kt → ...x/myplayer/ui/activity/SupportActivity.kt
diff --git a/app/src/noupdater/AndroidManifest.xml b/app/src/noupdater/AndroidManifest.xml
diff --git a/app/src/noupdater/kotlin/remix/myplayer/ui/activity/SupportActivity.kt b/app/src/noupdater/kotlin/remix/myplayer/ui/activity/SupportActivity.kt
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,4 +4,5 @@ plugins {
     alias(libs.plugins.kotlin) apply false
     alias(libs.plugins.kotlin.parcelize) apply false
     alias(libs.plugins.ksp) apply false
+    alias(libs.plugins.room) apply false
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -13,6 +13,7 @@ application = { id = "com.android.application", version.ref = "agp" }
 kotlin = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
+room = { id = "androidx.room", version.ref = "room" }
 
 
 [libraries]