From c745fac646aaa04fb57e7fa8fa912cad0de497d4 Mon Sep 17 00:00:00 2001 From: Jantz Date: Thu, 21 Jun 2018 12:52:19 -0500 Subject: [PATCH 1/7] Add Google Maven repository --- build.gradle | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/build.gradle b/build.gradle index 64b789d7f..f59c4f863 100755 --- a/build.gradle +++ b/build.gradle @@ -3,6 +3,10 @@ buildscript { repositories { jcenter() + maven { + url 'https://maven.google.com/' + name 'Google' + } } dependencies { classpath 'com.android.tools.build:gradle:2.3.0' @@ -15,6 +19,10 @@ buildscript { allprojects { repositories { jcenter() + maven { + url 'https://maven.google.com/' + name 'Google' + } } ext { From ae23eac743b5b95abeab3bb8d9e11552cdcef454 Mon Sep 17 00:00:00 2001 From: Jantz Date: Thu, 21 Jun 2018 13:02:53 -0500 Subject: [PATCH 2/7] Update Gradle and Android Gradle versions --- XYZReader/build.gradle | 3 ++- build.gradle | 3 ++- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/XYZReader/build.gradle b/XYZReader/build.gradle index 93b2ea3e5..24a278145 100755 --- a/XYZReader/build.gradle +++ b/XYZReader/build.gradle @@ -1,9 +1,10 @@ buildscript { repositories { mavenCentral() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0' + classpath 'com.android.tools.build:gradle:3.1.2' } } apply plugin: 'com.android.application' diff --git a/build.gradle b/build.gradle index f59c4f863..b9b8c4506 100755 --- a/build.gradle +++ b/build.gradle @@ -7,9 +7,10 @@ buildscript { url 'https://maven.google.com/' name 'Google' } + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.0' + classpath 'com.android.tools.build:gradle:3.1.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5fd3d46c5..efd01cb8c 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Mar 26 16:58:07 PDT 2017 +#Thu Jun 21 12:56:18 CDT 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.4-all.zip From f8e26812b0d2a9fbaf4d832d8caef739f03e5fb5 Mon Sep 17 00:00:00 2001 From: Jantz Date: Thu, 21 Jun 2018 13:16:26 -0500 Subject: [PATCH 3/7] Update Android SDK build tools version from "25.0.2" to "27.0.3" --- XYZReader/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/XYZReader/build.gradle b/XYZReader/build.gradle index 24a278145..41253b9ef 100755 --- a/XYZReader/build.gradle +++ b/XYZReader/build.gradle @@ -15,7 +15,7 @@ repositories { android { compileSdkVersion 25 - buildToolsVersion "25.0.2" + buildToolsVersion '27.0.3' defaultConfig { minSdkVersion 19 From 1203df904aaa04123507024ec9c10341e7f654ba Mon Sep 17 00:00:00 2001 From: Jantz Date: Thu, 21 Jun 2018 13:45:42 -0500 Subject: [PATCH 4/7] Change 'compile' to 'implementation' in build.gradle --- XYZReader/build.gradle | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/XYZReader/build.gradle b/XYZReader/build.gradle index 41253b9ef..ed5df610b 100755 --- a/XYZReader/build.gradle +++ b/XYZReader/build.gradle @@ -24,12 +24,12 @@ android { } dependencies { - compile "com.android.support:support-v4:$androidSupportVersion" - compile "com.android.support:support-v13:$androidSupportVersion" - compile "com.android.support:appcompat-v7:$androidSupportVersion" - compile "com.android.support:palette-v7:$androidSupportVersion" - compile "com.android.support:recyclerview-v7:$androidSupportVersion" - compile "com.android.support:cardview-v7:$androidSupportVersion" - compile 'com.squareup.okhttp3:okhttp:3.1.2' - compile files('libs/volley.jar') + implementation "com.android.support:support-v4:$androidSupportVersion" + implementation "com.android.support:support-v13:$androidSupportVersion" + implementation "com.android.support:appcompat-v7:$androidSupportVersion" + implementation "com.android.support:palette-v7:$androidSupportVersion" + implementation "com.android.support:recyclerview-v7:$androidSupportVersion" + implementation "com.android.support:cardview-v7:$androidSupportVersion" + implementation 'com.squareup.okhttp3:okhttp:3.1.2' + implementation files('libs/volley.jar') } From 9d72257a70114ea633427bd733701148bf2cde27 Mon Sep 17 00:00:00 2001 From: Jantz Date: Thu, 21 Jun 2018 13:55:06 -0500 Subject: [PATCH 5/7] Upgrade 'androidSupportVersion' gradle variable from "25.3.0" to "25.4.0" --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b9b8c4506..f4cf20aad 100755 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ allprojects { } ext { - androidSupportVersion = "25.3.0" + androidSupportVersion = "25.4.0" } } From 2a55b607f6913dad4d0869375af8095b3547c73c Mon Sep 17 00:00:00 2001 From: Jantz Date: Thu, 21 Jun 2018 14:02:51 -0500 Subject: [PATCH 6/7] Upgrade 'com.squareup.okhttp3:okhttp:3.1.2' to 'com.squareup.okhttp3:okhttp:3.9.0' --- XYZReader/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/XYZReader/build.gradle b/XYZReader/build.gradle index ed5df610b..60b800a0c 100755 --- a/XYZReader/build.gradle +++ b/XYZReader/build.gradle @@ -30,6 +30,6 @@ dependencies { implementation "com.android.support:palette-v7:$androidSupportVersion" implementation "com.android.support:recyclerview-v7:$androidSupportVersion" implementation "com.android.support:cardview-v7:$androidSupportVersion" - implementation 'com.squareup.okhttp3:okhttp:3.1.2' + implementation 'com.squareup.okhttp3:okhttp:3.9.0' implementation files('libs/volley.jar') } From b8b91a1fbb6208130e84bab281f67bf1947aa880 Mon Sep 17 00:00:00 2001 From: Jantz Date: Thu, 21 Jun 2018 14:07:12 -0500 Subject: [PATCH 7/7] Upgrade Android gradle from 3.1.2 to 3.1.3 --- XYZReader/build.gradle | 2 +- build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/XYZReader/build.gradle b/XYZReader/build.gradle index 60b800a0c..d8f73f8eb 100755 --- a/XYZReader/build.gradle +++ b/XYZReader/build.gradle @@ -4,7 +4,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.2' + classpath 'com.android.tools.build:gradle:3.1.3' } } apply plugin: 'com.android.application' diff --git a/build.gradle b/build.gradle index f4cf20aad..a1f54e82f 100755 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.2' + classpath 'com.android.tools.build:gradle:3.1.3' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files