[optimize]整理项目gradle配置

description:升级gradle和插件至as4.0匹配的版本，加快构建速度，合并lib_config和module_config,整理version.gradle
RedrockMobile · Aug 15, 2020 · 9c97887 · 9c97887
1 parent ae9780f
commit 9c97887
Show file tree

Hide file tree

Showing 28 changed files with 210 additions and 226 deletions.
diff --git a/build.gradle b/build.gradle
@@ -9,8 +9,7 @@ buildscript {
     apply from: "githook.gradle"
 
     ext {
-        lib_config = "${rootDir}/lib_config.gradle"
-        module_config = "${rootDir}/module_config.gradle"
+        config = "${rootDir}/config.gradle"
         secret = "${rootDir}/secret.gradle"
     }
 
@@ -34,7 +33,7 @@ buildscript {
         // 添加emas-services插件
         classpath 'com.aliyun.ams:emas-services:1.0.1'
         // AndResGuard
-        classpath 'com.tencent.mm:AndResGuard-gradle-plugin:1.2.17'
+        classpath 'com.tencent.mm:AndResGuard-gradle-plugin:1.2.18'
         //依赖版本检测
         classpath "com.github.ben-manes:gradle-versions-plugin:0.28.0"
     }
@@ -61,7 +60,7 @@ task clean(type: Delete) {
 }
 
 // 运行这个可以检测依赖库的是否有最新发行版，请选择更新
-// 如果要直接提升到最新版本，请自己做好新版适配准备，最好不要更新预览版或者测试版
+// 如果要升级版本，请自己做好整个项目的新版适配准备
 // 因为依赖比较多通常需要分析30分钟左右，运行完毕会在
 // 项目级的build的dependencyUpdates/report.json里面有输出文档
 dependencyUpdates {

diff --git a/config.gradle b/config.gradle
@@ -0,0 +1,90 @@
+//除app外的所有组件的公有配置(包括lib和业务模块)
+//如需要配置app，请前往app模块
+
+if (isSingleModuleDebug.toBoolean()) {
+    apply plugin: 'com.android.application'
+} else {
+    apply plugin: 'com.android.library'
+}
+
+apply plugin: 'kotlin-android'
+
+apply plugin: 'kotlin-android-extensions'
+
+apply plugin: 'kotlin-kapt'
+
+android {
+    compileSdkVersion build_versions.compile_sdk
+    buildToolsVersion build_versions.build_tools
+
+    defaultConfig {
+        minSdkVersion build_versions.min_sdk
+        targetSdkVersion build_versions.target_sdk
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+
+        kapt {
+            //Arouter
+            arguments {
+                arg("AROUTER_MODULE_NAME", project.getName())
+            }
+        }
+
+        multiDexEnabled true
+    }
+    //module模块独有配置
+    modulesConfiguration(project) {
+        resourcePrefix "${project.getName().replaceAll("module_", "")}_"
+        sourceSets {
+            main {
+                //debug时能独立执行Main模块的配置
+                if (isSingleModuleDebug.toBoolean()) {
+                    manifest.srcFile 'src/main/module/AndroidManifest.xml'
+                } else {
+                    manifest.srcFile 'src/main/AndroidManifest.xml'
+                    java {
+                        exclude 'debug/**'
+                    }
+                }
+            }
+        }
+    }
+    //lib模块独有配置
+    libsConfiguration(project) {
+        resourcePrefix "${project.getName().replaceAll("lib_", "")}_"
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8
+    }
+
+    dataBinding {
+        enabled = true
+    }
+}
+
+//lib模块独有配置
+static def libsConfiguration(Project project, Closure closure) {
+    if (project.name.matches("lib_.+"))
+        closure()
+}
+//module模块独有配置
+static def modulesConfiguration(Project project, Closure closure) {
+    if (project.name.matches("module_.+"))
+        closure()
+}
+
+// 需要直接依赖到每个模块的,kapt必须写到这里
+// 如果确认始终只有一个模块会用，可以添加到模块自身的build.gradle
+dependencies {
+    if (project.name != "lib_common")
+        implementation project(':lib_common')
+    kapt deps.arouter.compiler
+    kapt deps.room.compiler
+    kapt deps.lifecycle.compiler
+}
diff --git a/gradle.properties b/gradle.properties
@@ -10,7 +10,9 @@ org.gradle.jvmargs=-Xmx2048m
 org.gradle.daemon=true
 org.gradle.parallel=true
 
-android.databinding.enableV2=true
+#下方值默认为true，故注释掉，请勿重复添加
+#android.databinding.enableV2=true
+
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
diff --git a/lib_account b/lib_account
diff --git a/lib_common b/lib_common
diff --git a/lib_config.gradle b/lib_config.gradle
diff --git a/lib_update b/lib_update
diff --git a/module_calendar b/module_calendar
diff --git a/module_config.gradle b/module_config.gradle
diff --git a/module_course b/module_course
diff --git a/module_discover b/module_discover
diff --git a/module_electricity b/module_electricity
diff --git a/module_emptyroom b/module_emptyroom
diff --git a/module_grades b/module_grades
diff --git a/module_main b/module_main
diff --git a/module_map b/module_map
diff --git a/module_mine b/module_mine
diff --git a/module_news b/module_news
diff --git a/module_noclass b/module_noclass
diff --git a/module_othercourse b/module_othercourse
diff --git a/module_qa b/module_qa
diff --git a/module_redrock_home b/module_redrock_home
diff --git a/module_schoolcar b/module_schoolcar
diff --git a/module_volunteer b/module_volunteer
diff --git a/module_widget b/module_widget
diff --git a/push_sdk/build.gradle b/push_sdk/build.gradle
@@ -1,5 +1,5 @@
 apply plugin: 'com.android.library'
-
+// todo 该模块后续应考虑去除源码依赖，直接导入依赖，当初是因为有重复导包的坑才这样模块依赖的
 android {
 
     compileSdkVersion 29