Skip to content

Commit

Permalink
Update versions for Gradle, Android Gradle plugin, and dependencies
Browse files Browse the repository at this point in the history 
- Gradle: 2.2.3 -> 3.2.1
- Android Gradle plugin: 3.3 -> 4.10.2
- compileSdkVersion: 25 -> 28
- minSdkVersion: 10 -> 14
  • Loading branch information
John Shea committed Dec 5, 2018
1 parent 6ca736c commit dbd998b
Show file tree
Hide file tree
Showing 198 changed files with 1,143 additions and 1,099 deletions.
23 changes: 11 additions & 12 deletions S01.01-Exercise-CreateLayout/app/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 25
buildToolsVersion '25.0.2'
compileSdkVersion 28

defaultConfig {
applicationId "com.example.android.sunshine"
minSdkVersion 10
minSdkVersion 14
targetSdkVersion 25
versionCode 1
versionName "1.0"
Expand All @@ -20,16 +19,16 @@ android {
}

dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
compile 'com.android.support:appcompat-v7:25.1.0'
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'com.android.support:appcompat-v7:28.0.0'

// TODO (10) Remove this dependency as we won't be needing it for the project until later
compile 'com.android.support.constraint:constraint-layout:1.0.0-beta4'
implementation 'com.android.support.constraint:constraint-layout:1.1.3'

// Instrumentation dependencies use androidTestCompile
// (as opposed to testCompile for local unit tests run in the JVM)
androidTestCompile 'junit:junit:4.12'
androidTestCompile 'com.android.support:support-annotations:25.1.0'
androidTestCompile 'com.android.support.test:runner:0.5'
androidTestCompile 'com.android.support.test:rules:0.5'
// Instrumentation dependencies use androidTestImplementation
// (as opposed to testImplementation for local unit tests run in the JVM)
androidTestImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support:support-annotations:28.0.0'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test:rules:1.0.2'
}
4 changes: 3 additions & 1 deletion S01.01-Exercise-CreateLayout/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@

buildscript {
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.2.3'
classpath 'com.android.tools.build:gradle:3.2.1'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand All @@ -18,6 +19,7 @@ allprojects {
buildDir = "C:/tmp/${rootProject.name}/${project.name}"
}
repositories {
google()
jcenter()
}
}
Expand Down
4 changes: 2 additions & 2 deletions S01.01-Exercise-CreateLayout/gradle/wrapper/gradle-wrapper.properties
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Fri Jan 06 09:57:11 PST 2017
#Wed Dec 05 11:39:23 EST 2018
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-4.10.2-all.zip
21 changes: 10 additions & 11 deletions S01.01-Solution-CreateLayout/app/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 25
buildToolsVersion '25.0.2'
compileSdkVersion 28

defaultConfig {
applicationId "com.example.android.sunshine"
minSdkVersion 10
minSdkVersion 14
targetSdkVersion 25
versionCode 1
versionName "1.0"
Expand All @@ -20,15 +19,15 @@ android {
}

dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
compile 'com.android.support:appcompat-v7:25.1.0'
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'com.android.support:appcompat-v7:28.0.0'

// COMPLETED (10) Remove this dependency as we won't be needing it for the project until later

// Instrumentation dependencies use androidTestCompile
// (as opposed to testCompile for local unit tests run in the JVM)
androidTestCompile 'junit:junit:4.12'
androidTestCompile 'com.android.support:support-annotations:25.1.0'
androidTestCompile 'com.android.support.test:runner:0.5'
androidTestCompile 'com.android.support.test:rules:0.5'
// Instrumentation dependencies use androidTestImplementation
// (as opposed to testImplementation for local unit tests run in the JVM)
androidTestImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support:support-annotations:28.0.0'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test:rules:1.0.2'
}
4 changes: 3 additions & 1 deletion S01.01-Solution-CreateLayout/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@

buildscript {
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.2.3'
classpath 'com.android.tools.build:gradle:3.2.1'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand All @@ -18,6 +19,7 @@ allprojects {
buildDir = "C:/tmp/${rootProject.name}/${project.name}"
}
repositories {
google()
jcenter()
}
}
Expand Down
4 changes: 2 additions & 2 deletions S01.01-Solution-CreateLayout/gradle/wrapper/gradle-wrapper.properties
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Fri Jan 06 09:57:11 PST 2017
#Wed Dec 05 11:39:23 EST 2018
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-4.10.2-all.zip
22 changes: 11 additions & 11 deletions S01.02-Exercise-AddWeatherList/app/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 25
buildToolsVersion '25.0.2'
compileSdkVersion 28

defaultConfig {
applicationId "com.example.android.sunshine"
minSdkVersion 10
minSdkVersion 14
targetSdkVersion 25
versionCode 1
versionName "1.0"
Expand All @@ -20,13 +19,14 @@ android {
}

dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
compile 'com.android.support:appcompat-v7:25.1.0'
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'com.android.support:appcompat-v7:28.0.0'

// Instrumentation dependencies use androidTestImplementation
// (as opposed to testImplementation for local unit tests run in the JVM)
androidTestImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support:support-annotations:28.0.0'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test:rules:1.0.2'

// Instrumentation dependencies use androidTestCompile
// (as opposed to testCompile for local unit tests run in the JVM)
androidTestCompile 'junit:junit:4.12'
androidTestCompile 'com.android.support:support-annotations:25.1.0'
androidTestCompile 'com.android.support.test:runner:0.5'
androidTestCompile 'com.android.support.test:rules:0.5'
}
4 changes: 3 additions & 1 deletion S01.02-Exercise-AddWeatherList/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@

