From a20edf867ee9ed67613fcf85b51461ebeaa6cd46 Mon Sep 17 00:00:00 2001 From: TonyTandAndroid Date: Wed, 29 May 2019 22:44:43 -0700 Subject: [PATCH] Bump up Android Studio with up-to-date config. --- UMLibrary/build.gradle | 15 +++++---------- app/build.gradle | 11 ++++++----- build.gradle | 4 +++- gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/UMLibrary/build.gradle b/UMLibrary/build.gradle index 972e2d9..c417a78 100644 --- a/UMLibrary/build.gradle +++ b/UMLibrary/build.gradle @@ -1,17 +1,15 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 26 - buildToolsVersion "26.0.0" + compileSdkVersion 28 + buildToolsVersion "28.0.3" defaultConfig { minSdkVersion 14 - targetSdkVersion 26 + //noinspection ExpiredTargetSdkVersion + targetSdkVersion 22 versionCode 1 versionName "1.0" - - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" - } buildTypes { release { @@ -31,9 +29,6 @@ android { jniLibs.srcDirs = ['libs'] } - // Move the tests to tests/java, tests/res, etc... - instrumentTest.setRoot('tests') - // Move the build types to build-types/ // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ... // This moves them out of them default location under src//... which would @@ -46,6 +41,6 @@ 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..e80d0c6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,11 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 26 - buildToolsVersion '26.0.3' + compileSdkVersion 28 + buildToolsVersion '28.0.3' defaultConfig { applicationId "com.umeng.soexample" minSdkVersion 18 + //noinspection ExpiredTargetSdkVersion targetSdkVersion 22 versionCode 1 versionName "1.0" @@ -36,7 +37,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') + api 'com.twitter.sdk.android:twitter-core:3.1.1' + api 'com.twitter.sdk.android:tweet-composer:3.1.1' } diff --git a/build.gradle b/build.gradle index c2eea8e..56532aa 100644 --- a/build.gradle +++ b/build.gradle @@ -2,10 +2,11 @@ buildscript { repositories { + google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.4.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -14,6 +15,7 @@ buildscript { allprojects { repositories { + google() jcenter() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4916797..d237bda 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-5.4.1-all.zip