From d9f00da893853745bd3e48c40509d77f8abcca83 Mon Sep 17 00:00:00 2001
From: twocity <dvy.zhang@gmail.com>
Date: Tue, 28 Aug 2018 14:57:32 +0800
Subject: [PATCH] Upgrade Android gradle plugin

---
 build.gradle                             | 19 ++++++++++---------
 example/build.gradle                     | 12 ++++++------
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 lib/build.gradle                         | 14 ++++++++------
 4 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/build.gradle b/build.gradle
index 13089606..502dbe46 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,13 +3,10 @@
 buildscript {
     repositories {
         jcenter()
-        maven {
-            url 'https://maven.google.com/'
-            name 'Google'
-        }
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.1.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -19,9 +16,13 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
-        maven {
-            url 'https://maven.google.com/'
-            name 'Google'
-        }
+        google()
     }
 }
+
+ext {
+    minSdkVersion = 18
+    compileSdkVersion = 28
+    targetSdkVersion = 28
+    buildToolsVersion = '28.0.2'
+}
\ No newline at end of file
diff --git a/example/build.gradle b/example/build.gradle
index 8560676b..ef924ef2 100644
--- a/example/build.gradle
+++ b/example/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion '25.0.0'
+    compileSdkVersion rootProject.compileSdkVersion
+    buildToolsVersion rootProject.buildToolsVersion
 
     defaultConfig {
         applicationId "net.ypresto.androidtranscoder.example"
-        minSdkVersion 18
-        targetSdkVersion 24
+        minSdkVersion rootProject.minSdkVersion
+        targetSdkVersion rootProject.targetSdkVersion
         versionCode 1
         versionName "1.0"
     }
@@ -20,6 +20,6 @@ android {
 }
 
 dependencies {
-    compile project(':lib')
-    compile 'com.android.support:support-core-utils:24.2.0'
+    implementation project(':lib')
+    implementation 'com.android.support:support-core-utils:27.1.1'
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9555d195..e235565f 100644
--- 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-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip
diff --git a/lib/build.gradle b/lib/build.gradle
index 1ab6c7ba..30901c69 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.novoda:bintray-release:0.2.4'
+        classpath 'com.novoda:bintray-release:0.8.1'
     }
 }
 
@@ -11,12 +11,12 @@ apply plugin: 'com.android.library'
 apply plugin: 'bintray-release'
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion '25.0.2'
+    compileSdkVersion rootProject.compileSdkVersion
+    buildToolsVersion rootProject.buildToolsVersion
 
     defaultConfig {
-        minSdkVersion 18
-        targetSdkVersion 24
+        minSdkVersion rootProject.minSdkVersion
+        targetSdkVersion rootProject.targetSdkVersion
     }
 
     buildTypes {
@@ -30,9 +30,11 @@ android {
 }
 
 publish {
+    userOrg = 'net.ypresto'
     groupId = 'net.ypresto.androidtranscoder'
     artifactId = 'android-transcoder'
-    version = '0.3.0'
+    publishVersion = '0.3.0'
+    desc = 'Hardware accelerated transcoder for Android, written in pure Java.'
     licences = ['Apache-2.0']
     website = 'https://github.com/ypresto/android-transcoder'
     autoPublish = false