update build.gradle

fengzhizi715 · Oct 2, 2020 · 6532b72 · 6532b72
1 parent ab03dd2
commit 6532b72
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 SAF-Kotlin-log
 ===
 
+Version 2.5.2
+---
+2020-10-03
+* 更新 Kotlin 版本至 1.4.10 以及 Kotlin Coroutines 版本
+
 Version 2.5.1
 ---
 2020-07-30

diff --git a/app/build.gradle b/app/build.gradle
@@ -38,8 +38,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = "1.7"
-        targetCompatibility = "1.7"
+        sourceCompatibility = "1.8"
+        targetCompatibility = "1.8"
     }
 
     lintOptions {

diff --git a/build.gradle b/build.gradle
@@ -60,5 +60,6 @@ task clean(type: Delete) {
 }
 
 tasks.getByPath(":app:lint").enabled = false
+//tasks.getByPath(":app:mergeDexDebug ").enabled = false
 tasks.getByPath(":ndklog:externalNativeBuildCleanDebug").enabled = false
 tasks.getByPath(":ndklog:externalNativeBuildCleanRelease").enabled = false
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.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6-all.zip