From bb4ec9dcc92b0b62d512ef0762feca6462aa8059 Mon Sep 17 00:00:00 2001
From: mochangsheng <mochangsheng>
Date: Mon, 13 Jul 2020 11:29:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dgradle=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle                             |  4 ++--
 cc-settings.gradle                       | 10 ++++++++--
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 3b7412c..dc75520 100755
--- 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.
 apply from: "config.gradle"
 buildscript {
-    ext.kotlin_version = '1.2.61'
+    ext.kotlin_version = '1.3.72'
     repositories {
         jcenter()
         mavenCentral()
@@ -13,7 +13,7 @@ buildscript {
         maven { url "https://dl.bintray.com/thelasterstar/maven/" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.0'
+        classpath 'com.android.tools.build:gradle:3.5.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         //CC组件化 自动插入代码插件
diff --git a/cc-settings.gradle b/cc-settings.gradle
index e96d3d8..06dabb2 100755
--- a/cc-settings.gradle
+++ b/cc-settings.gradle
@@ -1,4 +1,5 @@
 import java.util.regex.Pattern
+import org.gradle.util.GradleVersion
 
 //先加载local.properties文件
 Properties localProperties = new Properties()
@@ -38,7 +39,8 @@ ext.addComponent = { dependencyName, realDependency = null ->
     def app = 'true' == localProperties.getProperty(dependencyName)
     //当依赖的module不是app时，才去添加依赖
     if (!app) {
-        def dependencyMode = (project.gradle.gradleVersion as float) >= 4.1F ? 'api' : 'compile'
+        def dependencyMode = GradleVersion.version(project.gradle.gradleVersion) >= GradleVersion.version('4.1') ? 'api' : 'compile'
+//        def dependencyMode = (project.gradle.gradleVersion as float) >= 4.1F ? 'api' : 'compile'
         if (realDependency) {
             //通过参数传递的依赖方式，如：
             // project(':moduleName')
@@ -70,6 +72,9 @@ repositories {
 
 //默认配置了AndroidManifest.xml在library模式和application模式下的文件路径
 android {
+
+    compileSdkVersion rootProject.ext.android["compileSdkVersion"]
+
     sourceSets {
         main {
             //默认的作为application运行时Manifest文件路径
@@ -102,7 +107,8 @@ android {
         }
     }
 }
-def dependencyMode = (project.gradle.gradleVersion as float) >= 4.1F ? 'api' : 'compile'
+def dependencyMode = GradleVersion.version(project.gradle.gradleVersion) >= GradleVersion.version('4.1') ? 'api' : 'compile'
+//def dependencyMode = (project.gradle.gradleVersion as float) >= 4.1F ? 'api' : 'compile'
 //project.dependencies.add(dependencyMode, project(":cc"))
 project.dependencies.add(dependencyMode, "com.billy.android:cc:1.1.0")
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9e54a73..52f7c0c 100755
--- 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-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip