Skip to content

Commit c4f5ffe

Browse files
author
Michael Amygdalidis
committed
Upgrade the code lab to use the latest version of ATSL and Gradle
runnerVersion = '1.0.1' rulesVersion = '1.0.1' espressoVersion = '3.0.1' Gradle Plugin = '3.0.1' Gradle = '4.1'
1 parent 8d4d687 commit c4f5ffe

File tree

3 files changed

+13
-17
lines changed

3 files changed

+13
-17
lines changed

app/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ dependencies {
6161
compile "com.android.support:design:$rootProject.supportLibraryVersion"
6262
compile "com.android.support:recyclerview-v7:$rootProject.supportLibraryVersion"
6363
compile "com.android.support:support-v4:$rootProject.supportLibraryVersion"
64+
6465
compile "com.google.guava:guava:$rootProject.guavaVersion"
6566
compile "com.github.bumptech.glide:glide:$rootProject.glideVersion"
6667
compile "com.android.support.test.espresso:espresso-idling-resource:$rootProject.ext.espressoVersion"

build.gradle

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
buildscript {
22
repositories {
33
jcenter()
4+
google()
45
}
56
dependencies {
6-
classpath 'com.android.tools.build:gradle:2.3.1'
7+
classpath 'com.android.tools.build:gradle:3.0.1'
78

89
// NOTE: Do not place your application dependencies here; they belong
910
// in the individual module build.gradle files
@@ -13,33 +14,27 @@ buildscript {
1314
allprojects {
1415
repositories {
1516
jcenter()
16-
maven {
17-
url 'https://maven.google.com'
18-
}
17+
google()
1918
}
2019
}
2120

22-
task clean(type: Delete) {
23-
delete rootProject.buildDir
24-
}
25-
2621
// Define versions in a single place
2722
ext {
2823
// Sdk and tools
29-
minSdkVersion = 10
30-
targetSdkVersion = 26
31-
compileSdkVersion = 26
32-
buildToolsVersion = '25.0.2'
24+
minSdkVersion = 14
25+
targetSdkVersion = 27
26+
compileSdkVersion = 27
27+
buildToolsVersion = '27.0.1'
3328

3429
// App dependencies
35-
supportLibraryVersion = '25.4.0'
30+
supportLibraryVersion = '27.0.2'
3631
guavaVersion = '18.0'
3732
glideVersion = '3.6.1'
3833
junitVersion = '4.12'
3934
mockitoVersion = '1.10.19'
4035
powerMockito = '1.6.2'
4136
hamcrestVersion = '1.3'
42-
runnerVersion = '1.0.0'
43-
rulesVersion = '1.0.0'
44-
espressoVersion = '3.0.0'
37+
runnerVersion = '1.0.1'
38+
rulesVersion = '1.0.1'
39+
espressoVersion = '3.0.1'
4540
}

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-4.1-all.zip

0 commit comments

Comments
 (0)