Updating dependency versions, fixing build errors

Change-Id: I521fa421852339e070f0b2d89bd4f31e40381a9f
googlesamples · Sep 24, 2015 · e0aeba6 · e0aeba6
1 parent 0b88624
commit e0aeba6
Show file tree

Hide file tree

Showing 16 changed files with 29 additions and 20 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,6 @@ Pods/
 Podfile.lock
 xcuserdata/
 *.xcworkspace/
+
+# Android
+google-services.json
diff --git a/android/admob/app/build.gradle b/android/admob/app/build.gradle
@@ -31,7 +31,7 @@ dependencies {
     compile 'com.android.support:appcompat-v7:23.0.0'
 
     // [START gradle_play_config]
-    compile 'com.google.android.gms:play-services-ads:7.8.0'
+    compile 'com.google.android.gms:play-services-ads:8.1.0'
     // [END gradle_play_config]
 
     androidTestCompile 'com.android.support.test.espresso:espresso-core:2.1'

diff --git a/android/admob/build.gradle b/android/admob/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:1.3.0'
-        classpath 'com.google.gms:google-services:1.3.0'
+        classpath 'com.google.gms:google-services:1.4.0-beta3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/android/analytics/app/build.gradle b/android/analytics/app/build.gradle
@@ -24,5 +24,5 @@ dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.android.support:appcompat-v7:23.0.0'
     compile 'com.android.support:support-v4:23.0.0'
-    compile 'com.google.android.gms:play-services-analytics:7.8.0'
+    compile 'com.google.android.gms:play-services-analytics:8.1.0'
 }
diff --git a/android/analytics/app/src/main/res/menu/main.xml b/android/analytics/app/src/main/res/menu/main.xml
@@ -12,6 +12,6 @@ under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 CONDITIONS OF ANY KIND, either express or implied. See the License for the
 specific language governing permissions and limitations under the License.
 -->
-<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <item android:id="@+id/menu_share" android:title="@string/menu_share" app:showAsAction="never" />
-</menu>
+</menu>
diff --git a/android/analytics/build.gradle b/android/analytics/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:1.3.0'
-        classpath 'com.google.gms:google-services:1.3.0'
+        classpath 'com.google.gms:google-services:1.4.0-beta3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/android/app-indexing/app/build.gradle b/android/app-indexing/app/build.gradle
@@ -20,5 +20,7 @@ android {
 }
 
 dependencies {
-    compile 'com.google.android.gms:play-services-appindexing:7.8.0'
+    compile 'com.android.support:support-v4:23.0.0'
+
+    compile 'com.google.android.gms:play-services-appindexing:8.1.0'
 }
