updated version to 1.1.5

updated to google play services 7.8
caffeinalab · Aug 18, 2015 · 0c0ccc2 · 0c0ccc2
1 parent ca6eac9
commit 0c0ccc2
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 5 deletions.
diff --git a/android/build.properties b/android/build.properties
@@ -1,3 +1,3 @@
-titanium.platform=/Users/priebe/Library/Application Support/Titanium/mobilesdk/osx/3.5.1.GA/android
-android.platform=/Applications/adt-bundle-mac-x86_64-20140702/sdk/platforms/android-17
-google.apis=/Applications/adt-bundle-mac-x86_64-20140702/sdk/add-ons/addon-google_apis-google-17
+titanium.platform=/Users/priebe/Library/Application Support/Titanium/mobilesdk/osx/4.1.0.GA/android
+android.platform=/Applications/adt-bundle-mac-x86_64-20140702/sdk/platforms/android-21
+google.apis=/Applications/adt-bundle-mac-x86_64-20140702/sdk/add-ons/addon-google_apis-google-19
diff --git a/android/dist/dfp.jar b/android/dist/dfp.jar
diff --git a/android/dist/ti.dfp-android-1.1.5.zip b/android/dist/ti.dfp-android-1.1.5.zip
diff --git a/android/lib/google-play-services.jar b/android/lib/google-play-services.jar
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: 1.1.3
+version: 1.1.5
 apiversion: 2
 architectures: armeabi armeabi-v7a x86
 description: Doubleclick for Publishers module for Titanium

diff --git a/android/platform/android/res/values/version.xml b/android/platform/android/res/values/version.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <integer name="google_play_services_version">7895000</integer>
+</resources>
diff --git a/android/timodule.xml b/android/timodule.xml
@@ -13,7 +13,7 @@
                     android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize"
                     android:theme="@android:style/Theme.Translucent" />
                 <meta-data android:name="com.google.android.gms.version"
-                           android:value="7095000"/>
+                           android:value="@integer/google_play_services_version"/>
             </application>
             <uses-permission android:name="android.permission.INTERNET"/>
             <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>