Merge pull request #6 from muhammaddadu/TIMODOPEN-445

[TIMODOPEN-445] AdMob: Update ti.admob to Google Play Services v20
tidev · Oct 30, 2014 · 05eeda8 · 05eeda8
2 parents fe6d84a + a32ade5
commit 05eeda8
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 3 deletions.
diff --git a/android/dist/ti.admob-android-2.1.1.zip b/android/dist/ti.admob-android-2.1.1.zip
diff --git a/android/dist/ti.admob-android-2.1.2.zip b/android/dist/ti.admob-android-2.1.2.zip
diff --git a/android/documentation/changelog.md b/android/documentation/changelog.md
@@ -1,5 +1,7 @@
 # Change Log
 <pre>
+v2.1.2  Updating to use google-play-services library [TIMODOPEN-445]
+
 v2.1.1  Updating to use google-play-services library [TIMOB-16940]
 
 v2.1.0  Updating Admob SDK to 6.2.1, Building with TiSDK 2.1.3.GA, update documentation [TIMODOPEN-212]

diff --git a/android/lib/google-play-services.jar b/android/lib/google-play-services.jar
diff --git a/android/lib/version b/android/lib/version
@@ -1 +1 @@
-revision 4
+revision 20 / 6111000
diff --git a/android/manifest b/android/manifest
@@ -2,7 +2,7 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 2.1.1
+version: 2.1.2
 apiversion: 2
 description: Titanium Admob module for Android
 author: Brian Kurzius

diff --git a/android/timodule.xml b/android/timodule.xml
@@ -13,7 +13,7 @@
                 <activity android:name="com.google.android.gms.ads.AdActivity"
                           android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize"/>
                 <meta-data android:name="com.google.android.gms.version"
-                           android:value="4132500"/>
+                           android:value="6111000"/>
             </application>
             <uses-permission android:name="android.permission.INTERNET"/>
             <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>