update to Android Studio 3.0.1

mwgray · mwgray · commit 8d0c6985ece9 · 2017-12-08T09:27:41.000-08:00
compile -&gt; api/implementation
removed buildToolsVersion
gradle3.3 -&gt; gradle4.1
gradle2.3.3 -&gt; gradle3.0.1
move dependencies out of BaseGameUtils.gradle

Change-Id: I8b8bfa075a845113405aa0b3219b8df299639c99
diff --git a/BasicSamples/ButtonClicker/build.gradle b/BasicSamples/ButtonClicker/build.gradle
@@ -3,7 +3,6 @@ apply plugin: 'com.android.application'
 android {
 
     compileSdkVersion android_compile_version
-    buildToolsVersion android_version
 
     defaultConfig {
         /*
@@ -27,9 +26,11 @@ android {
 }
 
 dependencies {
-    compile "com.android.support:appcompat-v7:${appcompat_library_version}"
-    compile "com.android.support:support-v4:${support_library_version}"
-    compile project(':libraries:BaseGameUtils')
+    implementation "com.android.support:appcompat-v7:${appcompat_library_version}"
+    implementation "com.android.support:support-v4:${support_library_version}"
+    implementation "com.google.android.gms:play-services-games:${gms_library_version}"
+    implementation "com.google.android.gms:play-services-auth:${gms_library_version}"
+    implementation project(':libraries:BaseGameUtils')
 }
 
 buildscript {
diff --git a/BasicSamples/CollectAllTheStars2/build.gradle b/BasicSamples/CollectAllTheStars2/build.gradle
@@ -3,7 +3,6 @@ apply plugin: 'com.android.application'
 android {
 
     compileSdkVersion android_compile_version
-    buildToolsVersion android_version
 
     defaultConfig {
         /*
@@ -27,9 +26,11 @@ android {
 }
 
 dependencies {
-    compile "com.android.support:appcompat-v7:${appcompat_library_version}"
-    compile "com.android.support:support-v4:${support_library_version}"
-    compile project(':libraries:BaseGameUtils')
+    implementation "com.android.support:appcompat-v7:${appcompat_library_version}"
+    implementation "com.android.support:support-v4:${support_library_version}"
+    implementation "com.google.android.gms:play-services-games:${gms_library_version}"
+    implementation "com.google.android.gms:play-services-auth:${gms_library_version}"
+    implementation project(':libraries:BaseGameUtils')
 }
 
 buildscript {
diff --git a/BasicSamples/SkeletonTbmp/build.gradle b/BasicSamples/SkeletonTbmp/build.gradle
@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion android_compile_version
-    buildToolsVersion android_version
 
     defaultConfig {
         /*
@@ -26,9 +25,11 @@ android {
 }
 
 dependencies {
-    compile "com.android.support:appcompat-v7:${appcompat_library_version}"
-    compile "com.android.support:support-v4:${support_library_version}"
-    compile project(':libraries:BaseGameUtils')
+    implementation "com.android.support:appcompat-v7:${appcompat_library_version}"
+    implementation "com.android.support:support-v4:${support_library_version}"
+    implementation "com.google.android.gms:play-services-games:${gms_library_version}"
+    implementation "com.google.android.gms:play-services-auth:${gms_library_version}"
+    implementation project(':libraries:BaseGameUtils')
 }
 
 buildscript {
diff --git a/BasicSamples/TypeANumber/build.gradle b/BasicSamples/TypeANumber/build.gradle
@@ -3,7 +3,6 @@ apply plugin: 'com.android.application'
 android {
 
     compileSdkVersion android_compile_version
-    buildToolsVersion android_version
 
     defaultConfig {
         /*
@@ -27,9 +26,11 @@ android {
 }
 
 dependencies {
-    compile "com.android.support:appcompat-v7:${appcompat_library_version}"
-    compile "com.android.support:support-v4:${support_library_version}"
-    compile project(':libraries:BaseGameUtils')
+    implementation "com.android.support:appcompat-v7:${appcompat_library_version}"
+    implementation "com.android.support:support-v4:${support_library_version}"
+    implementation "com.google.android.gms:play-services-games:${gms_library_version}"
+    implementation "com.google.android.gms:play-services-auth:${gms_library_version}"
+    implementation project(':libraries:BaseGameUtils')
 }
 
 buildscript {
diff --git a/BasicSamples/build.gradle b/BasicSamples/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.0.1'
     }
 }
 
@@ -23,13 +23,13 @@ allprojects {
 
     ext {
         android_compile_version = 26
-        android_version = '26.0.1'
+
         // Google Play Services minimum requirements is 14
         android_min_sdk_version = 14
 
-        appcompat_library_version = '26.0.2'
-        support_library_version = '26.0.2'
-        gms_library_version = '11.6.0'
+        appcompat_library_version = '27.0.2'
+        support_library_version = '27.0.2'
+        gms_library_version = '11.6.2'
     }
 }
 
diff --git a/BasicSamples/gradle/wrapper/gradle-wrapper.properties b/BasicSamples/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu May 11 09:50:54 PDT 2017
+#Tue Nov 28 14:53:07 PST 2017
 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.1-all.zip
diff --git a/BasicSamples/libraries/BaseGameUtils/build.gradle b/BasicSamples/libraries/BaseGameUtils/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.0.1'
     }
 }
 
@@ -21,20 +21,12 @@ dependencies {
     if (!project.hasProperty('gms_library_version')) {
         ext.gms_library_version = '8.4.0'
     }
-
-    compile "com.android.support:appcompat-v7:${appcompat_library_version}"
-    compile "com.android.support:support-v4:${support_library_version}"
-    compile "com.google.android.gms:play-services-games:${gms_library_version}"
-    compile "com.google.android.gms:play-services-auth:${gms_library_version}"
 }
 
 android {
     // Set defaults so that BaseGameUtils can be used outside of BasicSamples
     if (!project.hasProperty('android_compile_version')) {
-        ext.android_compile_version = 23
-    }
-    if (!project.hasProperty('android_version')) {
-        ext.build_tools_version = "23.0.2"
+        ext.android_compile_version = 26
     }
     // Set defaults so that BaseGameUtils can be used outside of BasicSamples
     if (!project.hasProperty('android_min_sdk_version')) {
@@ -43,7 +35,6 @@ android {
     }
 
     compileSdkVersion android_compile_version
-    buildToolsVersion "25.0.2"
 
     defaultConfig {
         minSdkVersion android_min_sdk_version

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ buildscript {`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`dependencies {`
`11`		`- classpath 'com.android.tools.build:gradle:2.3.3'`
	`11`	`+ classpath 'com.android.tools.build:gradle:3.0.1'`
`12`	`12`	`}`
`13`	`13`	`}`
`14`	`14`
`@@ -23,13 +23,13 @@ allprojects {`
`23`	`23`
`24`	`24`	`ext {`
`25`	`25`	`android_compile_version = 26`
`26`		`- android_version = '26.0.1'`
	`26`	`+`
`27`	`27`	`// Google Play Services minimum requirements is 14`
`28`	`28`	`android_min_sdk_version = 14`
`29`	`29`
`30`		`- appcompat_library_version = '26.0.2'`
`31`		`- support_library_version = '26.0.2'`
`32`		`- gms_library_version = '11.6.0'`
	`30`	`+ appcompat_library_version = '27.0.2'`
	`31`	`+ support_library_version = '27.0.2'`
	`32`	`+ gms_library_version = '11.6.2'`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ buildscript {`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`dependencies {`
`9`		`- classpath 'com.android.tools.build:gradle:2.3.3'`
	`9`	`+ classpath 'com.android.tools.build:gradle:3.0.1'`
`10`	`10`	`}`
`11`	`11`	`}`
`12`	`12`
`@@ -21,20 +21,12 @@ dependencies {`
`21`	`21`	`if (!project.hasProperty('gms_library_version')) {`
`22`	`22`	`ext.gms_library_version = '8.4.0'`
`23`	`23`	`}`
`24`		`-`
`25`		`- compile "com.android.support:appcompat-v7:${appcompat_library_version}"`
`26`		`- compile "com.android.support:support-v4:${support_library_version}"`
`27`		`- compile "com.google.android.gms:play-services-games:${gms_library_version}"`
`28`		`- compile "com.google.android.gms:play-services-auth:${gms_library_version}"`
`29`	`24`	`}`
`30`	`25`
`31`	`26`	`android {`
`32`	`27`	`// Set defaults so that BaseGameUtils can be used outside of BasicSamples`
`33`	`28`	`if (!project.hasProperty('android_compile_version')) {`
`34`		`- ext.android_compile_version = 23`
`35`		`- }`
`36`		`- if (!project.hasProperty('android_version')) {`
`37`		`- ext.build_tools_version = "23.0.2"`
	`29`	`+ ext.android_compile_version = 26`
`38`	`30`	`}`
`39`	`31`	`// Set defaults so that BaseGameUtils can be used outside of BasicSamples`
`40`	`32`	`if (!project.hasProperty('android_min_sdk_version')) {`
`@@ -43,7 +35,6 @@ android {`
`43`	`35`	`}`
`44`	`36`
`45`	`37`	`compileSdkVersion android_compile_version`
`46`		`- buildToolsVersion "25.0.2"`
`47`	`38`
`48`	`39`	`defaultConfig {`
`49`	`40`	`minSdkVersion android_min_sdk_version`