Skip to content

Commit 35a8492

Browse files
committed
[opt]:update gradle versions
1 parent e48352a commit 35a8492

File tree

7 files changed

+54
-40
lines changed

7 files changed

+54
-40
lines changed
587 Bytes
Binary file not shown.

.idea/codeStyles/Project.xml

Lines changed: 29 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 1 addition & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33
buildscript {
44
repositories {
55
jcenter()
6+
google()
67
}
78
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.3.3'
9-
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' // Add this line
9+
classpath 'com.android.tools.build:gradle:3.1.4'
10+
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0' // Add this line
1011
// NOTE: Do not place your application dependencies here; they belong
1112
// in the individual module build.gradle files
1213
}
@@ -15,6 +16,7 @@ buildscript {
1516
allprojects {
1617
repositories {
1718
jcenter()
19+
google()
1820
}
1921
}
2022

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Mon May 08 08:42:21 CST 2017
1+
#Sun Aug 12 19:20:03 CST 2018
22
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-4.4-all.zip

library/build.gradle

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
apply plugin: 'com.android.library'
22
apply plugin: 'com.github.dcendents.android-maven'
3-
group='com.github.kilnn'
3+
group = 'com.github.kilnn'
44

55
android {
6-
compileSdkVersion 25
7-
buildToolsVersion "25.0.3"
6+
compileSdkVersion 28
87

98
defaultConfig {
10-
minSdkVersion 8
11-
targetSdkVersion 25
9+
minSdkVersion 14
10+
targetSdkVersion 28
1211
versionCode 1
1312
versionName "1.0"
1413

1514
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
16-
1715
}
1816
buildTypes {
1917
release {
@@ -24,9 +22,8 @@ android {
2422
}
2523

2624
dependencies {
27-
compile fileTree(dir: 'libs', include: ['*.jar'])
28-
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
29-
exclude group: 'com.android.support', module: 'support-annotations'
30-
})
31-
testCompile 'junit:junit:4.12'
25+
implementation fileTree(dir: 'libs', include: ['*.jar'])
26+
testImplementation 'junit:junit:4.12'
27+
androidTestImplementation 'com.android.support.test:runner:1.0.2'
28+
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
3229
}

sample/build.gradle

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

33
android {
4-
compileSdkVersion 25
5-
buildToolsVersion "25.0.3"
4+
compileSdkVersion 28
5+
66
defaultConfig {
77
applicationId "com.github.kilnn.diffuse.sample"
8-
minSdkVersion 9
9-
targetSdkVersion 25
8+
minSdkVersion 14
9+
targetSdkVersion 28
1010
versionCode 1
1111
versionName "1.0"
1212
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -20,12 +20,11 @@ android {
2020
}
2121

2222
dependencies {
23-
compile fileTree(include: ['*.jar'], dir: 'libs')
24-
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
25-
exclude group: 'com.android.support', module: 'support-annotations'
26-
})
27-
compile 'com.android.support:appcompat-v7:25.3.1'
28-
compile 'com.android.support.constraint:constraint-layout:1.0.2'
29-
testCompile 'junit:junit:4.12'
23+
implementation fileTree(dir: 'libs', include: ['*.jar'])
3024
compile project(':library')
25+
implementation 'com.android.support:appcompat-v7:28.0.0-rc01'
26+
implementation 'com.android.support.constraint:constraint-layout:1.1.2'
27+
testImplementation 'junit:junit:4.12'
28+
androidTestImplementation 'com.android.support.test:runner:1.0.2'
29+
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
3130
}

0 commit comments

Comments
 (0)