From 3d95dc54337b30cdf3eb4898d70c3d56ba8a57b7 Mon Sep 17 00:00:00 2001
From: Liu PeiPei <lsanotes@live.com>
Date: Wed, 23 Jan 2019 13:58:17 +0800
Subject: [PATCH] upgrade AGP to 3.3.0

---
 UMLibrary/build.gradle                   | 15 +++++----------
 app/build.gradle                         | 11 +++++------
 build.gradle                             |  4 +++-
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 4 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/UMLibrary/build.gradle b/UMLibrary/build.gradle
index 972e2d9..be89291 100644
--- a/UMLibrary/build.gradle
+++ b/UMLibrary/build.gradle
@@ -1,17 +1,13 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion "26.0.0"
+    compileSdkVersion 28
 
     defaultConfig {
-        minSdkVersion 14
-        targetSdkVersion 26
+        minSdkVersion 19
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
-
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-
     }
     buildTypes {
         release {
@@ -32,7 +28,7 @@ android {
         }
 
         // Move the tests to tests/java, tests/res, etc...
-        instrumentTest.setRoot('tests')
+//        instrumentTest.setRoot('tests')
 
         // Move the build types to build-types/<type>
         // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...
@@ -46,6 +42,5 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-
+    api fileTree(dir: 'libs', include: ['*.jar'])
 }
diff --git a/app/build.gradle b/app/build.gradle
index dcfcb13..25240b9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,11 +1,10 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion '26.0.3'
+    compileSdkVersion 28
     defaultConfig {
         applicationId "com.umeng.soexample"
-        minSdkVersion 18
+        minSdkVersion 19
         targetSdkVersion 22
         versionCode 1
         versionName "1.0"
@@ -36,7 +35,7 @@ dependencies {
 //    compile project(':push')
     //compile files('libs/umeng-analytics-7.4.1.jar')
     //compile files('libs/umeng-common-1.4.2.jar')
-    compile project(':UMLibrary')
-    compile 'com.twitter.sdk.android:twitter-core:3.1.1'
-    compile 'com.twitter.sdk.android:tweet-composer:3.1.1'
+    api project(':UMLibrary')
+    implementation 'com.twitter.sdk.android:twitter-core:3.1.1'
+    implementation 'com.twitter.sdk.android:tweet-composer:3.1.1'
 }
diff --git a/build.gradle b/build.gradle
index c2eea8e..72c9966 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,9 +3,10 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.3.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -15,6 +16,7 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 4916797..5f8f303 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.10.1-all.zip