为便于进行高版本gradle的兼容性测试，升级demo相关module的minSdkVersion

luckybilly · Dec 13, 2019 · 172cadf · 172cadf
1 parent 85929e1
commit 172cadf
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 18 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.1.51'
+    ext.kotlin_version = '1.2.51'
 
     repositories {
         maven{ url rootProject.file("repo-local") }
@@ -31,16 +31,13 @@ allprojects {
 }
 
 ext {
-    compileVersion = 26
-    buildVersion = '27.0.3'
+    compileVersion = 28
+    buildVersion = '28.0.3'
     minVersion = 8
 
-    supportVersion = '25.3.1'
-
-    deps = [
-        cc       : 'com.billy.android:cc:2.1.5'
-//        cc       : project(':cc')
-    ]
+    // support v7(28.0.0) minSdkVersion is 14
+    demoMinSdkVersion = 14
+    supportVersion = '28.0.0'
 }
 task clean(type: Delete) {
     delete rootProject.buildDir

diff --git a/demo/build.gradle b/demo/build.gradle
@@ -6,7 +6,7 @@ android {
     buildToolsVersion rootProject.buildVersion
 
     defaultConfig {
-        minSdkVersion 9 // support v7 minSdkVersion is 9
+        minSdkVersion rootProject.demoMinSdkVersion // support v7(28.0.0) minSdkVersion is 14
         targetSdkVersion rootProject.compileVersion
         applicationId "com.billy.cc.demo"
         versionCode 1

diff --git a/demo_base/build.gradle b/demo_base/build.gradle
@@ -1,11 +1,12 @@
-apply plugin: 'com.android.library'
+ext.alwaysLib = true //虽然apply了cc-settings-2.gradle，但一直作为library编译，否则别的组件依赖此module时会报错
+apply from: rootProject.file('cc-settings-demo.gradle')
 
 android {
     compileSdkVersion rootProject.compileVersion
     buildToolsVersion rootProject.buildVersion
 
     defaultConfig {
-        minSdkVersion 9
+        minSdkVersion rootProject.demoMinSdkVersion
         targetSdkVersion rootProject.compileVersion
         versionCode 1
         versionName "1.0"
@@ -23,5 +24,4 @@ android {
 
 dependencies {
     implementation 'com.google.code.gson:gson:2.8.4'
-    api rootProject.ext.deps.cc
 }
diff --git a/demo_component_a/build.gradle b/demo_component_a/build.gradle
@@ -7,7 +7,7 @@ android {
     buildToolsVersion rootProject.buildVersion
 
     defaultConfig {
-        minSdkVersion 9 // support v7 minSdkVersion is 9
+        minSdkVersion rootProject.demoMinSdkVersion // support v7 minSdkVersion is 9
         targetSdkVersion rootProject.compileVersion
         if (project.ext.runAsApp) {
             applicationId 'com.billy.cc.demo.component.a'

diff --git a/demo_component_b/build.gradle b/demo_component_b/build.gradle
@@ -6,7 +6,7 @@ android {
     buildToolsVersion rootProject.buildVersion
 
     defaultConfig {
-        minSdkVersion 9 // support v7 minSdkVersion is 9
+        minSdkVersion rootProject.demoMinSdkVersion // support v7 minSdkVersion is 9
         targetSdkVersion rootProject.compileVersion
         versionCode 1
         versionName "1.0"

diff --git a/demo_component_jsbridge/build.gradle b/demo_component_jsbridge/build.gradle
@@ -5,7 +5,7 @@ android {
     buildToolsVersion rootProject.buildVersion
 
     defaultConfig {
-        minSdkVersion 9 // support v7 minSdkVersion is 9
+        minSdkVersion rootProject.demoMinSdkVersion // support v7 minSdkVersion is 9
         targetSdkVersion rootProject.compileVersion
         versionCode 1
         versionName "1.0"

diff --git a/demo_component_kt/build.gradle b/demo_component_kt/build.gradle
@@ -5,7 +5,7 @@ android {
     compileSdkVersion rootProject.compileVersion
 
     defaultConfig {
-        minSdkVersion 9 // support v7 minSdkVersion is 9
+        minSdkVersion rootProject.demoMinSdkVersion // support v7 minSdkVersion is 9
         targetSdkVersion rootProject.compileVersion
         versionCode 1
         versionName "1.0"

diff --git a/demo_interceptors/build.gradle b/demo_interceptors/build.gradle
@@ -6,7 +6,7 @@ android {
     buildToolsVersion rootProject.buildVersion
 
     defaultConfig {
-        minSdkVersion 8
+        minSdkVersion rootProject.demoMinSdkVersion
         targetSdkVersion rootProject.compileVersion
         versionCode 1
         versionName "1.0"