Updating build versions to match Android Studio 0.8.0

gguuss · gguuss · commit b4aa5134bcc3 · 2014-07-01T12:08:42.000-07:00
diff --git a/BasicSamples/BeGenerous/build.gradle b/BasicSamples/BeGenerous/build.gradle
@@ -1,26 +1,34 @@
 apply plugin: 'android'
 
-buildscript {
-    repositories {
-        mavenCentral()
+android {
+    enforceUniquePackageName=false
+
+    compileSdkVersion 20
+    buildToolsVersion '20'
+
+    defaultConfig {
+        minSdkVersion 9
+        targetSdkVersion 20
+        versionCode 1
+        versionName "1.0"
     }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:0.9+'
+    buildTypes {
+        release {
+            runProguard false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+        }
     }
 }
 
-repositories {
-    mavenCentral()
-}
-
 dependencies {
-    compile 'com.android.support:support-v4:+'
-    compile 'com.google.android.gms:play-services:4.3.23+'
     compile project(':libraries:BaseGameUtils')
+    compile 'com.android.support:appcompat-v7:20.0.+'
+    compile 'com.android.support:support-v4:20.0.+'
+    compile 'com.google.android.gms:play-services:4.3.23'
 }
 
-android {
-    compileSdkVersion 19
-    buildToolsVersion "19.0.1"
+buildscript {
+    repositories {
+        mavenCentral()
+    }
 }
-
diff --git a/BasicSamples/BeGenerous/src/main/AndroidManifest.xml b/BasicSamples/BeGenerous/src/main/AndroidManifest.xml
@@ -38,7 +38,8 @@
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/AppTheme"
+        >
 
         <meta-data android:name="com.google.android.gms.games.APP_ID"
                    android:value="@string/app_id" />
diff --git a/BasicSamples/ButtonClicker/build.gradle b/BasicSamples/ButtonClicker/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'android'
 
 android {
-    compileSdkVersion 19
-    buildToolsVersion '19.0.3'
+    compileSdkVersion 20
+    buildToolsVersion '20'
 
     defaultConfig {
         minSdkVersion 9
-        targetSdkVersion 19
+        targetSdkVersion 20
         versionCode 1
         versionName "1.0"
     }
@@ -20,7 +20,8 @@ android {
 
 dependencies {
     compile project(':libraries:BaseGameUtils')
-    compile 'com.android.support:appcompat-v7:+'
+    compile 'com.android.support:support-v4:20.0.+'
+    compile 'com.android.support:appcompat-v7:20.0.+'
     compile 'com.google.android.gms:play-services:4.3.23'
 }
 
diff --git a/BasicSamples/ButtonClicker/src/main/AndroidManifest.xml b/BasicSamples/ButtonClicker/src/main/AndroidManifest.xml
@@ -27,7 +27,7 @@
     <application
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/AppTheme">
 
         <meta-data android:name="com.google.android.gms.games.APP_ID"
             android:value="@string/app_id" />
diff --git a/BasicSamples/CollectAllTheStars/build.gradle b/BasicSamples/CollectAllTheStars/build.gradle
@@ -1,11 +1,12 @@
 apply plugin: 'android'
+
 android {
-    compileSdkVersion 19
-    buildToolsVersion '19.0.3'
+    compileSdkVersion 20
+    buildToolsVersion '20'
 
     defaultConfig {
         minSdkVersion 9
-        targetSdkVersion 19
+        targetSdkVersion 20
         versionCode 1
         versionName "1.0"
     }
@@ -16,16 +17,16 @@ android {
         }
     }
 }
+
 dependencies {
-    compile 'com.android.support:appcompat-v7:+'
-    compile 'com.google.android.gms:play-services:4.3.23'
     compile project(':libraries:BaseGameUtils')
+    compile 'com.android.support:appcompat-v7:20.0.+'
+    compile 'com.android.support:support-v4:20.0.+'
+    compile 'com.google.android.gms:play-services:4.3.23'
 }
 
 buildscript {
     repositories {
         mavenCentral()
     }
 }
-repositories {
-}
diff --git a/BasicSamples/CollectAllTheStars2/build.gradle b/BasicSamples/CollectAllTheStars2/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'android'
 
 android {
-    compileSdkVersion 19
-    buildToolsVersion '19.0.3'
+    compileSdkVersion 20
+    buildToolsVersion '20'
 
     defaultConfig {
         minSdkVersion 9
-        targetSdkVersion 19
+        targetSdkVersion 20
         versionCode 1
         versionName "1.0"
     }
@@ -19,8 +19,8 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:19.+'
-    compile 'com.google.android.gms:play-services:5+'
+    compile 'com.android.support:appcompat-v7:20.0.+'
+    compile 'com.google.android.gms:play-services:+'
     compile project(':libraries:BaseGameUtils')
 }
 
diff --git a/BasicSamples/CollectAllTheStars2/src/main/java/com/google/example/games/catt2/MainActivity.java b/BasicSamples/CollectAllTheStars2/src/main/java/com/google/example/games/catt2/MainActivity.java
@@ -328,7 +328,7 @@ Snapshot processSnapshotOpenResult(Snapshots.OpenSnapshotResult result, int retr
     }
 
 
-/**
+    /**
      * Prepares saving Snapshot to the user's synchronized storage, conditionally resolves errors,
      * and stores the Snapshot.
      */
@@ -648,7 +648,7 @@ private void hideAlertBar() {
      * did what they were supposed to in order for the sample to work.
      */
     boolean verifyPlaceholderIdsReplaced() {
-        final boolean CHECK_PKGNAME = false; // set to false to disable check
+        final boolean CHECK_PKGNAME = true;  // set to false to disable check
                                              // (not recommended!)
 
         // Did the developer forget to change the package name?
diff --git a/BasicSamples/SkeletonTbmp/build.gradle b/BasicSamples/SkeletonTbmp/build.gradle
@@ -1,12 +1,14 @@
 apply plugin: 'android'
 
 android {
-    compileSdkVersion 19
-    buildToolsVersion '19.0.3'
+    enforceUniquePackageName=false
+
+    compileSdkVersion 20
+    buildToolsVersion '20'
 
     defaultConfig {
         minSdkVersion 9
-        targetSdkVersion 19
+        targetSdkVersion 20
         versionCode 1
         versionName "1.0"
     }
@@ -19,13 +21,14 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:19.+'
-    compile 'com.google.android.gms:play-services:4.3.23+'
     compile project(':libraries:BaseGameUtils')
+    compile 'com.android.support:appcompat-v7:20.0.+'
+    compile 'com.android.support:support-v4:20.0.+'
+    compile 'com.google.android.gms:play-services:4.3.23'
 }
 
 buildscript {
     repositories {
         mavenCentral()
     }
-}
+}
diff --git a/BasicSamples/TrivialQuest/build.gradle b/BasicSamples/TrivialQuest/build.gradle
@@ -1,12 +1,14 @@
 apply plugin: 'android'
 
 android {
-    compileSdkVersion 19
-    buildToolsVersion '19.0.3'
+    enforceUniquePackageName=false
+
+    compileSdkVersion 20
+    buildToolsVersion '20'
 
     defaultConfig {
         minSdkVersion 9
-        targetSdkVersion 19
+        targetSdkVersion 20
         versionCode 1
         versionName "1.0"
     }
@@ -19,13 +21,14 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:19.+'
-    compile 'com.google.android.gms:play-services:4.3.23+'
     compile project(':libraries:BaseGameUtils')
+    compile 'com.android.support:appcompat-v7:20.0.+'
+    compile 'com.android.support:support-v4:20.0.+'
+    compile 'com.google.android.gms:play-services:4.3.23'
 }
 
 buildscript {
     repositories {
         mavenCentral()
     }
-}
+}
diff --git a/BasicSamples/TrivialQuest2/build.gradle b/BasicSamples/TrivialQuest2/build.gradle
@@ -1,26 +1,20 @@
 apply plugin: 'android'
 
 android {
-    compileSdkVersion 19
-    buildToolsVersion '19.0.3'
+    compileSdkVersion 20
+    buildToolsVersion '20'
 
     defaultConfig {
         minSdkVersion 9
-        targetSdkVersion 19
+        targetSdkVersion 20
         versionCode 1
         versionName "1.0"
     }
-    buildTypes {
-        release {
-            runProguard false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
-        }
-    }
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:19.+'
-    compile 'com.google.android.gms:play-services:5+'
+    compile 'com.android.support:appcompat-v7:20.0.+'
+    compile 'com.google.android.gms:play-services:+'
     compile project(':libraries:BaseGameUtils')
 }
 
diff --git a/BasicSamples/TrivialQuest2/src/main/java/com/google/example/games/tq2/MainActivity.java b/BasicSamples/TrivialQuest2/src/main/java/com/google/example/games/tq2/MainActivity.java
@@ -151,12 +151,6 @@ public void loadAndListQuests()
         pr.setResultCallback(qc);
     }
 
-    @Override
-    /**
-     * This is a handler that will be removed by release.
-     * DO NOT IMPLEMENT, this is deprecated.
-     */
-    public void onQuestReceived(Quest quest){ }
 
     /**
      * Class implementation for handling Quest results.
diff --git a/BasicSamples/TypeANumber/build.gradle b/BasicSamples/TypeANumber/build.gradle
@@ -1,11 +1,14 @@
 apply plugin: 'android'
+
 android {
-    compileSdkVersion 19
-    buildToolsVersion '19.0.3'
+    enforceUniquePackageName=false
+
+    compileSdkVersion 20
+    buildToolsVersion '20'
 
     defaultConfig {
         minSdkVersion 9
-        targetSdkVersion 19
+        targetSdkVersion 20
         versionCode 1
         versionName "1.0"
     }
@@ -16,16 +19,16 @@ android {
         }
     }
 }
+
 dependencies {
-    compile 'com.android.support:appcompat-v7:19.+'
-    compile 'com.google.android.gms:play-services:4.3+'
     compile project(':libraries:BaseGameUtils')
+    compile 'com.android.support:appcompat-v7:20.0.+'
+    compile 'com.android.support:support-v4:20.0.+'
+    compile 'com.google.android.gms:play-services:4.3.23'
 }
 
 buildscript {
     repositories {
         mavenCentral()
     }
 }
-repositories {
-}
diff --git a/BasicSamples/build.gradle b/BasicSamples/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.9+'
+        classpath 'com.android.tools.build:gradle:0.12.+'
     }
 }
 
diff --git a/BasicSamples/gradle/wrapper/gradle-wrapper.properties b/BasicSamples/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Jan 16 13:12:25 PST 2014
+#Mon Jun 30 18:40:20 PDT 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-all.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip
diff --git a/BasicSamples/libraries/BaseGameUtils/build.gradle b/BasicSamples/libraries/BaseGameUtils/build.gradle
@@ -1,19 +1,26 @@
 apply plugin: 'android-library'
 
-android {
-    compileSdkVersion 19
-    buildToolsVersion '19.0.3'
+repositories {
+    mavenCentral()
 }
 
 buildscript {
     repositories {
         mavenCentral()
     }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.12+'
+    }
 }
 
 dependencies {
-    compile 'com.android.support:support-v4:+'
-    //compile 'com.google.android.gms:play-services:4.4.52+'
-    compile 'com.google.android.gms:play-services:5+'
+    compile 'com.android.support:support-v4:20.0+'
+    compile 'com.google.android.gms:play-services:+'
+}
+
+android {
+    compileSdkVersion 20
+    buildToolsVersion '20'
 }
 
diff --git a/BasicSamples/libraries/BaseGameUtils/src/main/AndroidManifest.xml b/BasicSamples/libraries/BaseGameUtils/src/main/AndroidManifest.xml
@@ -24,7 +24,8 @@
         android:minSdkVersion="9"
         android:targetSdkVersion="19" />
 
-    <application android:allowBackup="true" android:label="BaseGameUtils" >
+    <application android:allowBackup="true">
     </application>
+    <meta-data android:name="unityplayer.ForwardNativeEventsToDalvik" android:value="true" />
 
 </manifest>

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,12 @@`
`1`	`1`	`apply plugin: 'android'`
	`2`	`+`
`2`	`3`	`android {`
`3`		`- compileSdkVersion 19`
`4`		`- buildToolsVersion '19.0.3'`
	`4`	`+ compileSdkVersion 20`
	`5`	`+ buildToolsVersion '20'`
`5`	`6`
`6`	`7`	`defaultConfig {`
`7`	`8`	`minSdkVersion 9`
`8`		`- targetSdkVersion 19`
	`9`	`+ targetSdkVersion 20`
`9`	`10`	`versionCode 1`
`10`	`11`	`versionName "1.0"`
`11`	`12`	`}`
`@@ -16,16 +17,16 @@ android {`
`16`	`17`	`}`
`17`	`18`	`}`
`18`	`19`	`}`
	`20`	`+`
`19`	`21`	`dependencies {`
`20`		`- compile 'com.android.support:appcompat-v7:+'`
`21`		`- compile 'com.google.android.gms:play-services:4.3.23'`
`22`	`22`	`compile project(':libraries:BaseGameUtils')`
	`23`	`+ compile 'com.android.support:appcompat-v7:20.0.+'`
	`24`	`+ compile 'com.android.support:support-v4:20.0.+'`
	`25`	`+ compile 'com.google.android.gms:play-services:4.3.23'`
`23`	`26`	`}`
`24`	`27`
`25`	`28`	`buildscript {`
`26`	`29`	`repositories {`
`27`	`30`	`mavenCentral()`
`28`	`31`	`}`
`29`	`32`	`}`
`30`		`-repositories {`
`31`		`-}`