module-assembler-gradle-plugin 1.1.0

electrolyteJ · electrolyteJ · commit 25d033ea7299 · 2025-04-16T17:31:48.000+08:00
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -10,29 +10,24 @@ ksp {
 }
 apply from: "$rootDir/scripts/tinker_config.gradle"
 android {
-    compileSdkVersion Integer.parseInt(project.rootProject.compileSdkVersion)
-    buildToolsVersion project.rootProject.buildToolsVersion
     namespace "com.jamesfchen.b"
     defaultConfig {
         //        multiDexEnabled = true//support android 20 or lower
         applicationId project.rootProject.applicationId
-        minSdkVersion Integer.parseInt(project.rootProject.minSdkVersion)
-        targetSdkVersion Integer.parseInt(project.rootProject.targetSdkVersion)
 //        resValue "string", "app_name", "b.app"
         buildConfigField('String', 'BUGLY_APP_ID', '"3d62251014"')
         buildConfigField('String', 'BUGLY_APP_KEY', '"a15ecf84-1786-40c6-abf5-fe975fce22e6"')
         buildConfigField('String', 'XIAOMI_APP_ID', '"2882303761517994447"')
         buildConfigField('String', 'XIAOMI_APP_KEY', '"5921799441447"')
         buildConfigField('String', 'AMAP_KEY', '"84198333a8ab4404cd35829dbb4ec435"')
-        manifestPlaceholders = [
-                'BUGLY_APP_ID': '3d62251014', 'BUGLY_APP_KEY': 'a15ecf84-1786-40c6-abf5-fe975fce22e6', "BUGLY_APP_VERSION": "${rootProject.ext.versionName}",
-                'AMAP_KEY'    : '84198333a8ab4404cd35829dbb4ec435',
-        ]
+        manifestPlaceholders = ['BUGLY_APP_ID'     : '3d62251014',
+                                'BUGLY_APP_KEY'    : 'a15ecf84-1786-40c6-abf5-fe975fce22e6',
+                                "BUGLY_APP_VERSION": "${libs.versions.versionName}",
+                                'AMAP_KEY'         : '84198333a8ab4404cd35829dbb4ec435',]
         ndk {
             abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
         }
-        versionCode Integer.parseInt(project.rootProject.versionCode)
-        versionName project.rootProject.versionName
+
     }
     signingConfigs {
         releaseSigningConfig {
@@ -50,26 +45,20 @@ android {
             multiDexEnabled = true//support android 20 or lower
             minifyEnabled true
             shrinkResources true
-            proguardFiles(
-                    getDefaultProguardFile("proguard-android-optimize.txt"),
-                    "proguard-rules.pro"
-            )
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"),
+                    "proguard-rules.pro")
         }
-        debug{
+        debug {
             signingConfig signingConfigs.releaseSigningConfig
-            manifestPlaceholders = [
-                    'QQ_KEY'            : 'adf', 'WEXIN_KEY': 'adfaf',
-                    'BUGLY_ENABLE_DEBUG': 'true'
-            ]
+            manifestPlaceholders = ['QQ_KEY'            : 'adf', 'WEXIN_KEY': 'adfaf',
+                                    'BUGLY_ENABLE_DEBUG': 'true']
             crunchPngs = false//优化编译速度：关闭png
             multiDexEnabled = false//优化编译速度：关闭multidex
             minifyEnabled false
             shrinkResources false
 //            applicationIdSuffix = '.debug'
-            proguardFiles(
-                    getDefaultProguardFile("proguard-android-optimize.txt"),
-                    "proguard-rules.pro"
-            )
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"),
+                    "proguard-rules.pro")
         }
 
     }
diff --git a/android/base/build.gradle b/android/base/build.gradle
@@ -1,14 +1,10 @@
 plugins{
-    id  'com.android.library'
+    id "io.github.electrolytej.foundation-plugin"
     id("kotlin-android")
     id("kotlin-kapt")
 }
 android{
-    compileSdkVersion Integer.parseInt(project.rootProject.compileSdkVersion)
-    buildToolsVersion project.rootProject.buildToolsVersion
     defaultConfig {
-        minSdkVersion Integer.parseInt(project.rootProject.minSdkVersion)
-        targetSdkVersion Integer.parseInt(project.rootProject.targetSdkVersion)
     }
     namespace "com.jamesfchen.base"
     compileOptions {
diff --git a/android/gradle.properties b/android/gradle.properties
@@ -47,12 +47,4 @@ keyPassword=123456
 storePassword=123456
 storeFilePath=keystore/debug.jks
 useElectrolytejSnapshots=true
-########################################################version control start
-compileSdkVersion=34
-buildToolsVersion=34.0.0
-#19:kk,21:L,23:M,24:N,26:O,28:P,29:Q,30:R
-minSdkVersion=26
-targetSdkVersion=34
-versionCode=2
-versionName=2.0.0
-########################################################version control end
+useIbc=true
diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml
@@ -1,4 +1,11 @@
 [versions]
+compileSdkVersion = "34"
+buildToolsVersion = "34.0.0"
+#19:kk,21:L,23:M,24:N,26:O,28:P,29:Q,30:R
+minSdkVersion = "26"
+targetSdkVersion = "34"
+versionCode = "2"
+versionName = "2.0.0"
 accompanist = "0.34.0"
 androidDesugarJdkLibs = "2.0.4"
 # AGP and tools should be updated together
@@ -60,14 +67,9 @@ room = "2.6.1"
 secrets = "2.0.1"
 truth = "1.4.2"
 turbine = "1.1.0"
-arouter = "1.3.2"
-wrouter="1.2.1"
-ibc="1.6.1"
 navigationFragmentKtx = "2.6.0"
 navigationUiKtx = "2.6.0"
 material = "1.11.0"
-versionCode="2"
-versionName="2.0.0"
 junit = "1.2.1"
 leanback = "1.0.0"
 glide = "4.11.0"
@@ -102,7 +104,7 @@ androidx-compose-material3-adaptive = { group = "androidx.compose.material3.adap
 androidx-compose-material3-adaptive-layout = { group = "androidx.compose.material3.adaptive", name = "adaptive-layout", version.ref = "androidxComposeMaterial3Adaptive" }
 androidx-compose-material3-adaptive-navigation = { group = "androidx.compose.material3.adaptive", name = "adaptive-navigation", version.ref = "androidxComposeMaterial3Adaptive" }
 androidx-compose-material3-windowSizeClass = { group = "androidx.compose.material3", name = "material3-window-size-class" }
-androidx-compose-runtime = { group = "androidx.compose.runtime", name = "runtime"}
+androidx-compose-runtime = { group = "androidx.compose.runtime", name = "runtime" }
 androidx-compose-runtime-tracing = { group = "androidx.compose.runtime", name = "runtime-tracing", version.ref = "androidxComposeRuntimeTracing" }
 androidx-compose-runtime-livedata = { module = "androidx.compose.runtime:runtime-livedata" }
 androidx-compose-ui-test = { group = "androidx.compose.ui", name = "ui-test-junit4", version.ref = "androidxComposeAlpha" }
@@ -207,7 +209,7 @@ androidx-watchface-complications-data-source-ktx = { group = "androidx.wear.watc
 android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
 android-library = { id = "com.android.library", version.ref = "androidGradlePlugin" }
 android-test = { id = "com.android.test", version.ref = "androidGradlePlugin" }
-baselineprofile = { id = "androidx.baselineprofile", version.ref = "androidxMacroBenchmark"}
+baselineprofile = { id = "androidx.baselineprofile", version.ref = "androidxMacroBenchmark" }
 compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 dependencyGuard = { id = "com.dropbox.dependency-guard", version.ref = "dependencyGuard" }
 firebase-crashlytics = { id = "com.google.firebase.crashlytics", version.ref = "firebaseCrashlyticsPlugin" }
diff --git a/android/hotel-module/bundle1/build.gradle b/android/hotel-module/bundle1/build.gradle
@@ -4,12 +4,6 @@ plugins{
     alias(libs.plugins.compose)
 }
 android {
-    compileSdkVersion Integer.parseInt(project.rootProject.compileSdkVersion)
-    buildToolsVersion project.rootProject.buildToolsVersion
-    defaultConfig {
-        minSdkVersion Integer.parseInt(project.rootProject.minSdkVersion)
-        targetSdkVersion Integer.parseInt(project.rootProject.targetSdkVersion)
-    }
     namespace "com.jamesfchen.bundle1"
     buildFeatures {
         viewBinding true
diff --git a/android/hotel-module/bundle2/build.gradle b/android/hotel-module/bundle2/build.gradle
@@ -4,12 +4,6 @@ plugins{
     id("kotlin-kapt")
 }
 android{
-    compileSdkVersion Integer.parseInt(project.rootProject.compileSdkVersion)
-    buildToolsVersion project.rootProject.buildToolsVersion
-    defaultConfig {
-        minSdkVersion Integer.parseInt(project.rootProject.minSdkVersion)
-        targetSdkVersion Integer.parseInt(project.rootProject.targetSdkVersion)
-    }
     namespace "com.jamesfchen.bundle2"
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_17
diff --git a/android/hotel-module/bundle3/build.gradle b/android/hotel-module/bundle3/build.gradle
@@ -4,12 +4,6 @@ plugins{
     id("kotlin-kapt")
 }
 android{
-    compileSdkVersion Integer.parseInt(project.rootProject.compileSdkVersion)
-    buildToolsVersion project.rootProject.buildToolsVersion
-    defaultConfig {
-        minSdkVersion Integer.parseInt(project.rootProject.minSdkVersion)
-        targetSdkVersion Integer.parseInt(project.rootProject.targetSdkVersion)
-    }
     namespace "com.jamesfchen.bundle3"
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_17
diff --git a/android/hotel-module/bundle4/build.gradle b/android/hotel-module/bundle4/build.gradle
@@ -4,12 +4,6 @@ plugins{
     id("kotlin-kapt")
 }
 android{
-    compileSdkVersion Integer.parseInt(project.rootProject.compileSdkVersion)
-    buildToolsVersion project.rootProject.buildToolsVersion
-    defaultConfig {
-        minSdkVersion Integer.parseInt(project.rootProject.minSdkVersion)
-        targetSdkVersion Integer.parseInt(project.rootProject.targetSdkVersion)
-    }
     namespace "com.jamesfchen.bundle4"
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_17
diff --git a/android/hotel-module/export/build.gradle b/android/hotel-module/export/build.gradle
@@ -5,12 +5,6 @@ plugins{
 }
 
 android{
-    compileSdkVersion Integer.parseInt(project.rootProject.compileSdkVersion)
-    buildToolsVersion project.rootProject.buildToolsVersion
-    defaultConfig {
-        minSdkVersion Integer.parseInt(project.rootProject.minSdkVersion)
-        targetSdkVersion Integer.parseInt(project.rootProject.targetSdkVersion)
-    }
     namespace "com.jamesfchen.export"
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_17
diff --git a/android/im-module/bundle/build.gradle b/android/im-module/bundle/build.gradle
@@ -6,12 +6,6 @@ plugins {
 }
 
 android {
-    compileSdkVersion Integer.parseInt(project.rootProject.compileSdkVersion)
-    buildToolsVersion project.rootProject.buildToolsVersion
-    defaultConfig {
-        minSdkVersion Integer.parseInt(project.rootProject.minSdkVersion)
-        targetSdkVersion Integer.parseInt(project.rootProject.targetSdkVersion)
-    }
     namespace = "com.jamesfchen.chatroom"
     defaultConfig {
         vectorDrawables.useSupportLibrary = true
diff --git a/android/im-module/export/build.gradle b/android/im-module/export/build.gradle
@@ -5,12 +5,6 @@ plugins{
 }
 
 android{
-    compileSdkVersion Integer.parseInt(project.rootProject.compileSdkVersion)
-    buildToolsVersion project.rootProject.buildToolsVersion
-    defaultConfig {
-        minSdkVersion Integer.parseInt(project.rootProject.minSdkVersion)
-        targetSdkVersion Integer.parseInt(project.rootProject.targetSdkVersion)
-    }
     namespace "com.jamesfchen.export"
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_17
diff --git a/android/main-module/build.gradle b/android/main-module/build.gradle
@@ -4,12 +4,6 @@ plugins{
     alias(libs.plugins.compose)
 }
 android {
-    compileSdkVersion Integer.parseInt(project.rootProject.compileSdkVersion)
-    buildToolsVersion project.rootProject.buildToolsVersion
-    defaultConfig {
-        minSdkVersion Integer.parseInt(project.rootProject.minSdkVersion)
-        targetSdkVersion Integer.parseInt(project.rootProject.targetSdkVersion)
-    }
     namespace "com.jamesfchen.main"
     buildFeatures {
         viewBinding true
diff --git a/module-assembler-gradle-plugin/build.gradle b/module-assembler-gradle-plugin/build.gradle
@@ -11,7 +11,7 @@ tasks.withType(GroovyCompile) {
     sourceCompatibility = '17'
     targetCompatibility = '17'
 }
-version = "1.0.0"
+version = "1.1.0"
 group ="io.github.electrolytej"
 gradlePlugin {
     vcsUrl = 'https://github.com/big-frontend/module-assembler.git'
@@ -59,6 +59,20 @@ gradlePlugin {
             description = "A plugin that helps you define host app module"
             tags = ['module-assembler']
         }
+        foundationPlugin {
+            id = "${group}.foundation-plugin"
+            implementationClass = 'FoundationModulePlugin'
+            displayName = 'Plugin for define host app module'
+            description = "A plugin that helps you define host app module"
+            tags = ['module-assembler']
+        }
+        toolPlugin {
+            id = "${group}.tool-plugin"
+            implementationClass = 'ToolModulePlugin'
+            displayName = 'Plugin for define host app module'
+            description = "A plugin that helps you define host app module"
+            tags = ['module-assembler']
+        }
     }
 }
 sourceSets {
diff --git a/module-assembler-gradle-plugin/src/main/groovy/AndroidPlugin.groovy b/module-assembler-gradle-plugin/src/main/groovy/AndroidPlugin.groovy
@@ -5,41 +5,55 @@ import org.gradle.api.artifacts.VersionCatalog
 import org.gradle.api.artifacts.VersionCatalogsExtension
 
 abstract class AndroidPlugin implements Plugin<Project> {
-    static String routerName
     static String routerPlugin
     static String routerLibrary
     static boolean isFirst = true
+    protected VersionCatalog libs
 
     abstract void addPlugins(Project project)
 
     abstract void onApply(Project project)
 
-    static def pickupRouter(Project project) {
-        VersionCatalog libs = project.extensions.getByType(VersionCatalogsExtension).named("libs")
-        def versionName = libs.findVersion("ibc").get().requiredVersion
-        if (project.rootProject.findProperty("IBC_VERSION")) return ["IBCRouter", "io.github.jamesfchen.ibc-plugin", "io.github.jamesfchen:ibc-api:$project.rootProject.IBC_VERSION"]
-        return ["", "", ""]
-    }
-
     @Override
     void apply(Project project) {
-        if (isFirst) {
-            (routerName, routerPlugin, routerLibrary) = pickupRouter(project)
-            if (routerLibrary) P.info("pick up router, $routerLibrary")
+        libs = project.extensions.getByType(VersionCatalogsExtension).named("libs")
+        addPlugins(project)
+        def useIbc = project.findProperty("useIbc")
+        if (isFirst && useIbc) {
+//        project.pluginManager.apply("io.github.jamesfchen.ibc-plugin:${ibc}")
+            def ibc = "1.6.1"
+//                routerPlugin = "io.github.jamesfchen.ibc-plugin"
+//                routerLibrary = "io.github.jamesfchen:ibc-api:${ibc}"
+            P.info("pick up router, $routerLibrary")
             isFirst = false
         }
-        addPlugins(project)
         project.android {
-
+            def compile = libs.findVersion("compileSdkVersion").get().requiredVersion
+            def build = libs.findVersion("buildToolsVersion").get().requiredVersion
+            if (compile) {
+                compileSdkVersion Integer.parseInt(compile)
+            }
+            if (build) {
+                buildToolsVersion build
+            }
+            defaultConfig {
+                def min = libs.findVersion("minSdkVersion").get().requiredVersion
+                def target = libs.findVersion("targetSdkVersion").get().requiredVersion
+                if (min) {
+                    minSdkVersion = min
+                }
+                if (target) {
+                    targetSdkVersion = target
+                }
+            }
             flavorDimensions "device"
-            productFlavors{
-                tv{
+            productFlavors {
+                tv {
                     dimension 'device'
                 }
-                watch{
+                watch {
                     dimension 'device'
                 }
-
             }
             def a = project.gradle.activeBuildVariant
             if (a != 'all' && a in project.gradle.ext.buildVariants) {
diff --git a/module-assembler-gradle-plugin/src/main/groovy/AppModulePlugin.groovy b/module-assembler-gradle-plugin/src/main/groovy/AppModulePlugin.groovy
@@ -11,9 +11,20 @@ class AppModulePlugin extends AndroidPlugin {
     @Override
     void onApply(Project project) {
         project.android {
-            if (project.gradle.ext.dynamicModules){
+            if (project.gradle.ext.dynamicModules) {
                 dynamicFeatures = project.gradle.ext.dynamicModules
             }
+            defaultConfig {
+                def vc = libs.findVersion("versionCode").get().requiredVersion
+                if (vc) {
+                    versionCode Integer.parseInt(vc)
+                }
+                def vn = libs.findVersion("versionName").get().requiredVersion
+                if (vn) {
+                    versionName = vn
+                }
+            }
+
         }
     }
 }
diff --git a/module-assembler-gradle-plugin/src/main/groovy/FoundationModulePlugin.groovy b/module-assembler-gradle-plugin/src/main/groovy/FoundationModulePlugin.groovy
@@ -0,0 +1,14 @@
+import org.gradle.api.Project
+
+class FoundationModulePlugin extends AndroidPlugin {
+
+    @Override
+    void addPlugins(Project project) {
+        project.plugins.apply('com.android.library')
+    }
+
+    @Override
+    void onApply(Project project) {
+
+    }
+}
diff --git a/module-assembler-gradle-plugin/src/main/groovy/ModuleAssemblerSettingsPlugin.groovy b/module-assembler-gradle-plugin/src/main/groovy/ModuleAssemblerSettingsPlugin.groovy
@@ -2,7 +2,6 @@ import com.electrolytej.assembler.ModuleParser
 import com.electrolytej.assembler.model.ModuleConfig
 import com.google.gson.Gson
 import com.google.gson.stream.JsonReader
-import groovy.json.JsonSlurper
 import org.gradle.api.Plugin
 import org.gradle.api.initialization.Settings
 
diff --git a/module-assembler-gradle-plugin/src/main/groovy/ToolModulePlugin.groovy b/module-assembler-gradle-plugin/src/main/groovy/ToolModulePlugin.groovy
