diff --git a/S01.01-Exercise-CreateLayout/app/build.gradle b/S01.01-Exercise-CreateLayout/app/build.gradle index 1b2c40b0d4..851f61f094 100755 --- a/S01.01-Exercise-CreateLayout/app/build.gradle +++ b/S01.01-Exercise-CreateLayout/app/build.gradle @@ -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" @@ -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' } diff --git a/S01.01-Exercise-CreateLayout/build.gradle b/S01.01-Exercise-CreateLayout/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S01.01-Exercise-CreateLayout/build.gradle +++ b/S01.01-Exercise-CreateLayout/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S01.01-Exercise-CreateLayout/gradle/wrapper/gradle-wrapper.properties b/S01.01-Exercise-CreateLayout/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S01.01-Exercise-CreateLayout/gradle/wrapper/gradle-wrapper.properties +++ b/S01.01-Exercise-CreateLayout/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S01.01-Solution-CreateLayout/app/build.gradle b/S01.01-Solution-CreateLayout/app/build.gradle index 59c3c0a48d..311260948d 100755 --- a/S01.01-Solution-CreateLayout/app/build.gradle +++ b/S01.01-Solution-CreateLayout/app/build.gradle @@ -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" @@ -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' } diff --git a/S01.01-Solution-CreateLayout/build.gradle b/S01.01-Solution-CreateLayout/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S01.01-Solution-CreateLayout/build.gradle +++ b/S01.01-Solution-CreateLayout/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S01.01-Solution-CreateLayout/gradle/wrapper/gradle-wrapper.properties b/S01.01-Solution-CreateLayout/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S01.01-Solution-CreateLayout/gradle/wrapper/gradle-wrapper.properties +++ b/S01.01-Solution-CreateLayout/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S01.02-Exercise-AddWeatherList/app/build.gradle b/S01.02-Exercise-AddWeatherList/app/build.gradle index 3e590be35f..49e5a69bfd 100755 --- a/S01.02-Exercise-AddWeatherList/app/build.gradle +++ b/S01.02-Exercise-AddWeatherList/app/build.gradle @@ -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" @@ -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' } diff --git a/S01.02-Exercise-AddWeatherList/build.gradle b/S01.02-Exercise-AddWeatherList/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S01.02-Exercise-AddWeatherList/build.gradle +++ b/S01.02-Exercise-AddWeatherList/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S01.02-Exercise-AddWeatherList/gradle/wrapper/gradle-wrapper.properties b/S01.02-Exercise-AddWeatherList/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S01.02-Exercise-AddWeatherList/gradle/wrapper/gradle-wrapper.properties +++ b/S01.02-Exercise-AddWeatherList/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S01.02-Solution-AddWeatherList/app/build.gradle b/S01.02-Solution-AddWeatherList/app/build.gradle index 3e590be35f..49e5a69bfd 100755 --- a/S01.02-Solution-AddWeatherList/app/build.gradle +++ b/S01.02-Solution-AddWeatherList/app/build.gradle @@ -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" @@ -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' } diff --git a/S01.02-Solution-AddWeatherList/build.gradle b/S01.02-Solution-AddWeatherList/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S01.02-Solution-AddWeatherList/build.gradle +++ b/S01.02-Solution-AddWeatherList/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S01.02-Solution-AddWeatherList/gradle/wrapper/gradle-wrapper.properties b/S01.02-Solution-AddWeatherList/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S01.02-Solution-AddWeatherList/gradle/wrapper/gradle-wrapper.properties +++ b/S01.02-Solution-AddWeatherList/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S02.01-Exercise-Networking/app/build.gradle b/S02.01-Exercise-Networking/app/build.gradle index 3e590be35f..49e5a69bfd 100755 --- a/S02.01-Exercise-Networking/app/build.gradle +++ b/S02.01-Exercise-Networking/app/build.gradle @@ -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" @@ -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' } diff --git a/S02.01-Exercise-Networking/build.gradle b/S02.01-Exercise-Networking/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S02.01-Exercise-Networking/build.gradle +++ b/S02.01-Exercise-Networking/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S02.01-Exercise-Networking/gradle/wrapper/gradle-wrapper.properties b/S02.01-Exercise-Networking/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S02.01-Exercise-Networking/gradle/wrapper/gradle-wrapper.properties +++ b/S02.01-Exercise-Networking/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S02.01-Solution-Networking/app/build.gradle b/S02.01-Solution-Networking/app/build.gradle index 3e590be35f..49e5a69bfd 100755 --- a/S02.01-Solution-Networking/app/build.gradle +++ b/S02.01-Solution-Networking/app/build.gradle @@ -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" @@ -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' } diff --git a/S02.01-Solution-Networking/build.gradle b/S02.01-Solution-Networking/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S02.01-Solution-Networking/build.gradle +++ b/S02.01-Solution-Networking/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S02.01-Solution-Networking/gradle/wrapper/gradle-wrapper.properties b/S02.01-Solution-Networking/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S02.01-Solution-Networking/gradle/wrapper/gradle-wrapper.properties +++ b/S02.01-Solution-Networking/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S02.02-Exercise-Menus/app/build.gradle b/S02.02-Exercise-Menus/app/build.gradle index 3e590be35f..49e5a69bfd 100755 --- a/S02.02-Exercise-Menus/app/build.gradle +++ b/S02.02-Exercise-Menus/app/build.gradle @@ -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" @@ -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' } diff --git a/S02.02-Exercise-Menus/build.gradle b/S02.02-Exercise-Menus/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S02.02-Exercise-Menus/build.gradle +++ b/S02.02-Exercise-Menus/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S02.02-Exercise-Menus/gradle/wrapper/gradle-wrapper.properties b/S02.02-Exercise-Menus/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S02.02-Exercise-Menus/gradle/wrapper/gradle-wrapper.properties +++ b/S02.02-Exercise-Menus/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S02.02-Solution-Menus/app/build.gradle b/S02.02-Solution-Menus/app/build.gradle index 3e590be35f..49e5a69bfd 100755 --- a/S02.02-Solution-Menus/app/build.gradle +++ b/S02.02-Solution-Menus/app/build.gradle @@ -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" @@ -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' } diff --git a/S02.02-Solution-Menus/build.gradle b/S02.02-Solution-Menus/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S02.02-Solution-Menus/build.gradle +++ b/S02.02-Solution-Menus/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S02.02-Solution-Menus/gradle/wrapper/gradle-wrapper.properties b/S02.02-Solution-Menus/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S02.02-Solution-Menus/gradle/wrapper/gradle-wrapper.properties +++ b/S02.02-Solution-Menus/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S02.03-Exercise-Polish/app/build.gradle b/S02.03-Exercise-Polish/app/build.gradle index 3e590be35f..49e5a69bfd 100755 --- a/S02.03-Exercise-Polish/app/build.gradle +++ b/S02.03-Exercise-Polish/app/build.gradle @@ -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" @@ -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' } diff --git a/S02.03-Exercise-Polish/build.gradle b/S02.03-Exercise-Polish/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S02.03-Exercise-Polish/build.gradle +++ b/S02.03-Exercise-Polish/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S02.03-Exercise-Polish/gradle/wrapper/gradle-wrapper.properties b/S02.03-Exercise-Polish/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S02.03-Exercise-Polish/gradle/wrapper/gradle-wrapper.properties +++ b/S02.03-Exercise-Polish/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S02.03-Solution-Polish/app/build.gradle b/S02.03-Solution-Polish/app/build.gradle index 3e590be35f..49e5a69bfd 100755 --- a/S02.03-Solution-Polish/app/build.gradle +++ b/S02.03-Solution-Polish/app/build.gradle @@ -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" @@ -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' } diff --git a/S02.03-Solution-Polish/build.gradle b/S02.03-Solution-Polish/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S02.03-Solution-Polish/build.gradle +++ b/S02.03-Solution-Polish/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S02.03-Solution-Polish/gradle/wrapper/gradle-wrapper.properties b/S02.03-Solution-Polish/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S02.03-Solution-Polish/gradle/wrapper/gradle-wrapper.properties +++ b/S02.03-Solution-Polish/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S03.01-Exercise-RecyclerView/app/build.gradle b/S03.01-Exercise-RecyclerView/app/build.gradle index a17c4d9591..3aacedf61c 100755 --- a/S03.01-Exercise-RecyclerView/app/build.gradle +++ b/S03.01-Exercise-RecyclerView/app/build.gradle @@ -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" @@ -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' // TODO (1) Add RecyclerView dependency - // 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' } diff --git a/S03.01-Exercise-RecyclerView/build.gradle b/S03.01-Exercise-RecyclerView/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S03.01-Exercise-RecyclerView/build.gradle +++ b/S03.01-Exercise-RecyclerView/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S03.01-Exercise-RecyclerView/gradle/wrapper/gradle-wrapper.properties b/S03.01-Exercise-RecyclerView/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S03.01-Exercise-RecyclerView/gradle/wrapper/gradle-wrapper.properties +++ b/S03.01-Exercise-RecyclerView/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S03.01-Solution-RecyclerView/app/build.gradle b/S03.01-Solution-RecyclerView/app/build.gradle index ca8bb044b8..f182644fcd 100755 --- a/S03.01-Solution-RecyclerView/app/build.gradle +++ b/S03.01-Solution-RecyclerView/app/build.gradle @@ -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" @@ -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' // COMPLETED (1) Add RecyclerView dependency - compile 'com.android.support:recyclerview-v7:25.0.1' + implementation 'com.android.support:recyclerview-v7:28.0.0' - // 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' } diff --git a/S03.01-Solution-RecyclerView/build.gradle b/S03.01-Solution-RecyclerView/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S03.01-Solution-RecyclerView/build.gradle +++ b/S03.01-Solution-RecyclerView/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S03.01-Solution-RecyclerView/gradle/wrapper/gradle-wrapper.properties b/S03.01-Solution-RecyclerView/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S03.01-Solution-RecyclerView/gradle/wrapper/gradle-wrapper.properties +++ b/S03.01-Solution-RecyclerView/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S03.02-Exercise-RecyclerViewClickHandling/app/build.gradle b/S03.02-Exercise-RecyclerViewClickHandling/app/build.gradle index c1b44e9180..b2e11608d7 100755 --- a/S03.02-Exercise-RecyclerViewClickHandling/app/build.gradle +++ b/S03.02-Exercise-RecyclerViewClickHandling/app/build.gradle @@ -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" @@ -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' - compile 'com.android.support:recyclerview-v7:25.0.1' + implementation 'com.android.support:recyclerview-v7:28.0.0' - // 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' } diff --git a/S03.02-Exercise-RecyclerViewClickHandling/build.gradle b/S03.02-Exercise-RecyclerViewClickHandling/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S03.02-Exercise-RecyclerViewClickHandling/build.gradle +++ b/S03.02-Exercise-RecyclerViewClickHandling/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S03.02-Exercise-RecyclerViewClickHandling/gradle/wrapper/gradle-wrapper.properties b/S03.02-Exercise-RecyclerViewClickHandling/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S03.02-Exercise-RecyclerViewClickHandling/gradle/wrapper/gradle-wrapper.properties +++ b/S03.02-Exercise-RecyclerViewClickHandling/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S03.02-Solution-RecyclerViewClickHandling/app/build.gradle b/S03.02-Solution-RecyclerViewClickHandling/app/build.gradle index c1b44e9180..b2e11608d7 100755 --- a/S03.02-Solution-RecyclerViewClickHandling/app/build.gradle +++ b/S03.02-Solution-RecyclerViewClickHandling/app/build.gradle @@ -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" @@ -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' - compile 'com.android.support:recyclerview-v7:25.0.1' + implementation 'com.android.support:recyclerview-v7:28.0.0' - // 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' } diff --git a/S03.02-Solution-RecyclerViewClickHandling/build.gradle b/S03.02-Solution-RecyclerViewClickHandling/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S03.02-Solution-RecyclerViewClickHandling/build.gradle +++ b/S03.02-Solution-RecyclerViewClickHandling/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S03.02-Solution-RecyclerViewClickHandling/gradle/wrapper/gradle-wrapper.properties b/S03.02-Solution-RecyclerViewClickHandling/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S03.02-Solution-RecyclerViewClickHandling/gradle/wrapper/gradle-wrapper.properties +++ b/S03.02-Solution-RecyclerViewClickHandling/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S04.01-Exercise-LaunchNewActivity/app/build.gradle b/S04.01-Exercise-LaunchNewActivity/app/build.gradle index c1b44e9180..b2e11608d7 100755 --- a/S04.01-Exercise-LaunchNewActivity/app/build.gradle +++ b/S04.01-Exercise-LaunchNewActivity/app/build.gradle @@ -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" @@ -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' - compile 'com.android.support:recyclerview-v7:25.0.1' + implementation 'com.android.support:recyclerview-v7:28.0.0' - // 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' } diff --git a/S04.01-Exercise-LaunchNewActivity/build.gradle b/S04.01-Exercise-LaunchNewActivity/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S04.01-Exercise-LaunchNewActivity/build.gradle +++ b/S04.01-Exercise-LaunchNewActivity/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S04.01-Exercise-LaunchNewActivity/gradle/wrapper/gradle-wrapper.properties b/S04.01-Exercise-LaunchNewActivity/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S04.01-Exercise-LaunchNewActivity/gradle/wrapper/gradle-wrapper.properties +++ b/S04.01-Exercise-LaunchNewActivity/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S04.01-Solution-LaunchNewActivity/app/build.gradle b/S04.01-Solution-LaunchNewActivity/app/build.gradle index c1b44e9180..b2e11608d7 100755 --- a/S04.01-Solution-LaunchNewActivity/app/build.gradle +++ b/S04.01-Solution-LaunchNewActivity/app/build.gradle @@ -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" @@ -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' - compile 'com.android.support:recyclerview-v7:25.0.1' + implementation 'com.android.support:recyclerview-v7:28.0.0' - // 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' } diff --git a/S04.01-Solution-LaunchNewActivity/build.gradle b/S04.01-Solution-LaunchNewActivity/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S04.01-Solution-LaunchNewActivity/build.gradle +++ b/S04.01-Solution-LaunchNewActivity/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S04.01-Solution-LaunchNewActivity/gradle/wrapper/gradle-wrapper.properties b/S04.01-Solution-LaunchNewActivity/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S04.01-Solution-LaunchNewActivity/gradle/wrapper/gradle-wrapper.properties +++ b/S04.01-Solution-LaunchNewActivity/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S04.02-Exercise-DisplayDayForecast/app/build.gradle b/S04.02-Exercise-DisplayDayForecast/app/build.gradle index c1b44e9180..b2e11608d7 100755 --- a/S04.02-Exercise-DisplayDayForecast/app/build.gradle +++ b/S04.02-Exercise-DisplayDayForecast/app/build.gradle @@ -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" @@ -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' - compile 'com.android.support:recyclerview-v7:25.0.1' + implementation 'com.android.support:recyclerview-v7:28.0.0' - // 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' } diff --git a/S04.02-Exercise-DisplayDayForecast/build.gradle b/S04.02-Exercise-DisplayDayForecast/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S04.02-Exercise-DisplayDayForecast/build.gradle +++ b/S04.02-Exercise-DisplayDayForecast/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S04.02-Exercise-DisplayDayForecast/gradle/wrapper/gradle-wrapper.properties b/S04.02-Exercise-DisplayDayForecast/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S04.02-Exercise-DisplayDayForecast/gradle/wrapper/gradle-wrapper.properties +++ b/S04.02-Exercise-DisplayDayForecast/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S04.02-Solution-DisplayDayForecast/app/build.gradle b/S04.02-Solution-DisplayDayForecast/app/build.gradle index c1b44e9180..b2e11608d7 100755 --- a/S04.02-Solution-DisplayDayForecast/app/build.gradle +++ b/S04.02-Solution-DisplayDayForecast/app/build.gradle @@ -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" @@ -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' - compile 'com.android.support:recyclerview-v7:25.0.1' + implementation 'com.android.support:recyclerview-v7:28.0.0' - // 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' } diff --git a/S04.02-Solution-DisplayDayForecast/build.gradle b/S04.02-Solution-DisplayDayForecast/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S04.02-Solution-DisplayDayForecast/build.gradle +++ b/S04.02-Solution-DisplayDayForecast/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S04.02-Solution-DisplayDayForecast/gradle/wrapper/gradle-wrapper.properties b/S04.02-Solution-DisplayDayForecast/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S04.02-Solution-DisplayDayForecast/gradle/wrapper/gradle-wrapper.properties +++ b/S04.02-Solution-DisplayDayForecast/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S04.03-Exercise-AddMapAndSharing/app/build.gradle b/S04.03-Exercise-AddMapAndSharing/app/build.gradle index c1b44e9180..b2e11608d7 100755 --- a/S04.03-Exercise-AddMapAndSharing/app/build.gradle +++ b/S04.03-Exercise-AddMapAndSharing/app/build.gradle @@ -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" @@ -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' - compile 'com.android.support:recyclerview-v7:25.0.1' + implementation 'com.android.support:recyclerview-v7:28.0.0' - // 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' } diff --git a/S04.03-Exercise-AddMapAndSharing/build.gradle b/S04.03-Exercise-AddMapAndSharing/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S04.03-Exercise-AddMapAndSharing/build.gradle +++ b/S04.03-Exercise-AddMapAndSharing/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S04.03-Exercise-AddMapAndSharing/gradle/wrapper/gradle-wrapper.properties b/S04.03-Exercise-AddMapAndSharing/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S04.03-Exercise-AddMapAndSharing/gradle/wrapper/gradle-wrapper.properties +++ b/S04.03-Exercise-AddMapAndSharing/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S04.03-Solution-AddMapAndSharing/app/build.gradle b/S04.03-Solution-AddMapAndSharing/app/build.gradle index c1b44e9180..b2e11608d7 100755 --- a/S04.03-Solution-AddMapAndSharing/app/build.gradle +++ b/S04.03-Solution-AddMapAndSharing/app/build.gradle @@ -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" @@ -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' - compile 'com.android.support:recyclerview-v7:25.0.1' + implementation 'com.android.support:recyclerview-v7:28.0.0' - // 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' } diff --git a/S04.03-Solution-AddMapAndSharing/build.gradle b/S04.03-Solution-AddMapAndSharing/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S04.03-Solution-AddMapAndSharing/build.gradle +++ b/S04.03-Solution-AddMapAndSharing/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S04.03-Solution-AddMapAndSharing/gradle/wrapper/gradle-wrapper.properties b/S04.03-Solution-AddMapAndSharing/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S04.03-Solution-AddMapAndSharing/gradle/wrapper/gradle-wrapper.properties +++ b/S04.03-Solution-AddMapAndSharing/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S05.01-Exercise-AsyncTaskLoader/app/build.gradle b/S05.01-Exercise-AsyncTaskLoader/app/build.gradle index c1b44e9180..b2e11608d7 100755 --- a/S05.01-Exercise-AsyncTaskLoader/app/build.gradle +++ b/S05.01-Exercise-AsyncTaskLoader/app/build.gradle @@ -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" @@ -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' - compile 'com.android.support:recyclerview-v7:25.0.1' + implementation 'com.android.support:recyclerview-v7:28.0.0' - // 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' } diff --git a/S05.01-Exercise-AsyncTaskLoader/build.gradle b/S05.01-Exercise-AsyncTaskLoader/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S05.01-Exercise-AsyncTaskLoader/build.gradle +++ b/S05.01-Exercise-AsyncTaskLoader/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S05.01-Exercise-AsyncTaskLoader/gradle/wrapper/gradle-wrapper.properties b/S05.01-Exercise-AsyncTaskLoader/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S05.01-Exercise-AsyncTaskLoader/gradle/wrapper/gradle-wrapper.properties +++ b/S05.01-Exercise-AsyncTaskLoader/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S05.01-Solution-AsyncTaskLoader/app/build.gradle b/S05.01-Solution-AsyncTaskLoader/app/build.gradle index c1b44e9180..b2e11608d7 100755 --- a/S05.01-Solution-AsyncTaskLoader/app/build.gradle +++ b/S05.01-Solution-AsyncTaskLoader/app/build.gradle @@ -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" @@ -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' - compile 'com.android.support:recyclerview-v7:25.0.1' + implementation 'com.android.support:recyclerview-v7:28.0.0' - // 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' } diff --git a/S05.01-Solution-AsyncTaskLoader/build.gradle b/S05.01-Solution-AsyncTaskLoader/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S05.01-Solution-AsyncTaskLoader/build.gradle +++ b/S05.01-Solution-AsyncTaskLoader/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S05.01-Solution-AsyncTaskLoader/gradle/wrapper/gradle-wrapper.properties b/S05.01-Solution-AsyncTaskLoader/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S05.01-Solution-AsyncTaskLoader/gradle/wrapper/gradle-wrapper.properties +++ b/S05.01-Solution-AsyncTaskLoader/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S06.01-Exercise-LaunchSettingsActivity/app/build.gradle b/S06.01-Exercise-LaunchSettingsActivity/app/build.gradle index c1b44e9180..b2e11608d7 100755 --- a/S06.01-Exercise-LaunchSettingsActivity/app/build.gradle +++ b/S06.01-Exercise-LaunchSettingsActivity/app/build.gradle @@ -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" @@ -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' - compile 'com.android.support:recyclerview-v7:25.0.1' + implementation 'com.android.support:recyclerview-v7:28.0.0' - // 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' } diff --git a/S06.01-Exercise-LaunchSettingsActivity/build.gradle b/S06.01-Exercise-LaunchSettingsActivity/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S06.01-Exercise-LaunchSettingsActivity/build.gradle +++ b/S06.01-Exercise-LaunchSettingsActivity/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S06.01-Exercise-LaunchSettingsActivity/gradle/wrapper/gradle-wrapper.properties b/S06.01-Exercise-LaunchSettingsActivity/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S06.01-Exercise-LaunchSettingsActivity/gradle/wrapper/gradle-wrapper.properties +++ b/S06.01-Exercise-LaunchSettingsActivity/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S06.01-Solution-LaunchSettingsActivity/app/build.gradle b/S06.01-Solution-LaunchSettingsActivity/app/build.gradle index c1b44e9180..b2e11608d7 100755 --- a/S06.01-Solution-LaunchSettingsActivity/app/build.gradle +++ b/S06.01-Solution-LaunchSettingsActivity/app/build.gradle @@ -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" @@ -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' - compile 'com.android.support:recyclerview-v7:25.0.1' + implementation 'com.android.support:recyclerview-v7:28.0.0' - // 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' } diff --git a/S06.01-Solution-LaunchSettingsActivity/build.gradle b/S06.01-Solution-LaunchSettingsActivity/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S06.01-Solution-LaunchSettingsActivity/build.gradle +++ b/S06.01-Solution-LaunchSettingsActivity/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S06.01-Solution-LaunchSettingsActivity/gradle/wrapper/gradle-wrapper.properties b/S06.01-Solution-LaunchSettingsActivity/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S06.01-Solution-LaunchSettingsActivity/gradle/wrapper/gradle-wrapper.properties +++ b/S06.01-Solution-LaunchSettingsActivity/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S06.02-Exercise-SettingsFragment/app/build.gradle b/S06.02-Exercise-SettingsFragment/app/build.gradle index f3964be419..0330c15940 100755 --- a/S06.02-Exercise-SettingsFragment/app/build.gradle +++ b/S06.02-Exercise-SettingsFragment/app/build.gradle @@ -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" @@ -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' - compile 'com.android.support:recyclerview-v7:25.0.1' + implementation 'com.android.support:recyclerview-v7:28.0.0' // TODO (1) Add preferences dependency to gradle - // 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' } diff --git a/S06.02-Exercise-SettingsFragment/build.gradle b/S06.02-Exercise-SettingsFragment/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S06.02-Exercise-SettingsFragment/build.gradle +++ b/S06.02-Exercise-SettingsFragment/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S06.02-Exercise-SettingsFragment/gradle/wrapper/gradle-wrapper.properties b/S06.02-Exercise-SettingsFragment/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S06.02-Exercise-SettingsFragment/gradle/wrapper/gradle-wrapper.properties +++ b/S06.02-Exercise-SettingsFragment/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S06.02-Solution-SettingsFragment/app/build.gradle b/S06.02-Solution-SettingsFragment/app/build.gradle index d73559b961..43294cdc23 100755 --- a/S06.02-Solution-SettingsFragment/app/build.gradle +++ b/S06.02-Solution-SettingsFragment/app/build.gradle @@ -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" @@ -20,17 +19,17 @@ 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' - compile 'com.android.support:recyclerview-v7:25.0.1' + implementation 'com.android.support:recyclerview-v7:28.0.0' // COMPLETED (1) Add preferences dependency to gradle - compile 'com.android.support:preference-v7:25.0.1' + implementation 'com.android.support:preference-v7:28.0.0' - // 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' } diff --git a/S06.02-Solution-SettingsFragment/build.gradle b/S06.02-Solution-SettingsFragment/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S06.02-Solution-SettingsFragment/build.gradle +++ b/S06.02-Solution-SettingsFragment/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S06.02-Solution-SettingsFragment/gradle/wrapper/gradle-wrapper.properties b/S06.02-Solution-SettingsFragment/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S06.02-Solution-SettingsFragment/gradle/wrapper/gradle-wrapper.properties +++ b/S06.02-Solution-SettingsFragment/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S06.03-Exercise-PolishingPreferences/app/build.gradle b/S06.03-Exercise-PolishingPreferences/app/build.gradle index 8ec5d5ec75..dd389cb343 100755 --- a/S06.03-Exercise-PolishingPreferences/app/build.gradle +++ b/S06.03-Exercise-PolishingPreferences/app/build.gradle @@ -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" @@ -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' - compile 'com.android.support:recyclerview-v7:25.0.1' - compile 'com.android.support:preference-v7:25.0.1' + implementation 'com.android.support:recyclerview-v7:28.0.0' + implementation 'com.android.support:preference-v7:28.0.0' - // 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' } diff --git a/S06.03-Exercise-PolishingPreferences/build.gradle b/S06.03-Exercise-PolishingPreferences/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S06.03-Exercise-PolishingPreferences/build.gradle +++ b/S06.03-Exercise-PolishingPreferences/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S06.03-Exercise-PolishingPreferences/gradle/wrapper/gradle-wrapper.properties b/S06.03-Exercise-PolishingPreferences/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S06.03-Exercise-PolishingPreferences/gradle/wrapper/gradle-wrapper.properties +++ b/S06.03-Exercise-PolishingPreferences/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S06.03-Solution-PolishingPreferences/app/build.gradle b/S06.03-Solution-PolishingPreferences/app/build.gradle index 8ec5d5ec75..dd389cb343 100755 --- a/S06.03-Solution-PolishingPreferences/app/build.gradle +++ b/S06.03-Solution-PolishingPreferences/app/build.gradle @@ -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" @@ -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' - compile 'com.android.support:recyclerview-v7:25.0.1' - compile 'com.android.support:preference-v7:25.0.1' + implementation 'com.android.support:recyclerview-v7:28.0.0' + implementation 'com.android.support:preference-v7:28.0.0' - // 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' } diff --git a/S06.03-Solution-PolishingPreferences/build.gradle b/S06.03-Solution-PolishingPreferences/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S06.03-Solution-PolishingPreferences/build.gradle +++ b/S06.03-Solution-PolishingPreferences/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S06.03-Solution-PolishingPreferences/gradle/wrapper/gradle-wrapper.properties b/S06.03-Solution-PolishingPreferences/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S06.03-Solution-PolishingPreferences/gradle/wrapper/gradle-wrapper.properties +++ b/S06.03-Solution-PolishingPreferences/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S07.01-Exercise-DatabaseCreation/app/build.gradle b/S07.01-Exercise-DatabaseCreation/app/build.gradle index 8ec5d5ec75..dd389cb343 100755 --- a/S07.01-Exercise-DatabaseCreation/app/build.gradle +++ b/S07.01-Exercise-DatabaseCreation/app/build.gradle @@ -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" @@ -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' - compile 'com.android.support:recyclerview-v7:25.0.1' - compile 'com.android.support:preference-v7:25.0.1' + implementation 'com.android.support:recyclerview-v7:28.0.0' + implementation 'com.android.support:preference-v7:28.0.0' - // 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' } diff --git a/S07.01-Exercise-DatabaseCreation/build.gradle b/S07.01-Exercise-DatabaseCreation/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S07.01-Exercise-DatabaseCreation/build.gradle +++ b/S07.01-Exercise-DatabaseCreation/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S07.01-Exercise-DatabaseCreation/gradle/wrapper/gradle-wrapper.properties b/S07.01-Exercise-DatabaseCreation/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S07.01-Exercise-DatabaseCreation/gradle/wrapper/gradle-wrapper.properties +++ b/S07.01-Exercise-DatabaseCreation/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S07.01-Solution-DatabaseCreation/app/build.gradle b/S07.01-Solution-DatabaseCreation/app/build.gradle index 8ec5d5ec75..dd389cb343 100755 --- a/S07.01-Solution-DatabaseCreation/app/build.gradle +++ b/S07.01-Solution-DatabaseCreation/app/build.gradle @@ -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" @@ -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' - compile 'com.android.support:recyclerview-v7:25.0.1' - compile 'com.android.support:preference-v7:25.0.1' + implementation 'com.android.support:recyclerview-v7:28.0.0' + implementation 'com.android.support:preference-v7:28.0.0' - // 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' } diff --git a/S07.01-Solution-DatabaseCreation/build.gradle b/S07.01-Solution-DatabaseCreation/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S07.01-Solution-DatabaseCreation/build.gradle +++ b/S07.01-Solution-DatabaseCreation/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S07.01-Solution-DatabaseCreation/gradle/wrapper/gradle-wrapper.properties b/S07.01-Solution-DatabaseCreation/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S07.01-Solution-DatabaseCreation/gradle/wrapper/gradle-wrapper.properties +++ b/S07.01-Solution-DatabaseCreation/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S07.02-Exercise-PreventInvalidInserts/app/build.gradle b/S07.02-Exercise-PreventInvalidInserts/app/build.gradle index 8ec5d5ec75..dd389cb343 100755 --- a/S07.02-Exercise-PreventInvalidInserts/app/build.gradle +++ b/S07.02-Exercise-PreventInvalidInserts/app/build.gradle @@ -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" @@ -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' - compile 'com.android.support:recyclerview-v7:25.0.1' - compile 'com.android.support:preference-v7:25.0.1' + implementation 'com.android.support:recyclerview-v7:28.0.0' + implementation 'com.android.support:preference-v7:28.0.0' - // 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' } diff --git a/S07.02-Exercise-PreventInvalidInserts/build.gradle b/S07.02-Exercise-PreventInvalidInserts/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S07.02-Exercise-PreventInvalidInserts/build.gradle +++ b/S07.02-Exercise-PreventInvalidInserts/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S07.02-Exercise-PreventInvalidInserts/gradle/wrapper/gradle-wrapper.properties b/S07.02-Exercise-PreventInvalidInserts/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S07.02-Exercise-PreventInvalidInserts/gradle/wrapper/gradle-wrapper.properties +++ b/S07.02-Exercise-PreventInvalidInserts/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S07.02-Solution-PreventInvalidInserts/app/build.gradle b/S07.02-Solution-PreventInvalidInserts/app/build.gradle index 8ec5d5ec75..dd389cb343 100755 --- a/S07.02-Solution-PreventInvalidInserts/app/build.gradle +++ b/S07.02-Solution-PreventInvalidInserts/app/build.gradle @@ -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" @@ -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' - compile 'com.android.support:recyclerview-v7:25.0.1' - compile 'com.android.support:preference-v7:25.0.1' + implementation 'com.android.support:recyclerview-v7:28.0.0' + implementation 'com.android.support:preference-v7:28.0.0' - // 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' } diff --git a/S07.02-Solution-PreventInvalidInserts/build.gradle b/S07.02-Solution-PreventInvalidInserts/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S07.02-Solution-PreventInvalidInserts/build.gradle +++ b/S07.02-Solution-PreventInvalidInserts/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S07.02-Solution-PreventInvalidInserts/gradle/wrapper/gradle-wrapper.properties b/S07.02-Solution-PreventInvalidInserts/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S07.02-Solution-PreventInvalidInserts/gradle/wrapper/gradle-wrapper.properties +++ b/S07.02-Solution-PreventInvalidInserts/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S07.03-Exercise-ConflictResolutionPolicy/app/build.gradle b/S07.03-Exercise-ConflictResolutionPolicy/app/build.gradle index 8ec5d5ec75..dd389cb343 100755 --- a/S07.03-Exercise-ConflictResolutionPolicy/app/build.gradle +++ b/S07.03-Exercise-ConflictResolutionPolicy/app/build.gradle @@ -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" @@ -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' - compile 'com.android.support:recyclerview-v7:25.0.1' - compile 'com.android.support:preference-v7:25.0.1' + implementation 'com.android.support:recyclerview-v7:28.0.0' + implementation 'com.android.support:preference-v7:28.0.0' - // 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' } diff --git a/S07.03-Exercise-ConflictResolutionPolicy/build.gradle b/S07.03-Exercise-ConflictResolutionPolicy/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S07.03-Exercise-ConflictResolutionPolicy/build.gradle +++ b/S07.03-Exercise-ConflictResolutionPolicy/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S07.03-Exercise-ConflictResolutionPolicy/gradle/wrapper/gradle-wrapper.properties b/S07.03-Exercise-ConflictResolutionPolicy/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S07.03-Exercise-ConflictResolutionPolicy/gradle/wrapper/gradle-wrapper.properties +++ b/S07.03-Exercise-ConflictResolutionPolicy/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S07.03-Solution-ConflictResolutionPolicy/app/build.gradle b/S07.03-Solution-ConflictResolutionPolicy/app/build.gradle index 8ec5d5ec75..dd389cb343 100755 --- a/S07.03-Solution-ConflictResolutionPolicy/app/build.gradle +++ b/S07.03-Solution-ConflictResolutionPolicy/app/build.gradle @@ -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" @@ -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' - compile 'com.android.support:recyclerview-v7:25.0.1' - compile 'com.android.support:preference-v7:25.0.1' + implementation 'com.android.support:recyclerview-v7:28.0.0' + implementation 'com.android.support:preference-v7:28.0.0' - // 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' } diff --git a/S07.03-Solution-ConflictResolutionPolicy/build.gradle b/S07.03-Solution-ConflictResolutionPolicy/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S07.03-Solution-ConflictResolutionPolicy/build.gradle +++ b/S07.03-Solution-ConflictResolutionPolicy/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S07.03-Solution-ConflictResolutionPolicy/gradle/wrapper/gradle-wrapper.properties b/S07.03-Solution-ConflictResolutionPolicy/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S07.03-Solution-ConflictResolutionPolicy/gradle/wrapper/gradle-wrapper.properties +++ b/S07.03-Solution-ConflictResolutionPolicy/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S09.01-Exercise-ContentProviderFoundation/app/build.gradle b/S09.01-Exercise-ContentProviderFoundation/app/build.gradle index bec906cf49..dd389cb343 100755 --- a/S09.01-Exercise-ContentProviderFoundation/app/build.gradle +++ b/S09.01-Exercise-ContentProviderFoundation/app/build.gradle @@ -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" @@ -17,20 +16,19 @@ android { minifyEnabled false } } - productFlavors { - } } 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' + + implementation 'com.android.support:recyclerview-v7:28.0.0' + implementation 'com.android.support:preference-v7:28.0.0' - compile 'com.android.support:recyclerview-v7:25.0.1' - compile 'com.android.support:preference-v7:25.0.1' - // 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' } diff --git a/S09.01-Exercise-ContentProviderFoundation/build.gradle b/S09.01-Exercise-ContentProviderFoundation/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S09.01-Exercise-ContentProviderFoundation/build.gradle +++ b/S09.01-Exercise-ContentProviderFoundation/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S09.01-Exercise-ContentProviderFoundation/gradle/wrapper/gradle-wrapper.properties b/S09.01-Exercise-ContentProviderFoundation/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S09.01-Exercise-ContentProviderFoundation/gradle/wrapper/gradle-wrapper.properties +++ b/S09.01-Exercise-ContentProviderFoundation/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S09.01-Solution-ContentProviderFoundation/app/build.gradle b/S09.01-Solution-ContentProviderFoundation/app/build.gradle index bec906cf49..dd389cb343 100755 --- a/S09.01-Solution-ContentProviderFoundation/app/build.gradle +++ b/S09.01-Solution-ContentProviderFoundation/app/build.gradle @@ -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" @@ -17,20 +16,19 @@ android { minifyEnabled false } } - productFlavors { - } } 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' + + implementation 'com.android.support:recyclerview-v7:28.0.0' + implementation 'com.android.support:preference-v7:28.0.0' - compile 'com.android.support:recyclerview-v7:25.0.1' - compile 'com.android.support:preference-v7:25.0.1' - // 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' } diff --git a/S09.01-Solution-ContentProviderFoundation/build.gradle b/S09.01-Solution-ContentProviderFoundation/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S09.01-Solution-ContentProviderFoundation/build.gradle +++ b/S09.01-Solution-ContentProviderFoundation/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S09.01-Solution-ContentProviderFoundation/gradle/wrapper/gradle-wrapper.properties b/S09.01-Solution-ContentProviderFoundation/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S09.01-Solution-ContentProviderFoundation/gradle/wrapper/gradle-wrapper.properties +++ b/S09.01-Solution-ContentProviderFoundation/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S09.02-Exercise-ContentProviderBulkInsert/app/build.gradle b/S09.02-Exercise-ContentProviderBulkInsert/app/build.gradle index bec906cf49..dd389cb343 100755 --- a/S09.02-Exercise-ContentProviderBulkInsert/app/build.gradle +++ b/S09.02-Exercise-ContentProviderBulkInsert/app/build.gradle @@ -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" @@ -17,20 +16,19 @@ android { minifyEnabled false } } - productFlavors { - } } 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' + + implementation 'com.android.support:recyclerview-v7:28.0.0' + implementation 'com.android.support:preference-v7:28.0.0' - compile 'com.android.support:recyclerview-v7:25.0.1' - compile 'com.android.support:preference-v7:25.0.1' - // 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' } diff --git a/S09.02-Exercise-ContentProviderBulkInsert/build.gradle b/S09.02-Exercise-ContentProviderBulkInsert/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S09.02-Exercise-ContentProviderBulkInsert/build.gradle +++ b/S09.02-Exercise-ContentProviderBulkInsert/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S09.02-Exercise-ContentProviderBulkInsert/gradle/wrapper/gradle-wrapper.properties b/S09.02-Exercise-ContentProviderBulkInsert/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S09.02-Exercise-ContentProviderBulkInsert/gradle/wrapper/gradle-wrapper.properties +++ b/S09.02-Exercise-ContentProviderBulkInsert/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S09.02-Solution-ContentProviderBulkInsert/app/build.gradle b/S09.02-Solution-ContentProviderBulkInsert/app/build.gradle index bec906cf49..dd389cb343 100755 --- a/S09.02-Solution-ContentProviderBulkInsert/app/build.gradle +++ b/S09.02-Solution-ContentProviderBulkInsert/app/build.gradle @@ -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" @@ -17,20 +16,19 @@ android { minifyEnabled false } } - productFlavors { - } } 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' + + implementation 'com.android.support:recyclerview-v7:28.0.0' + implementation 'com.android.support:preference-v7:28.0.0' - compile 'com.android.support:recyclerview-v7:25.0.1' - compile 'com.android.support:preference-v7:25.0.1' - // 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' } diff --git a/S09.02-Solution-ContentProviderBulkInsert/build.gradle b/S09.02-Solution-ContentProviderBulkInsert/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S09.02-Solution-ContentProviderBulkInsert/build.gradle +++ b/S09.02-Solution-ContentProviderBulkInsert/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S09.02-Solution-ContentProviderBulkInsert/gradle/wrapper/gradle-wrapper.properties b/S09.02-Solution-ContentProviderBulkInsert/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S09.02-Solution-ContentProviderBulkInsert/gradle/wrapper/gradle-wrapper.properties +++ b/S09.02-Solution-ContentProviderBulkInsert/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S09.03-Exercise-ContentProviderDelete/app/build.gradle b/S09.03-Exercise-ContentProviderDelete/app/build.gradle index bec906cf49..dd389cb343 100755 --- a/S09.03-Exercise-ContentProviderDelete/app/build.gradle +++ b/S09.03-Exercise-ContentProviderDelete/app/build.gradle @@ -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" @@ -17,20 +16,19 @@ android { minifyEnabled false } } - productFlavors { - } } 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' + + implementation 'com.android.support:recyclerview-v7:28.0.0' + implementation 'com.android.support:preference-v7:28.0.0' - compile 'com.android.support:recyclerview-v7:25.0.1' - compile 'com.android.support:preference-v7:25.0.1' - // 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' } diff --git a/S09.03-Exercise-ContentProviderDelete/build.gradle b/S09.03-Exercise-ContentProviderDelete/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S09.03-Exercise-ContentProviderDelete/build.gradle +++ b/S09.03-Exercise-ContentProviderDelete/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S09.03-Exercise-ContentProviderDelete/gradle/wrapper/gradle-wrapper.properties b/S09.03-Exercise-ContentProviderDelete/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S09.03-Exercise-ContentProviderDelete/gradle/wrapper/gradle-wrapper.properties +++ b/S09.03-Exercise-ContentProviderDelete/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S09.03-Solution-ContentProviderDelete/app/build.gradle b/S09.03-Solution-ContentProviderDelete/app/build.gradle index bec906cf49..dd389cb343 100755 --- a/S09.03-Solution-ContentProviderDelete/app/build.gradle +++ b/S09.03-Solution-ContentProviderDelete/app/build.gradle @@ -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" @@ -17,20 +16,19 @@ android { minifyEnabled false } } - productFlavors { - } } 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' + + implementation 'com.android.support:recyclerview-v7:28.0.0' + implementation 'com.android.support:preference-v7:28.0.0' - compile 'com.android.support:recyclerview-v7:25.0.1' - compile 'com.android.support:preference-v7:25.0.1' - // 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' } diff --git a/S09.03-Solution-ContentProviderDelete/build.gradle b/S09.03-Solution-ContentProviderDelete/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S09.03-Solution-ContentProviderDelete/build.gradle +++ b/S09.03-Solution-ContentProviderDelete/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S09.03-Solution-ContentProviderDelete/gradle/wrapper/gradle-wrapper.properties b/S09.03-Solution-ContentProviderDelete/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S09.03-Solution-ContentProviderDelete/gradle/wrapper/gradle-wrapper.properties +++ b/S09.03-Solution-ContentProviderDelete/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S09.04-Exercise-UsingCursorLoader/app/build.gradle b/S09.04-Exercise-UsingCursorLoader/app/build.gradle index bec906cf49..dd389cb343 100755 --- a/S09.04-Exercise-UsingCursorLoader/app/build.gradle +++ b/S09.04-Exercise-UsingCursorLoader/app/build.gradle @@ -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" @@ -17,20 +16,19 @@ android { minifyEnabled false } } - productFlavors { - } } 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' + + implementation 'com.android.support:recyclerview-v7:28.0.0' + implementation 'com.android.support:preference-v7:28.0.0' - compile 'com.android.support:recyclerview-v7:25.0.1' - compile 'com.android.support:preference-v7:25.0.1' - // 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' } diff --git a/S09.04-Exercise-UsingCursorLoader/build.gradle b/S09.04-Exercise-UsingCursorLoader/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S09.04-Exercise-UsingCursorLoader/build.gradle +++ b/S09.04-Exercise-UsingCursorLoader/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S09.04-Exercise-UsingCursorLoader/gradle/wrapper/gradle-wrapper.properties b/S09.04-Exercise-UsingCursorLoader/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S09.04-Exercise-UsingCursorLoader/gradle/wrapper/gradle-wrapper.properties +++ b/S09.04-Exercise-UsingCursorLoader/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S09.04-Solution-UsingCursorLoader/app/build.gradle b/S09.04-Solution-UsingCursorLoader/app/build.gradle index bec906cf49..dd389cb343 100755 --- a/S09.04-Solution-UsingCursorLoader/app/build.gradle +++ b/S09.04-Solution-UsingCursorLoader/app/build.gradle @@ -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" @@ -17,20 +16,19 @@ android { minifyEnabled false } } - productFlavors { - } } 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' + + implementation 'com.android.support:recyclerview-v7:28.0.0' + implementation 'com.android.support:preference-v7:28.0.0' - compile 'com.android.support:recyclerview-v7:25.0.1' - compile 'com.android.support:preference-v7:25.0.1' - // 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' } diff --git a/S09.04-Solution-UsingCursorLoader/build.gradle b/S09.04-Solution-UsingCursorLoader/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S09.04-Solution-UsingCursorLoader/build.gradle +++ b/S09.04-Solution-UsingCursorLoader/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S09.04-Solution-UsingCursorLoader/gradle/wrapper/gradle-wrapper.properties b/S09.04-Solution-UsingCursorLoader/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S09.04-Solution-UsingCursorLoader/gradle/wrapper/gradle-wrapper.properties +++ b/S09.04-Solution-UsingCursorLoader/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S09.05-Exercise-MoreDetails/app/build.gradle b/S09.05-Exercise-MoreDetails/app/build.gradle index bec906cf49..dd389cb343 100755 --- a/S09.05-Exercise-MoreDetails/app/build.gradle +++ b/S09.05-Exercise-MoreDetails/app/build.gradle @@ -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" @@ -17,20 +16,19 @@ android { minifyEnabled false } } - productFlavors { - } } 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' + + implementation 'com.android.support:recyclerview-v7:28.0.0' + implementation 'com.android.support:preference-v7:28.0.0' - compile 'com.android.support:recyclerview-v7:25.0.1' - compile 'com.android.support:preference-v7:25.0.1' - // 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' } diff --git a/S09.05-Exercise-MoreDetails/build.gradle b/S09.05-Exercise-MoreDetails/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S09.05-Exercise-MoreDetails/build.gradle +++ b/S09.05-Exercise-MoreDetails/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S09.05-Exercise-MoreDetails/gradle/wrapper/gradle-wrapper.properties b/S09.05-Exercise-MoreDetails/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S09.05-Exercise-MoreDetails/gradle/wrapper/gradle-wrapper.properties +++ b/S09.05-Exercise-MoreDetails/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S09.05-Solution-MoreDetails/app/build.gradle b/S09.05-Solution-MoreDetails/app/build.gradle index bec906cf49..dd389cb343 100755 --- a/S09.05-Solution-MoreDetails/app/build.gradle +++ b/S09.05-Solution-MoreDetails/app/build.gradle @@ -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" @@ -17,20 +16,19 @@ android { minifyEnabled false } } - productFlavors { - } } 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' + + implementation 'com.android.support:recyclerview-v7:28.0.0' + implementation 'com.android.support:preference-v7:28.0.0' - compile 'com.android.support:recyclerview-v7:25.0.1' - compile 'com.android.support:preference-v7:25.0.1' - // 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' } diff --git a/S09.05-Solution-MoreDetails/build.gradle b/S09.05-Solution-MoreDetails/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S09.05-Solution-MoreDetails/build.gradle +++ b/S09.05-Solution-MoreDetails/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S09.05-Solution-MoreDetails/gradle/wrapper/gradle-wrapper.properties b/S09.05-Solution-MoreDetails/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S09.05-Solution-MoreDetails/gradle/wrapper/gradle-wrapper.properties +++ b/S09.05-Solution-MoreDetails/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S10.01-Exercise-SynchronizingTheWeather/app/build.gradle b/S10.01-Exercise-SynchronizingTheWeather/app/build.gradle index bec906cf49..dd389cb343 100755 --- a/S10.01-Exercise-SynchronizingTheWeather/app/build.gradle +++ b/S10.01-Exercise-SynchronizingTheWeather/app/build.gradle @@ -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" @@ -17,20 +16,19 @@ android { minifyEnabled false } } - productFlavors { - } } 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' + + implementation 'com.android.support:recyclerview-v7:28.0.0' + implementation 'com.android.support:preference-v7:28.0.0' - compile 'com.android.support:recyclerview-v7:25.0.1' - compile 'com.android.support:preference-v7:25.0.1' - // 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' } diff --git a/S10.01-Exercise-SynchronizingTheWeather/build.gradle b/S10.01-Exercise-SynchronizingTheWeather/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S10.01-Exercise-SynchronizingTheWeather/build.gradle +++ b/S10.01-Exercise-SynchronizingTheWeather/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S10.01-Exercise-SynchronizingTheWeather/gradle/wrapper/gradle-wrapper.properties b/S10.01-Exercise-SynchronizingTheWeather/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S10.01-Exercise-SynchronizingTheWeather/gradle/wrapper/gradle-wrapper.properties +++ b/S10.01-Exercise-SynchronizingTheWeather/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S10.01-Solution-SynchronizingTheWeather/app/build.gradle b/S10.01-Solution-SynchronizingTheWeather/app/build.gradle index bec906cf49..dd389cb343 100755 --- a/S10.01-Solution-SynchronizingTheWeather/app/build.gradle +++ b/S10.01-Solution-SynchronizingTheWeather/app/build.gradle @@ -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" @@ -17,20 +16,19 @@ android { minifyEnabled false } } - productFlavors { - } } 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' + + implementation 'com.android.support:recyclerview-v7:28.0.0' + implementation 'com.android.support:preference-v7:28.0.0' - compile 'com.android.support:recyclerview-v7:25.0.1' - compile 'com.android.support:preference-v7:25.0.1' - // 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' } diff --git a/S10.01-Solution-SynchronizingTheWeather/build.gradle b/S10.01-Solution-SynchronizingTheWeather/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S10.01-Solution-SynchronizingTheWeather/build.gradle +++ b/S10.01-Solution-SynchronizingTheWeather/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S10.01-Solution-SynchronizingTheWeather/gradle/wrapper/gradle-wrapper.properties b/S10.01-Solution-SynchronizingTheWeather/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S10.01-Solution-SynchronizingTheWeather/gradle/wrapper/gradle-wrapper.properties +++ b/S10.01-Solution-SynchronizingTheWeather/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S10.02-Exercise-SmarterSyncing/app/build.gradle b/S10.02-Exercise-SmarterSyncing/app/build.gradle index bec906cf49..dd389cb343 100755 --- a/S10.02-Exercise-SmarterSyncing/app/build.gradle +++ b/S10.02-Exercise-SmarterSyncing/app/build.gradle @@ -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" @@ -17,20 +16,19 @@ android { minifyEnabled false } } - productFlavors { - } } 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' + + implementation 'com.android.support:recyclerview-v7:28.0.0' + implementation 'com.android.support:preference-v7:28.0.0' - compile 'com.android.support:recyclerview-v7:25.0.1' - compile 'com.android.support:preference-v7:25.0.1' - // 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' } diff --git a/S10.02-Exercise-SmarterSyncing/build.gradle b/S10.02-Exercise-SmarterSyncing/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S10.02-Exercise-SmarterSyncing/build.gradle +++ b/S10.02-Exercise-SmarterSyncing/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S10.02-Exercise-SmarterSyncing/gradle/wrapper/gradle-wrapper.properties b/S10.02-Exercise-SmarterSyncing/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S10.02-Exercise-SmarterSyncing/gradle/wrapper/gradle-wrapper.properties +++ b/S10.02-Exercise-SmarterSyncing/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S10.02-Solution-SmarterSyncing/app/build.gradle b/S10.02-Solution-SmarterSyncing/app/build.gradle index bec906cf49..dd389cb343 100755 --- a/S10.02-Solution-SmarterSyncing/app/build.gradle +++ b/S10.02-Solution-SmarterSyncing/app/build.gradle @@ -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" @@ -17,20 +16,19 @@ android { minifyEnabled false } } - productFlavors { - } } 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' + + implementation 'com.android.support:recyclerview-v7:28.0.0' + implementation 'com.android.support:preference-v7:28.0.0' - compile 'com.android.support:recyclerview-v7:25.0.1' - compile 'com.android.support:preference-v7:25.0.1' - // 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' } diff --git a/S10.02-Solution-SmarterSyncing/build.gradle b/S10.02-Solution-SmarterSyncing/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S10.02-Solution-SmarterSyncing/build.gradle +++ b/S10.02-Solution-SmarterSyncing/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S10.02-Solution-SmarterSyncing/gradle/wrapper/gradle-wrapper.properties b/S10.02-Solution-SmarterSyncing/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S10.02-Solution-SmarterSyncing/gradle/wrapper/gradle-wrapper.properties +++ b/S10.02-Solution-SmarterSyncing/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S10.03-Exercise-FirebaseJobDispatcher/app/build.gradle b/S10.03-Exercise-FirebaseJobDispatcher/app/build.gradle index f189138691..db79396f70 100755 --- a/S10.03-Exercise-FirebaseJobDispatcher/app/build.gradle +++ b/S10.03-Exercise-FirebaseJobDispatcher/app/build.gradle @@ -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" @@ -17,23 +16,21 @@ android { minifyEnabled false } } - productFlavors { - } } 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' - compile 'com.android.support:recyclerview-v7:25.0.1' - compile 'com.android.support:preference-v7:25.0.1' + implementation 'com.android.support:recyclerview-v7:28.0.0' + implementation 'com.android.support:preference-v7:28.0.0' // TODO (1) Add the FirebaseJobDispatcher dependency to the project - // 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' } diff --git a/S10.03-Exercise-FirebaseJobDispatcher/build.gradle b/S10.03-Exercise-FirebaseJobDispatcher/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S10.03-Exercise-FirebaseJobDispatcher/build.gradle +++ b/S10.03-Exercise-FirebaseJobDispatcher/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S10.03-Exercise-FirebaseJobDispatcher/gradle/wrapper/gradle-wrapper.properties b/S10.03-Exercise-FirebaseJobDispatcher/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S10.03-Exercise-FirebaseJobDispatcher/gradle/wrapper/gradle-wrapper.properties +++ b/S10.03-Exercise-FirebaseJobDispatcher/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S10.03-Solution-FirebaseJobDispatcher/app/build.gradle b/S10.03-Solution-FirebaseJobDispatcher/app/build.gradle index cc2f4b785a..13fdfefc40 100755 --- a/S10.03-Solution-FirebaseJobDispatcher/app/build.gradle +++ b/S10.03-Solution-FirebaseJobDispatcher/app/build.gradle @@ -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" @@ -17,24 +16,22 @@ android { minifyEnabled false } } - productFlavors { - } } 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' - compile 'com.android.support:recyclerview-v7:25.0.1' - compile 'com.android.support:preference-v7:25.0.1' + implementation 'com.android.support:recyclerview-v7:28.0.0' + implementation 'com.android.support:preference-v7:28.0.0' // COMPLETED (1) Add the FirebaseJobDispatcher dependency to the project - compile 'com.firebase:firebase-jobdispatcher:0.5.0' + implementation 'com.firebase:firebase-jobdispatcher:0.8.5' - // 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' } diff --git a/S10.03-Solution-FirebaseJobDispatcher/build.gradle b/S10.03-Solution-FirebaseJobDispatcher/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S10.03-Solution-FirebaseJobDispatcher/build.gradle +++ b/S10.03-Solution-FirebaseJobDispatcher/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S10.03-Solution-FirebaseJobDispatcher/gradle/wrapper/gradle-wrapper.properties b/S10.03-Solution-FirebaseJobDispatcher/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S10.03-Solution-FirebaseJobDispatcher/gradle/wrapper/gradle-wrapper.properties +++ b/S10.03-Solution-FirebaseJobDispatcher/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S10.04-Exercise-Notifications/app/build.gradle b/S10.04-Exercise-Notifications/app/build.gradle index ba8c60d36a..6d863ba558 100755 --- a/S10.04-Exercise-Notifications/app/build.gradle +++ b/S10.04-Exercise-Notifications/app/build.gradle @@ -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" @@ -17,23 +16,21 @@ android { minifyEnabled false } } - productFlavors { - } } 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' - compile 'com.android.support:recyclerview-v7:25.0.1' - compile 'com.android.support:preference-v7:25.0.1' + implementation 'com.android.support:recyclerview-v7:28.0.0' + implementation 'com.android.support:preference-v7:28.0.0' - compile 'com.firebase:firebase-jobdispatcher:0.5.0' + implementation 'com.firebase:firebase-jobdispatcher:0.8.5' - // 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' } diff --git a/S10.04-Exercise-Notifications/build.gradle b/S10.04-Exercise-Notifications/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S10.04-Exercise-Notifications/build.gradle +++ b/S10.04-Exercise-Notifications/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S10.04-Exercise-Notifications/gradle/wrapper/gradle-wrapper.properties b/S10.04-Exercise-Notifications/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S10.04-Exercise-Notifications/gradle/wrapper/gradle-wrapper.properties +++ b/S10.04-Exercise-Notifications/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S10.04-Solution-Notifications/app/build.gradle b/S10.04-Solution-Notifications/app/build.gradle index ba8c60d36a..6d863ba558 100755 --- a/S10.04-Solution-Notifications/app/build.gradle +++ b/S10.04-Solution-Notifications/app/build.gradle @@ -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" @@ -17,23 +16,21 @@ android { minifyEnabled false } } - productFlavors { - } } 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' - compile 'com.android.support:recyclerview-v7:25.0.1' - compile 'com.android.support:preference-v7:25.0.1' + implementation 'com.android.support:recyclerview-v7:28.0.0' + implementation 'com.android.support:preference-v7:28.0.0' - compile 'com.firebase:firebase-jobdispatcher:0.5.0' + implementation 'com.firebase:firebase-jobdispatcher:0.8.5' - // 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' } diff --git a/S10.04-Solution-Notifications/build.gradle b/S10.04-Solution-Notifications/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S10.04-Solution-Notifications/build.gradle +++ b/S10.04-Solution-Notifications/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S10.04-Solution-Notifications/gradle/wrapper/gradle-wrapper.properties b/S10.04-Solution-Notifications/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S10.04-Solution-Notifications/gradle/wrapper/gradle-wrapper.properties +++ b/S10.04-Solution-Notifications/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S11.01-Exercise-NewListItemLayout/app/build.gradle b/S11.01-Exercise-NewListItemLayout/app/build.gradle index bc9edb5104..53fe0ce555 100755 --- a/S11.01-Exercise-NewListItemLayout/app/build.gradle +++ b/S11.01-Exercise-NewListItemLayout/app/build.gradle @@ -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" @@ -17,25 +16,23 @@ android { minifyEnabled false } } - productFlavors { - } } 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' - compile 'com.android.support:recyclerview-v7:25.0.1' - compile 'com.android.support:preference-v7:25.0.1' + implementation 'com.android.support:recyclerview-v7:28.0.0' + implementation 'com.android.support:preference-v7:28.0.0' -// TODO (1) Add the ConstraintLayout dependency to your project + // TODO (1) Add the ConstraintLayout dependency to your project - compile 'com.firebase:firebase-jobdispatcher:0.5.0' + implementation 'com.firebase:firebase-jobdispatcher:0.8.5' - // 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' } diff --git a/S11.01-Exercise-NewListItemLayout/build.gradle b/S11.01-Exercise-NewListItemLayout/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S11.01-Exercise-NewListItemLayout/build.gradle +++ b/S11.01-Exercise-NewListItemLayout/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S11.01-Exercise-NewListItemLayout/gradle/wrapper/gradle-wrapper.properties b/S11.01-Exercise-NewListItemLayout/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S11.01-Exercise-NewListItemLayout/gradle/wrapper/gradle-wrapper.properties +++ b/S11.01-Exercise-NewListItemLayout/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S11.01-Solution-NewListItemLayout/app/build.gradle b/S11.01-Solution-NewListItemLayout/app/build.gradle index 33f6ed9b6a..039764c99f 100755 --- a/S11.01-Solution-NewListItemLayout/app/build.gradle +++ b/S11.01-Solution-NewListItemLayout/app/build.gradle @@ -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" @@ -17,26 +16,24 @@ android { minifyEnabled false } } - productFlavors { - } } 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' - compile 'com.android.support:recyclerview-v7:25.0.1' - compile 'com.android.support:preference-v7:25.0.1' + implementation 'com.android.support:recyclerview-v7:28.0.0' + implementation 'com.android.support:preference-v7:28.0.0' -// COMPLETED (1) Add the ConstraintLayout dependency to your project - compile 'com.android.support.constraint:constraint-layout:1.0.0-beta3' + // COMPLETED (1) Add the ConstraintLayout dependency to your project + implementation 'com.android.support.constraint:constraint-layout:1.1.3' - compile 'com.firebase:firebase-jobdispatcher:0.5.0' + implementation 'com.firebase:firebase-jobdispatcher:0.8.5' - // 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' } diff --git a/S11.01-Solution-NewListItemLayout/build.gradle b/S11.01-Solution-NewListItemLayout/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S11.01-Solution-NewListItemLayout/build.gradle +++ b/S11.01-Solution-NewListItemLayout/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S11.01-Solution-NewListItemLayout/gradle/wrapper/gradle-wrapper.properties b/S11.01-Solution-NewListItemLayout/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S11.01-Solution-NewListItemLayout/gradle/wrapper/gradle-wrapper.properties +++ b/S11.01-Solution-NewListItemLayout/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S11.02-Exercise-TodayListItem/app/build.gradle b/S11.02-Exercise-TodayListItem/app/build.gradle index c32aa07fba..9ef4e4d357 100755 --- a/S11.02-Exercise-TodayListItem/app/build.gradle +++ b/S11.02-Exercise-TodayListItem/app/build.gradle @@ -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" @@ -17,25 +16,23 @@ android { minifyEnabled false } } - productFlavors { - } } 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' - compile 'com.android.support:recyclerview-v7:25.0.1' - compile 'com.android.support:preference-v7:25.0.1' + implementation 'com.android.support:recyclerview-v7:28.0.0' + implementation 'com.android.support:preference-v7:28.0.0' - compile 'com.android.support.constraint:constraint-layout:1.0.0-beta3' + implementation 'com.android.support.constraint:constraint-layout:1.1.3' - compile 'com.firebase:firebase-jobdispatcher:0.5.0' + implementation 'com.firebase:firebase-jobdispatcher:0.8.5' - // 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' } diff --git a/S11.02-Exercise-TodayListItem/build.gradle b/S11.02-Exercise-TodayListItem/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S11.02-Exercise-TodayListItem/build.gradle +++ b/S11.02-Exercise-TodayListItem/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S11.02-Exercise-TodayListItem/gradle/wrapper/gradle-wrapper.properties b/S11.02-Exercise-TodayListItem/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S11.02-Exercise-TodayListItem/gradle/wrapper/gradle-wrapper.properties +++ b/S11.02-Exercise-TodayListItem/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S11.02-Solution-TodayListItem/app/build.gradle b/S11.02-Solution-TodayListItem/app/build.gradle index c32aa07fba..9ef4e4d357 100755 --- a/S11.02-Solution-TodayListItem/app/build.gradle +++ b/S11.02-Solution-TodayListItem/app/build.gradle @@ -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" @@ -17,25 +16,23 @@ android { minifyEnabled false } } - productFlavors { - } } 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' - compile 'com.android.support:recyclerview-v7:25.0.1' - compile 'com.android.support:preference-v7:25.0.1' + implementation 'com.android.support:recyclerview-v7:28.0.0' + implementation 'com.android.support:preference-v7:28.0.0' - compile 'com.android.support.constraint:constraint-layout:1.0.0-beta3' + implementation 'com.android.support.constraint:constraint-layout:1.1.3' - compile 'com.firebase:firebase-jobdispatcher:0.5.0' + implementation 'com.firebase:firebase-jobdispatcher:0.8.5' - // 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' } diff --git a/S11.02-Solution-TodayListItem/build.gradle b/S11.02-Solution-TodayListItem/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S11.02-Solution-TodayListItem/build.gradle +++ b/S11.02-Solution-TodayListItem/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S11.02-Solution-TodayListItem/gradle/wrapper/gradle-wrapper.properties b/S11.02-Solution-TodayListItem/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S11.02-Solution-TodayListItem/gradle/wrapper/gradle-wrapper.properties +++ b/S11.02-Solution-TodayListItem/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S11.03-Exercise-DetailLayoutAndDataBinding/app/build.gradle b/S11.03-Exercise-DetailLayoutAndDataBinding/app/build.gradle index 355a657088..47922fc159 100755 --- a/S11.03-Exercise-DetailLayoutAndDataBinding/app/build.gradle +++ b/S11.03-Exercise-DetailLayoutAndDataBinding/app/build.gradle @@ -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" @@ -18,24 +17,24 @@ android { } } -// TODO (1) Enable databinding + // TODO (1) Enable databinding } 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' - compile 'com.android.support:recyclerview-v7:25.0.1' - compile 'com.android.support:preference-v7:25.0.1' + implementation 'com.android.support:recyclerview-v7:28.0.0' + implementation 'com.android.support:preference-v7:28.0.0' - compile 'com.android.support.constraint:constraint-layout:1.0.0-beta3' + implementation 'com.android.support.constraint:constraint-layout:1.1.3' - compile 'com.firebase:firebase-jobdispatcher:0.5.0' + implementation 'com.firebase:firebase-jobdispatcher:0.8.5' - // 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' } diff --git a/S11.03-Exercise-DetailLayoutAndDataBinding/build.gradle b/S11.03-Exercise-DetailLayoutAndDataBinding/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S11.03-Exercise-DetailLayoutAndDataBinding/build.gradle +++ b/S11.03-Exercise-DetailLayoutAndDataBinding/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S11.03-Exercise-DetailLayoutAndDataBinding/gradle/wrapper/gradle-wrapper.properties b/S11.03-Exercise-DetailLayoutAndDataBinding/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S11.03-Exercise-DetailLayoutAndDataBinding/gradle/wrapper/gradle-wrapper.properties +++ b/S11.03-Exercise-DetailLayoutAndDataBinding/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S11.03-Solution-DetailLayoutAndDataBinding/app/build.gradle b/S11.03-Solution-DetailLayoutAndDataBinding/app/build.gradle index 2d4f25e5a7..90f6a3cd21 100755 --- a/S11.03-Solution-DetailLayoutAndDataBinding/app/build.gradle +++ b/S11.03-Solution-DetailLayoutAndDataBinding/app/build.gradle @@ -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" @@ -18,25 +17,25 @@ android { } } -// COMPLETED (1) Enable databinding + // COMPLETED (1) Enable databinding dataBinding.enabled = true } 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' - compile 'com.android.support:recyclerview-v7:25.0.1' - compile 'com.android.support:preference-v7:25.0.1' + implementation 'com.android.support:recyclerview-v7:28.0.0' + implementation 'com.android.support:preference-v7:28.0.0' - compile 'com.android.support.constraint:constraint-layout:1.0.0-beta3' + implementation 'com.android.support.constraint:constraint-layout:1.1.3' - compile 'com.firebase:firebase-jobdispatcher:0.5.0' + implementation 'com.firebase:firebase-jobdispatcher:0.8.5' - // 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' } diff --git a/S11.03-Solution-DetailLayoutAndDataBinding/build.gradle b/S11.03-Solution-DetailLayoutAndDataBinding/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S11.03-Solution-DetailLayoutAndDataBinding/build.gradle +++ b/S11.03-Solution-DetailLayoutAndDataBinding/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S11.03-Solution-DetailLayoutAndDataBinding/gradle/wrapper/gradle-wrapper.properties b/S11.03-Solution-DetailLayoutAndDataBinding/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S11.03-Solution-DetailLayoutAndDataBinding/gradle/wrapper/gradle-wrapper.properties +++ b/S11.03-Solution-DetailLayoutAndDataBinding/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S12.01-Exercise-DimensionsColorsAndFonts/app/build.gradle b/S12.01-Exercise-DimensionsColorsAndFonts/app/build.gradle index edfad30769..c987fb4d9a 100755 --- a/S12.01-Exercise-DimensionsColorsAndFonts/app/build.gradle +++ b/S12.01-Exercise-DimensionsColorsAndFonts/app/build.gradle @@ -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" @@ -22,20 +21,20 @@ 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' - compile 'com.android.support:recyclerview-v7:25.0.1' - compile 'com.android.support:preference-v7:25.0.1' + implementation 'com.android.support:recyclerview-v7:28.0.0' + implementation 'com.android.support:preference-v7:28.0.0' - compile 'com.android.support.constraint:constraint-layout:1.0.0-beta3' + implementation 'com.android.support.constraint:constraint-layout:1.1.3' - compile 'com.firebase:firebase-jobdispatcher:0.5.0' + implementation 'com.firebase:firebase-jobdispatcher:0.8.5' - // 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' } diff --git a/S12.01-Exercise-DimensionsColorsAndFonts/build.gradle b/S12.01-Exercise-DimensionsColorsAndFonts/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S12.01-Exercise-DimensionsColorsAndFonts/build.gradle +++ b/S12.01-Exercise-DimensionsColorsAndFonts/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S12.01-Exercise-DimensionsColorsAndFonts/gradle/wrapper/gradle-wrapper.properties b/S12.01-Exercise-DimensionsColorsAndFonts/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S12.01-Exercise-DimensionsColorsAndFonts/gradle/wrapper/gradle-wrapper.properties +++ b/S12.01-Exercise-DimensionsColorsAndFonts/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S12.01-Solution-DimensionsColorsAndFonts/app/build.gradle b/S12.01-Solution-DimensionsColorsAndFonts/app/build.gradle index edfad30769..c987fb4d9a 100755 --- a/S12.01-Solution-DimensionsColorsAndFonts/app/build.gradle +++ b/S12.01-Solution-DimensionsColorsAndFonts/app/build.gradle @@ -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" @@ -22,20 +21,20 @@ 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' - compile 'com.android.support:recyclerview-v7:25.0.1' - compile 'com.android.support:preference-v7:25.0.1' + implementation 'com.android.support:recyclerview-v7:28.0.0' + implementation 'com.android.support:preference-v7:28.0.0' - compile 'com.android.support.constraint:constraint-layout:1.0.0-beta3' + implementation 'com.android.support.constraint:constraint-layout:1.1.3' - compile 'com.firebase:firebase-jobdispatcher:0.5.0' + implementation 'com.firebase:firebase-jobdispatcher:0.8.5' - // 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' } diff --git a/S12.01-Solution-DimensionsColorsAndFonts/build.gradle b/S12.01-Solution-DimensionsColorsAndFonts/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S12.01-Solution-DimensionsColorsAndFonts/build.gradle +++ b/S12.01-Solution-DimensionsColorsAndFonts/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S12.01-Solution-DimensionsColorsAndFonts/gradle/wrapper/gradle-wrapper.properties b/S12.01-Solution-DimensionsColorsAndFonts/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S12.01-Solution-DimensionsColorsAndFonts/gradle/wrapper/gradle-wrapper.properties +++ b/S12.01-Solution-DimensionsColorsAndFonts/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S12.02-Exercise-Styles/app/build.gradle b/S12.02-Exercise-Styles/app/build.gradle index edfad30769..c987fb4d9a 100755 --- a/S12.02-Exercise-Styles/app/build.gradle +++ b/S12.02-Exercise-Styles/app/build.gradle @@ -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" @@ -22,20 +21,20 @@ 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' - compile 'com.android.support:recyclerview-v7:25.0.1' - compile 'com.android.support:preference-v7:25.0.1' + implementation 'com.android.support:recyclerview-v7:28.0.0' + implementation 'com.android.support:preference-v7:28.0.0' - compile 'com.android.support.constraint:constraint-layout:1.0.0-beta3' + implementation 'com.android.support.constraint:constraint-layout:1.1.3' - compile 'com.firebase:firebase-jobdispatcher:0.5.0' + implementation 'com.firebase:firebase-jobdispatcher:0.8.5' - // 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' } diff --git a/S12.02-Exercise-Styles/build.gradle b/S12.02-Exercise-Styles/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S12.02-Exercise-Styles/build.gradle +++ b/S12.02-Exercise-Styles/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S12.02-Exercise-Styles/gradle/wrapper/gradle-wrapper.properties b/S12.02-Exercise-Styles/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S12.02-Exercise-Styles/gradle/wrapper/gradle-wrapper.properties +++ b/S12.02-Exercise-Styles/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S12.02-Solution-Styles/app/build.gradle b/S12.02-Solution-Styles/app/build.gradle index edfad30769..c987fb4d9a 100755 --- a/S12.02-Solution-Styles/app/build.gradle +++ b/S12.02-Solution-Styles/app/build.gradle @@ -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" @@ -22,20 +21,20 @@ 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' - compile 'com.android.support:recyclerview-v7:25.0.1' - compile 'com.android.support:preference-v7:25.0.1' + implementation 'com.android.support:recyclerview-v7:28.0.0' + implementation 'com.android.support:preference-v7:28.0.0' - compile 'com.android.support.constraint:constraint-layout:1.0.0-beta3' + implementation 'com.android.support.constraint:constraint-layout:1.1.3' - compile 'com.firebase:firebase-jobdispatcher:0.5.0' + implementation 'com.firebase:firebase-jobdispatcher:0.8.5' - // 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' } diff --git a/S12.02-Solution-Styles/build.gradle b/S12.02-Solution-Styles/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S12.02-Solution-Styles/build.gradle +++ b/S12.02-Solution-Styles/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S12.02-Solution-Styles/gradle/wrapper/gradle-wrapper.properties b/S12.02-Solution-Styles/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S12.02-Solution-Styles/gradle/wrapper/gradle-wrapper.properties +++ b/S12.02-Solution-Styles/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S12.03-Exercise-TouchSelectors/app/build.gradle b/S12.03-Exercise-TouchSelectors/app/build.gradle index edfad30769..c987fb4d9a 100755 --- a/S12.03-Exercise-TouchSelectors/app/build.gradle +++ b/S12.03-Exercise-TouchSelectors/app/build.gradle @@ -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" @@ -22,20 +21,20 @@ 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' - compile 'com.android.support:recyclerview-v7:25.0.1' - compile 'com.android.support:preference-v7:25.0.1' + implementation 'com.android.support:recyclerview-v7:28.0.0' + implementation 'com.android.support:preference-v7:28.0.0' - compile 'com.android.support.constraint:constraint-layout:1.0.0-beta3' + implementation 'com.android.support.constraint:constraint-layout:1.1.3' - compile 'com.firebase:firebase-jobdispatcher:0.5.0' + implementation 'com.firebase:firebase-jobdispatcher:0.8.5' - // 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' } diff --git a/S12.03-Exercise-TouchSelectors/build.gradle b/S12.03-Exercise-TouchSelectors/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S12.03-Exercise-TouchSelectors/build.gradle +++ b/S12.03-Exercise-TouchSelectors/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S12.03-Exercise-TouchSelectors/gradle/wrapper/gradle-wrapper.properties b/S12.03-Exercise-TouchSelectors/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S12.03-Exercise-TouchSelectors/gradle/wrapper/gradle-wrapper.properties +++ b/S12.03-Exercise-TouchSelectors/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S12.03-Solution-TouchSelectors/app/build.gradle b/S12.03-Solution-TouchSelectors/app/build.gradle index edfad30769..c987fb4d9a 100755 --- a/S12.03-Solution-TouchSelectors/app/build.gradle +++ b/S12.03-Solution-TouchSelectors/app/build.gradle @@ -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" @@ -22,20 +21,20 @@ 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' - compile 'com.android.support:recyclerview-v7:25.0.1' - compile 'com.android.support:preference-v7:25.0.1' + implementation 'com.android.support:recyclerview-v7:28.0.0' + implementation 'com.android.support:preference-v7:28.0.0' - compile 'com.android.support.constraint:constraint-layout:1.0.0-beta3' + implementation 'com.android.support.constraint:constraint-layout:1.1.3' - compile 'com.firebase:firebase-jobdispatcher:0.5.0' + implementation 'com.firebase:firebase-jobdispatcher:0.8.5' - // 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' } diff --git a/S12.03-Solution-TouchSelectors/build.gradle b/S12.03-Solution-TouchSelectors/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S12.03-Solution-TouchSelectors/build.gradle +++ b/S12.03-Solution-TouchSelectors/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S12.03-Solution-TouchSelectors/gradle/wrapper/gradle-wrapper.properties b/S12.03-Solution-TouchSelectors/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S12.03-Solution-TouchSelectors/gradle/wrapper/gradle-wrapper.properties +++ b/S12.03-Solution-TouchSelectors/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S12.04-Exercise-ResourceQualifiers/app/build.gradle b/S12.04-Exercise-ResourceQualifiers/app/build.gradle index edfad30769..c987fb4d9a 100755 --- a/S12.04-Exercise-ResourceQualifiers/app/build.gradle +++ b/S12.04-Exercise-ResourceQualifiers/app/build.gradle @@ -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" @@ -22,20 +21,20 @@ 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' - compile 'com.android.support:recyclerview-v7:25.0.1' - compile 'com.android.support:preference-v7:25.0.1' + implementation 'com.android.support:recyclerview-v7:28.0.0' + implementation 'com.android.support:preference-v7:28.0.0' - compile 'com.android.support.constraint:constraint-layout:1.0.0-beta3' + implementation 'com.android.support.constraint:constraint-layout:1.1.3' - compile 'com.firebase:firebase-jobdispatcher:0.5.0' + implementation 'com.firebase:firebase-jobdispatcher:0.8.5' - // 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' } diff --git a/S12.04-Exercise-ResourceQualifiers/build.gradle b/S12.04-Exercise-ResourceQualifiers/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S12.04-Exercise-ResourceQualifiers/build.gradle +++ b/S12.04-Exercise-ResourceQualifiers/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S12.04-Exercise-ResourceQualifiers/gradle/wrapper/gradle-wrapper.properties b/S12.04-Exercise-ResourceQualifiers/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S12.04-Exercise-ResourceQualifiers/gradle/wrapper/gradle-wrapper.properties +++ b/S12.04-Exercise-ResourceQualifiers/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/S12.04-Solution-ResourceQualifiers/app/build.gradle b/S12.04-Solution-ResourceQualifiers/app/build.gradle index edfad30769..c987fb4d9a 100755 --- a/S12.04-Solution-ResourceQualifiers/app/build.gradle +++ b/S12.04-Solution-ResourceQualifiers/app/build.gradle @@ -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" @@ -22,20 +21,20 @@ 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' - compile 'com.android.support:recyclerview-v7:25.0.1' - compile 'com.android.support:preference-v7:25.0.1' + implementation 'com.android.support:recyclerview-v7:28.0.0' + implementation 'com.android.support:preference-v7:28.0.0' - compile 'com.android.support.constraint:constraint-layout:1.0.0-beta3' + implementation 'com.android.support.constraint:constraint-layout:1.1.3' - compile 'com.firebase:firebase-jobdispatcher:0.5.0' + implementation 'com.firebase:firebase-jobdispatcher:0.8.5' - // 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' } diff --git a/S12.04-Solution-ResourceQualifiers/build.gradle b/S12.04-Solution-ResourceQualifiers/build.gradle index 4697c773d3..c148ec8d3f 100755 --- a/S12.04-Solution-ResourceQualifiers/build.gradle +++ b/S12.04-Solution-ResourceQualifiers/build.gradle @@ -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 @@ -18,6 +19,7 @@ allprojects { buildDir = "C:/tmp/${rootProject.name}/${project.name}" } repositories { + google() jcenter() } } diff --git a/S12.04-Solution-ResourceQualifiers/gradle/wrapper/gradle-wrapper.properties b/S12.04-Solution-ResourceQualifiers/gradle/wrapper/gradle-wrapper.properties index 5912ea612b..ae55089e0e 100755 --- a/S12.04-Solution-ResourceQualifiers/gradle/wrapper/gradle-wrapper.properties +++ b/S12.04-Solution-ResourceQualifiers/gradle/wrapper/gradle-wrapper.properties @@ -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