diff --git a/android/appinvites/app/build.gradle b/android/appinvites/app/build.gradle
@@ -33,7 +33,7 @@ dependencies {
     compile 'com.android.support:appcompat-v7:23.0.0'
     compile 'com.android.support:design:23.0.0'
 
-    compile 'com.google.android.gms:play-services-appinvite:7.8.0'
+    compile 'com.google.android.gms:play-services-appinvite:8.1.0'
 
     // UiAutomatorTesting
     androidTestCompile 'com.android.support.test:runner:0.3'

diff --git a/...d/appinvites/app/src/main/java/com/google/android/gms/samples/appinvite/MainActivity.java b/...d/appinvites/app/src/main/java/com/google/android/gms/samples/appinvite/MainActivity.java
@@ -92,6 +92,8 @@ private void onInviteClicked() {
         Intent intent = new AppInviteInvitation.IntentBuilder(getString(R.string.invitation_title))
                 .setMessage(getString(R.string.invitation_message))
                 .setDeepLink(Uri.parse(getString(R.string.invitation_deep_link)))
+                .setCustomImage(Uri.parse(getString(R.string.invitation_custom_image)))
+                .setCallToActionText(getString(R.string.invitation_cta))
                 .build();
         startActivityForResult(intent, REQUEST_INVITE);
     }

diff --git a/android/appinvites/app/src/main/res/values/strings.xml b/android/appinvites/app/src/main/res/values/strings.xml
@@ -15,11 +15,13 @@
     <string name="invitation_title">Send App Invite Quickstart Invitation</string>
     <string name="invitation_message">This app is terrific, give it a try and get $5 off!</string>
     <string name="invitation_deep_link">http://example.com/offer/five_dollar_offer</string>
+    <string name="invitation_custom_image">https://www.google.com/images/branding/googlelogo/2x/googlelogo_color_272x92dp.png</string>
+    <string name="invitation_cta">Install!</string>
 
-    <string name="deep_link_fmt">Deep Link: %s</string>
-    <string name="invitation_id_fmt">Invitation ID: %s</string>
+    <string name="deep_link_fmt" formatted="false">Deep Link: %s</string>
+    <string name="invitation_id_fmt" formatted="false">Invitation ID: %s</string>
 
-    <string name="sent_invitations_fmt">Sent %d invitations</string>
+    <string name="sent_invitations_fmt" formatted="false">Sent %d invitations</string>
     <string name="send_failed">Sending invitations failed</string>
     <string name="invite_dialog_title">You got an invitation!</string>
 </resources>
diff --git a/android/appinvites/build.gradle b/android/appinvites/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:1.3.0'
-        classpath 'com.google.gms:google-services:1.3.0'
+        classpath 'com.google.gms:google-services:1.4.0-beta3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/android/gcm/app/build.gradle b/android/gcm/app/build.gradle
@@ -27,7 +27,7 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.google.android.gms:play-services-gcm:7.8.0'
+    compile 'com.google.android.gms:play-services-gcm:8.1.0'
 
     compile 'com.android.support:appcompat-v7:23.0.0'
 

diff --git a/android/gcm/build.gradle b/android/gcm/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:1.3.0'
-        classpath 'com.google.gms:google-services:1.3.0'
+        classpath 'com.google.gms:google-services:1.4.0-beta3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/android/signin/app/build.gradle b/android/signin/app/build.gradle
@@ -36,7 +36,7 @@ dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.android.support:appcompat-v7:23.0.0'
 
-    compile 'com.google.android.gms:play-services-plus:7.8.0'
+    compile 'com.google.android.gms:play-services-plus:8.1.0'
 
     // UiAutomatorTesting
     androidTestCompile 'com.android.support.test:runner:0.2'

diff --git a/android/signin/app/src/main/java/com/google/samples/quickstart/signin/MainActivity.java b/android/signin/app/src/main/java/com/google/samples/quickstart/signin/MainActivity.java
@@ -56,7 +56,7 @@ public class MainActivity extends AppCompatActivity implements
     private GoogleApiClient mGoogleApiClient;
 
     /* View to display current status (signed-in, signed-out, disconnected, etc) */
-    private TextView mStatusTextView;
+    private TextView mStatus;
 
     // [START resolution_variables]
     /* Is there a ConnectionResult resolution in progress? */
@@ -91,7 +91,7 @@ protected void onCreate(Bundle savedInstanceState) {
         findViewById(R.id.sign_in_button).setEnabled(false);
 
         // Set up view instances
-        mStatusTextView = (TextView) findViewById(R.id.status);
+        mStatus = (TextView) findViewById(R.id.status);
 
         // [START create_google_api_client]
         // Build GoogleApiClient with access to basic profile
@@ -121,7 +121,7 @@ private void updateUI(boolean isSignedIn) {
             findViewById(R.id.sign_out_and_disconnect).setVisibility(View.VISIBLE);
         } else {
             // Show signed-out message
-            mStatusTextView.setText(R.string.signed_out);
+            mStatus.setText(R.string.signed_out);
 
             // Set button visibility
             findViewById(R.id.sign_in_button).setEnabled(true);
@@ -280,7 +280,7 @@ private void onSignInClicked() {
         mGoogleApiClient.connect();
 
         // Show a message to the user that we are signing in.
-        mStatusTextView.setText(R.string.signing_in);
+        mStatus.setText(R.string.signing_in);
     }
     // [END on_sign_in_clicked]
 

diff --git a/android/signin/build.gradle b/android/signin/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:1.3.0'
-        classpath 'com.google.gms:google-services:1.3.0'
+        classpath 'com.google.gms:google-services:1.4.0-beta3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files