buildscript {
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.2.3'
classpath 'com.android.tools.build:gradle:3.2.1'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand All @@ -18,6 +19,7 @@ allprojects {
buildDir = "C:/tmp/${rootProject.name}/${project.name}"
}
repositories {
google()
jcenter()
}
}
Expand Down
4 changes: 2 additions & 2 deletions S01.02-Exercise-AddWeatherList/gradle/wrapper/gradle-wrapper.properties
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Fri Jan 06 09:57:11 PST 2017
#Wed Dec 05 11:39:23 EST 2018
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-4.10.2-all.zip
22 changes: 11 additions & 11 deletions S01.02-Solution-AddWeatherList/app/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 25
buildToolsVersion '25.0.2'
compileSdkVersion 28

defaultConfig {
applicationId "com.example.android.sunshine"
minSdkVersion 10
minSdkVersion 14
targetSdkVersion 25
versionCode 1
versionName "1.0"
Expand All @@ -20,13 +19,14 @@ android {
}

dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
compile 'com.android.support:appcompat-v7:25.1.0'
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'com.android.support:appcompat-v7:28.0.0'

// Instrumentation dependencies use androidTestImplementation
// (as opposed to testImplementation for local unit tests run in the JVM)
androidTestImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support:support-annotations:28.0.0'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test:rules:1.0.2'

// Instrumentation dependencies use androidTestCompile
// (as opposed to testCompile for local unit tests run in the JVM)
androidTestCompile 'junit:junit:4.12'
androidTestCompile 'com.android.support:support-annotations:25.1.0'
androidTestCompile 'com.android.support.test:runner:0.5'
androidTestCompile 'com.android.support.test:rules:0.5'
}
4 changes: 3 additions & 1 deletion S01.02-Solution-AddWeatherList/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@

buildscript {
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.2.3'
classpath 'com.android.tools.build:gradle:3.2.1'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand All @@ -18,6 +19,7 @@ allprojects {
buildDir = "C:/tmp/${rootProject.name}/${project.name}"
}
repositories {
google()
jcenter()
}
}
Expand Down
4 changes: 2 additions & 2 deletions S01.02-Solution-AddWeatherList/gradle/wrapper/gradle-wrapper.properties
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Fri Jan 06 09:57:11 PST 2017
#Wed Dec 05 11:39:23 EST 2018
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-4.10.2-all.zip
22 changes: 11 additions & 11 deletions S02.01-Exercise-Networking/app/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 25
buildToolsVersion '25.0.2'
compileSdkVersion 28

defaultConfig {
applicationId "com.example.android.sunshine"
minSdkVersion 10
minSdkVersion 14
targetSdkVersion 25
versionCode 1
versionName "1.0"
Expand All @@ -20,13 +19,14 @@ android {
}

dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
compile 'com.android.support:appcompat-v7:25.1.0'
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'com.android.support:appcompat-v7:28.0.0'

// Instrumentation dependencies use androidTestImplementation
// (as opposed to testImplementation for local unit tests run in the JVM)
androidTestImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support:support-annotations:28.0.0'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test:rules:1.0.2'

// Instrumentation dependencies use androidTestCompile
// (as opposed to testCompile for local unit tests run in the JVM)
androidTestCompile 'junit:junit:4.12'
androidTestCompile 'com.android.support:support-annotations:25.1.0'
androidTestCompile 'com.android.support.test:runner:0.5'
androidTestCompile 'com.android.support.test:rules:0.5'
}
4 changes: 3 additions & 1 deletion S02.01-Exercise-Networking/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@

buildscript {
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.2.3'
classpath 'com.android.tools.build:gradle:3.2.1'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand All @@ -18,6 +19,7 @@ allprojects {
buildDir = "C:/tmp/${rootProject.name}/${project.name}"
}
repositories {
google()
jcenter()
}
}
Expand Down
4 changes: 2 additions & 2 deletions S02.01-Exercise-Networking/gradle/wrapper/gradle-wrapper.properties
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Fri Jan 06 09:57:11 PST 2017
#Wed Dec 05 11:39:23 EST 2018
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-4.10.2-all.zip
22 changes: 11 additions & 11 deletions S02.01-Solution-Networking/app/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 25
buildToolsVersion '25.0.2'
compileSdkVersion 28

defaultConfig {
applicationId "com.example.android.sunshine"
minSdkVersion 10
minSdkVersion 14
targetSdkVersion 25
versionCode 1
versionName "1.0"
Expand All @@ -20,13 +19,14 @@ android {
}

dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
compile 'com.android.support:appcompat-v7:25.1.0'
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'com.android.support:appcompat-v7:28.0.0'

// Instrumentation dependencies use androidTestImplementation
// (as opposed to testImplementation for local unit tests run in the JVM)
androidTestImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support:support-annotations:28.0.0'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test:rules:1.0.2'

// Instrumentation dependencies use androidTestCompile
// (as opposed to testCompile for local unit tests run in the JVM)
androidTestCompile 'junit:junit:4.12'
androidTestCompile 'com.android.support:support-annotations:25.1.0'
androidTestCompile 'com.android.support.test:runner:0.5'
androidTestCompile 'com.android.support.test:rules:0.5'
}
Loading

2 comments on commit dbd998b

@HasanElHefnawy
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi johnshea, thanks for your commit. However, I'm afraid this commit may cause Execution failed for task ':app:processDebugResources'.
I ran into the same issue just yesterday before you make this commit and I started a new issue explaining how to solve it here.
udacity/ud851-Exercises#427

@maisenovich
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@johnshea, could you please also update https://github.com/udacity/ud851-Exercises to use proper version of Gradle/etc? Thanks!

Please sign in to comment.