🔧 Upgrade to Android gradle plugin 3.3.0

lxwsam · Jan 23, 2019 · 93ea311 · 93ea311
1 parent 8178e36
commit 93ea311
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 20 deletions.
diff --git a/build.gradle b/build.gradle
@@ -2,10 +2,10 @@
 
 buildscript {
     repositories {
-        jcenter()
         google()
         maven { url 'https://dl.google.com/dl/android/maven2/' }
         maven { url 'https://mirrors.huaweicloud.com/repository/maven/' } // Huawei Maven mirrors
+        jcenter()
     }
     dependencies {
         classpath "com.android.tools.build:gradle:$ANDROID_BUILD_VERSION"
@@ -16,10 +16,10 @@ buildscript {
 
 allprojects {
     repositories {
-        jcenter()
         google()
         maven { url 'https://dl.google.com/dl/android/maven2/' }
         maven { url 'https://mirrors.huaweicloud.com/repository/maven/' } // Huawei Maven mirrors
         maven { url 'https://dl.bintray.com/panpf/maven' }
+        jcenter()
     }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -18,9 +18,9 @@
 # org.gradle.parallel=true
 
 # build
-KOTLIN_VERSION=1.2.71
-ANDROID_BUILD_VERSION=3.2.1
-BINTRAY_RELEASE_VERSION=1.0.0
+KOTLIN_VERSION=1.3.11
+ANDROID_BUILD_VERSION=3.3.0
+BINTRAY_RELEASE_VERSION=1.1.1
 android.useAndroidX=true
 android.enableJetifier=true
 
@@ -51,4 +51,4 @@ EVENT_BUS_VERSION=3.0.0
 RETROFIT_VERSION=2.3.0
 LEAK_CANARY_ANDROID_VERSION=1.6.2
 FLEXBOX=0.3.2
-PANPF_ANDROIDX=1.0.0-alpha2
+PANPF_ANDROIDX=1.0.0-alpha3
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Oct 19 11:18:57 CST 2018
+#Wed Jan 16 18:00:16 CST 2019
 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-4.10.1-all.zip
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -60,11 +60,6 @@ android {
         abortOnError false
     }
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
-    }
-
     aaptOptions {
         noCompress "bmp"
     }

diff --git a/sketch-gif/build.gradle b/sketch-gif/build.gradle
@@ -24,4 +24,4 @@ dependencies {
     implementation "androidx.annotation:annotation:$ANDROIDX_ANNOTATION"
 }
 
-apply from: 'build_upload.gradle'
+apply from: 'build_upload.gradle'
diff --git a/sketch/build.gradle b/sketch/build.gradle
@@ -19,16 +19,11 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
-    }
 }
 
 dependencies {
     compileOnly project(':sketch-gif')
     implementation "androidx.annotation:annotation:$ANDROIDX_ANNOTATION"
 }
 
-apply from: 'build_upload.gradle'
+apply from: 'build_upload.gradle'