Skip to content

Commit a20edf8

Browse files
author
TonyTandAndroid
committed
Bump up Android Studio with up-to-date config.
1 parent a4e2258 commit a20edf8

4 files changed

Lines changed: 15 additions & 17 deletions

File tree

‎UMLibrary/build.gradle‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
apply plugin: 'com.android.library'
22

33
android {
4-
compileSdkVersion 26
5-
buildToolsVersion "26.0.0"
4+
compileSdkVersion 28
5+
buildToolsVersion "28.0.3"
66

77
defaultConfig {
88
minSdkVersion 14
9-
targetSdkVersion 26
9+
//noinspection ExpiredTargetSdkVersion
10+
targetSdkVersion 22
1011
versionCode 1
1112
versionName "1.0"
12-
13-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
14-
1513
}
1614
buildTypes {
1715
release {
@@ -31,9 +29,6 @@ android {
3129
jniLibs.srcDirs = ['libs']
3230
}
3331

34-
// Move the tests to tests/java, tests/res, etc...
35-
instrumentTest.setRoot('tests')
36-
3732
// Move the build types to build-types/<type>
3833
// For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...
3934
// This moves them out of them default location under src/<type>/... which would
@@ -46,6 +41,6 @@ android {
4641
}
4742

4843
dependencies {
49-
compile fileTree(dir: 'libs', include: ['*.jar'])
44+
api fileTree(dir: 'libs', include: ['*.jar'])
5045

5146
}

‎app/build.gradle‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 26
5-
buildToolsVersion '26.0.3'
4+
compileSdkVersion 28
5+
buildToolsVersion '28.0.3'
66
defaultConfig {
77
applicationId "com.umeng.soexample"
88
minSdkVersion 18
9+
//noinspection ExpiredTargetSdkVersion
910
targetSdkVersion 22
1011
versionCode 1
1112
versionName "1.0"
@@ -36,7 +37,7 @@ dependencies {
3637
// compile project(':push')
3738
//compile files('libs/umeng-analytics-7.4.1.jar')
3839
//compile files('libs/umeng-common-1.4.2.jar')
39-
compile project(':UMLibrary')
40-
compile 'com.twitter.sdk.android:twitter-core:3.1.1'
41-
compile 'com.twitter.sdk.android:tweet-composer:3.1.1'
40+
api project(':UMLibrary')
41+
api 'com.twitter.sdk.android:twitter-core:3.1.1'
42+
api 'com.twitter.sdk.android:tweet-composer:3.1.1'
4243
}

‎build.gradle‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22

33
buildscript {
44
repositories {
5+
google()
56
jcenter()
67
}
78
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.3.3'
9+
classpath 'com.android.tools.build:gradle:3.4.1'
910

1011
// NOTE: Do not place your application dependencies here; they belong
1112
// in the individual module build.gradle files
@@ -14,6 +15,7 @@ buildscript {
1415

1516
allprojects {
1617
repositories {
18+
google()
1719
jcenter()
1820
}
1921
}

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

0 commit comments

Comments
 (0)