Skip to content

Commit b43e4b1

Browse files
author
John Shea
committed
Update versions for Gradle, Android Gradle plugin, and dependencies
- Resolve multiple issues reported in Issues - Resolve multiple issues report in Pull requests
1 parent 05cc7c2 commit b43e4b1

File tree

560 files changed

+1694
-1588
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

560 files changed

+1694
-1588
lines changed

‎Lesson01-Favorite-Toys/T01.01-Exercise-CreateLayout/app/build.gradle‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
22

33
android {
44
compileSdkVersion 25
5-
buildToolsVersion '25.0.2'
65

76
defaultConfig {
87
applicationId "com.android.example.favoritetoys"
@@ -19,9 +18,9 @@ android {
1918
}
2019

2120
dependencies {
22-
compile fileTree(dir: 'libs', include: ['*.jar'])
23-
compile 'com.android.support:appcompat-v7:25.1.0'
21+
implementation fileTree(dir: 'libs', include: ['*.jar'])
22+
implementation 'com.android.support:appcompat-v7:25.1.0'
2423

2524
// TODO (7) Remove the ConstraintLayout dependency as we aren't using it for these simple projects
26-
compile 'com.android.support.constraint:constraint-layout:1.0.0-beta4'
25+
implementation 'com.android.support.constraint:constraint-layout:1.0.0-beta4'
2726
}

‎Lesson01-Favorite-Toys/T01.01-Exercise-CreateLayout/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.2.3'
9+
classpath 'com.android.tools.build:gradle:3.2.1'
910

1011
// NOTE: Do not place your application dependencies here; they belong
1112
// in the individual module build.gradle files
@@ -18,6 +19,7 @@ allprojects {
1819
buildDir = "C:/tmp/${rootProject.name}/${project.name}"
1920
}
2021
repositories {
22+
google()
2123
jcenter()
2224
}
2325
}

‎Lesson01-Favorite-Toys/T01.01-Exercise-CreateLayout/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.10.2-all.zip

‎Lesson01-Favorite-Toys/T01.01-Solution-CreateLayout/app/build.gradle‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
22

33
android {
44
compileSdkVersion 25
5-
buildToolsVersion '25.0.2'
65

76
defaultConfig {
87
applicationId "com.android.example.favoritetoys"
@@ -19,6 +18,6 @@ android {
1918
}
2019

2120
dependencies {
22-
compile fileTree(dir: 'libs', include: ['*.jar'])
23-
compile 'com.android.support:appcompat-v7:25.1.0'
21+
implementation fileTree(dir: 'libs', include: ['*.jar'])
22+
implementation 'com.android.support:appcompat-v7:25.1.0'
2423
}

‎Lesson01-Favorite-Toys/T01.01-Solution-CreateLayout/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.2.3'
9+
classpath 'com.android.tools.build:gradle:3.2.1'
910

1011
// NOTE: Do not place your application dependencies here; they belong
1112
// in the individual module build.gradle files
@@ -18,6 +19,7 @@ allprojects {
1819
buildDir = "C:/tmp/${rootProject.name}/${project.name}"
1920
}
2021
repositories {
22+
google()
2123
jcenter()
2224
}
2325
}

‎Lesson01-Favorite-Toys/T01.01-Solution-CreateLayout/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.10.2-all.zip

‎Lesson01-Favorite-Toys/T01.02-Exercise-DisplayToyList/app/build.gradle‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
22

33
android {
44
compileSdkVersion 25
5-
buildToolsVersion '25.0.2'
65

76
defaultConfig {
87
applicationId "com.android.example.favoritetoys"
@@ -19,6 +18,6 @@ android {
1918
}
2019

2120
dependencies {
22-
compile fileTree(dir: 'libs', include: ['*.jar'])
23-
compile 'com.android.support:appcompat-v7:25.1.0'
21+
implementation fileTree(dir: 'libs', include: ['*.jar'])
22+
implementation 'com.android.support:appcompat-v7:25.1.0'
2423
}

‎Lesson01-Favorite-Toys/T01.02-Exercise-DisplayToyList/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.2.3'
9+
classpath 'com.android.tools.build:gradle:3.2.1'
910

1011
// NOTE: Do not place your application dependencies here; they belong
1112
// in the individual module build.gradle files
@@ -18,6 +19,7 @@ allprojects {
1819
buildDir = "C:/tmp/${rootProject.name}/${project.name}"
1920
}
2021
repositories {
22+
google()
2123
jcenter()
2224
}
2325
}

‎Lesson01-Favorite-Toys/T01.02-Exercise-DisplayToyList/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.10.2-all.zip

‎Lesson01-Favorite-Toys/T01.02-Solution-DisplayToyList/app/build.gradle‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
22

33
android {
44
compileSdkVersion 25
5-
buildToolsVersion '25.0.2'
65

76
defaultConfig {
87
applicationId "com.android.example.favoritetoys"
@@ -19,6 +18,6 @@ android {
1918
}
2019

2120
dependencies {
22-
compile fileTree(dir: 'libs', include: ['*.jar'])
23-
compile 'com.android.support:appcompat-v7:25.1.0'
21+
implementation fileTree(dir: 'libs', include: ['*.jar'])
22+
implementation 'com.android.support:appcompat-v7:25.1.0'
2423
}

0 commit comments

Comments
 (0)