From 93ea311a9320c47621eb36375aaa5c75aedffbe6 Mon Sep 17 00:00:00 2001
From: Flyge <sky@panpf.me>
Date: Wed, 23 Jan 2019 14:13:06 +0800
Subject: [PATCH] :wrench: Upgrade to Android gradle plugin 3.3.0

---
 build.gradle                             | 4 ++--
 gradle.properties                        | 8 ++++----
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 sample/build.gradle                      | 5 -----
 sketch-gif/build.gradle                  | 2 +-
 sketch/build.gradle                      | 7 +------
 6 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/build.gradle b/build.gradle
index 66c6b4cb04..ae1fd6124c 100644
--- 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
index 067ad1945d..8495366cf7 100644
--- 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
\ No newline at end of file
+PANPF_ANDROIDX=1.0.0-alpha3
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 69f3d851e6..542910bd9d 100644
--- 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
index 40e06cc64a..6894d7cf42 100644
--- 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
index 5465eadc41..021f739930 100644
--- 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'
\ No newline at end of file
diff --git a/sketch/build.gradle b/sketch/build.gradle
index 0adae9b130..4ab300ec62 100644
--- a/sketch/build.gradle
+++ b/sketch/build.gradle
@@ -19,11 +19,6 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
-    }
 }
 
 dependencies {
@@ -31,4 +26,4 @@ dependencies {
     implementation "androidx.annotation:annotation:$ANDROIDX_ANNOTATION"
 }
 
-apply from: 'build_upload.gradle'
+apply from: 'build_upload.gradle'
\ No newline at end of file