From f1a9cd5de9242f15b1742e61166efe400b4d95ec Mon Sep 17 00:00:00 2001 From: Goooler Date: Sun, 6 Feb 2022 15:43:09 +0800 Subject: [PATCH 1/5] AGP 7.3.0-alpha01 --- gradle/extra.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/extra.gradle.kts b/gradle/extra.gradle.kts index b215f5548..b828e725b 100644 --- a/gradle/extra.gradle.kts +++ b/gradle/extra.gradle.kts @@ -1,7 +1,7 @@ val kotlinVersion = "1.6.10" rootProject.extra.run { - set("androidPlugin", "com.android.tools.build:gradle:7.1.1") + set("androidPlugin", "com.android.tools.build:gradle:7.3.0-alpha01") set("kotlinPlugin", "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") } From 1c42c335d9d2f551b863d5e9d0f02e225f8bed27 Mon Sep 17 00:00:00 2001 From: Goooler Date: Sun, 6 Feb 2022 16:09:51 +0800 Subject: [PATCH 2/5] Add `namespace` --- buildSrc/src/main/kotlin/Enums.kt | 22 ++++++++++++---------- buildSrc/src/main/kotlin/Extensions.kt | 3 ++- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/buildSrc/src/main/kotlin/Enums.kt b/buildSrc/src/main/kotlin/Enums.kt index 3a1e9278f..c87834f90 100644 --- a/buildSrc/src/main/kotlin/Enums.kt +++ b/buildSrc/src/main/kotlin/Enums.kt @@ -3,25 +3,27 @@ // TODO: Make Module sealed interface Module { val tag: String + val id: String } -enum class LibModule(override val tag: String) : Module { +enum class LibModule(override val tag: String, override val id: String) : Module { //---------------------base-------------------------------// - Base("base"), - Common("common"), + Base("base", "io.goooler.demoapp.base"), + Common("common", "io.goooler.demoapp.common"), //---------------------biz-------------------------------// - Login("login"), - Main("main"), - Web("web"), + Login("login", "io.goooler.demoapp.login"), + Main("main", "io.goooler.demoapp.main"), + Web("web", "io.goooler.demoapp.web"), //---------------------func-------------------------------// - Adapter("adapter") + Adapter("adapter", "io.goooler.demoapp.adapter") } -enum class AppModule(override val tag: String, val appName: String, val appId: String) : Module { - App("app", "Demo", "io.goooler.demoapp"), - Test("app", "Test", "io.goooler.demoapp.test") +enum class AppModule(override val tag: String, override val id: String, val appName: String) : + Module { + App("app", "io.goooler.demoapp", "Demo"), + Test("app", "io.goooler.demoapp.test", "Test") } enum class BuildConfigField(val key: String, val value: Any) { diff --git a/buildSrc/src/main/kotlin/Extensions.kt b/buildSrc/src/main/kotlin/Extensions.kt index a820037ed..309e7e527 100644 --- a/buildSrc/src/main/kotlin/Extensions.kt +++ b/buildSrc/src/main/kotlin/Extensions.kt @@ -89,6 +89,7 @@ inline fun Project.setupBase( applyPlugins(androidPlugin, Plugins.kotlinAndroid, Plugins.kotlinKapt) extensions.configure { resourcePrefix = "${module.tag}_" + namespace = module.id compileSdkVersion(32) defaultConfig { minSdk = 21 @@ -179,7 +180,7 @@ fun Project.setupApp( module: AppModule, block: BaseAppModuleExtension.() -> Unit = {} ) = setupCommon(module) { defaultConfig { - applicationId = module.appId + applicationId = module.id targetSdk = 32 versionCode = appVersionCode versionName = appVersionName From dc9ae39d133bc1f41c58551f4054af926a8ad119 Mon Sep 17 00:00:00 2001 From: Goooler Date: Sun, 6 Feb 2022 18:14:02 +0800 Subject: [PATCH 3/5] Remove package attr in manifests --- adapter/src/main/AndroidManifest.xml | 2 +- app/src/main/AndroidManifest.xml | 5 ++--- base/src/main/AndroidManifest.xml | 2 +- common/src/main/AndroidManifest.xml | 3 +-- login/src/main/AndroidManifest.xml | 3 +-- main/src/main/AndroidManifest.xml | 3 +-- test/src/main/AndroidManifest.xml | 5 ++--- web/src/main/AndroidManifest.xml | 5 ++--- 8 files changed, 11 insertions(+), 17 deletions(-) diff --git a/adapter/src/main/AndroidManifest.xml b/adapter/src/main/AndroidManifest.xml index ca792c7e0..8072ee00d 100644 --- a/adapter/src/main/AndroidManifest.xml +++ b/adapter/src/main/AndroidManifest.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 300869f73..edec2c3f2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools"> - \ No newline at end of file + diff --git a/base/src/main/AndroidManifest.xml b/base/src/main/AndroidManifest.xml index 691dd8342..8072ee00d 100644 --- a/base/src/main/AndroidManifest.xml +++ b/base/src/main/AndroidManifest.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + diff --git a/common/src/main/AndroidManifest.xml b/common/src/main/AndroidManifest.xml index ec4a84708..80a107427 100644 --- a/common/src/main/AndroidManifest.xml +++ b/common/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + diff --git a/login/src/main/AndroidManifest.xml b/login/src/main/AndroidManifest.xml index 6f19f2493..d4eb53d88 100644 --- a/login/src/main/AndroidManifest.xml +++ b/login/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + diff --git a/main/src/main/AndroidManifest.xml b/main/src/main/AndroidManifest.xml index 0505ff848..023d36b29 100644 --- a/main/src/main/AndroidManifest.xml +++ b/main/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + diff --git a/test/src/main/AndroidManifest.xml b/test/src/main/AndroidManifest.xml index bd131136b..48bf7a2c6 100644 --- a/test/src/main/AndroidManifest.xml +++ b/test/src/main/AndroidManifest.xml @@ -1,7 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools"> - \ No newline at end of file + diff --git a/web/src/main/AndroidManifest.xml b/web/src/main/AndroidManifest.xml index 86546b4cb..bd4c799b6 100644 --- a/web/src/main/AndroidManifest.xml +++ b/web/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + @@ -10,4 +9,4 @@ - \ No newline at end of file + From 2945a873eee2f7c1565efbbc6c9a1602d11e2e7b Mon Sep 17 00:00:00 2001 From: Goooler Date: Sun, 6 Feb 2022 18:19:41 +0800 Subject: [PATCH 4/5] Downgrade AGP --- gradle/extra.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/extra.gradle.kts b/gradle/extra.gradle.kts index b828e725b..b215f5548 100644 --- a/gradle/extra.gradle.kts +++ b/gradle/extra.gradle.kts @@ -1,7 +1,7 @@ val kotlinVersion = "1.6.10" rootProject.extra.run { - set("androidPlugin", "com.android.tools.build:gradle:7.3.0-alpha01") + set("androidPlugin", "com.android.tools.build:gradle:7.1.1") set("kotlinPlugin", "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") } From 9889ec442fc40491881f353056155b0448eeb535 Mon Sep 17 00:00:00 2001 From: Goooler Date: Sun, 6 Feb 2022 18:47:17 +0800 Subject: [PATCH 5/5] Remove applicationIdSuffix --- buildSrc/src/main/kotlin/Extensions.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/Extensions.kt b/buildSrc/src/main/kotlin/Extensions.kt index 309e7e527..106bc9220 100644 --- a/buildSrc/src/main/kotlin/Extensions.kt +++ b/buildSrc/src/main/kotlin/Extensions.kt @@ -205,7 +205,6 @@ fun Project.setupApp( debug { resValue("string", "app_name", "${module.appName}.debug") signingConfig = signingConfigs["release"] - applicationIdSuffix = ".debug" isJniDebuggable = true isRenderscriptDebuggable = true isCrunchPngs = false