Sitata · jpriebe · Aug 18, 2015 · Aug 18, 2015 · Aug 18, 2015 · Apr 25, 2016
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,12 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## Android-3.2.1 - iOS-3.1.0 <> 2016-04-25
+Built with TiSDK 5.2.2 for compatibility with Marshmallow
+
+## Android-3.2.0 - iOS-3.1.0 <> 2015-08-18
+Brought Google Play Services up to version 7.8
+
 ## Android-3.1.0 - iOS-3.1.0 <> 2015-03-22
 ### Added
 - `trackException` method added to Android and iOS to track caught exceptions. [[mokesmokes]](https://github.com/mokesmokes)

diff --git a/android/build.properties.example b/android/build.properties.example
@@ -1,8 +1,8 @@
 titanium.sdk=/Library/Application\ Support/Titanium/
 titanium.os=osx
-titanium.version=3.0.2.GA
+titanium.version=5.2.2.GA
 android.sdk=/usr/android-sdk
 
 titanium.platform=${titanium.sdk}/mobilesdk/${titanium.os}/${titanium.version}/android
-android.platform=${android.sdk}/platforms/android-8
-google.apis=${android.sdk}/add-ons/addon_google_apis_google_inc_8
+android.platform=${android.sdk}/platforms/android-23
+google.apis=${android.sdk}/add-ons/addon-google_apis_x86-google-23
diff --git a/android/dist/analytics.google-android-3.2.0.zip b/android/dist/analytics.google-android-3.2.0.zip
diff --git a/android/dist/analytics.google-android-3.2.1.zip b/android/dist/analytics.google-android-3.2.1.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: 3.1.0
+version: 3.2.1
 apiversion: 2
 architectures: armeabi armeabi-v7a x86
 description: Google Analytics for Titanium Appcelerator
@@ -16,4 +16,4 @@ name: analytics.google
 moduleid: analytics.google
 guid: 6bdae9d9-4154-4d21-aacf-c0f95b193dae
 platform: android
-minsdk: 3.4.2
+minsdk: 5.2.0.GA
diff --git a/android/platform/android/res/values/version.xml b/android/platform/android/res/values/version.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <integer name="google_play_services_version">6171000</integer>
-</resources>
+    <integer name="google_play_services_version">7895000</integer>
+</resources>
diff --git a/test/modules/android/analytics.google/3.1.0/lib/google-play-services.jar b/test/modules/android/analytics.google/3.1.0/lib/google-play-services.jar
diff --git a/...es/android/analytics.google/3.1.0/LICENSE → ...es/android/analytics.google/3.2.0/LICENSE b/...es/android/analytics.google/3.1.0/LICENSE → ...es/android/analytics.google/3.2.0/LICENSE
diff --git a/...alytics.google/3.1.0/analytics.google.jar → ...alytics.google/3.2.0/analytics.google.jar b/...alytics.google/3.1.0/analytics.google.jar → ...alytics.google/3.2.0/analytics.google.jar
diff --git a/...ics.google/3.1.0/documentation/index.html → ...ics.google/3.2.0/documentation/index.html b/...ics.google/3.1.0/documentation/index.html → ...ics.google/3.2.0/documentation/index.html
diff --git a/...oid/analytics.google/3.1.0/example/app.js → ...oid/analytics.google/3.2.0/example/app.js b/...oid/analytics.google/3.1.0/example/app.js → ...oid/analytics.google/3.2.0/example/app.js
@@ -195,4 +195,5 @@ tracker.trackException({
 tracker.trackException({
 	fatal: true
 });
-tracker.trackException();
+// should produce a non-fatal, excepction without description
+tracker.trackException({});
diff --git a/test/modules/android/analytics.google/3.2.0/lib/google-play-services.jar b/test/modules/android/analytics.google/3.2.0/lib/google-play-services.jar
diff --git a/...s/android/analytics.google/3.1.0/manifest → ...s/android/analytics.google/3.2.0/manifest b/...s/android/analytics.google/3.1.0/manifest → ...s/android/analytics.google/3.2.0/manifest
@@ -2,7 +2,7 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 3.1.0
+version: 3.2.0
 apiversion: 2
 architectures: armeabi armeabi-v7a x86
 description: Google Analytics for Titanium Appcelerator
@@ -16,4 +16,4 @@ name: analytics.google
 moduleid: analytics.google
 guid: 6bdae9d9-4154-4d21-aacf-c0f95b193dae
 platform: android
-minsdk: 3.4.2
+minsdk: 4.1.0
diff --git a/...0/platform/android/res/values/version.xml → ...0/platform/android/res/values/version.xml b/...0/platform/android/res/values/version.xml → ...0/platform/android/res/values/version.xml
diff --git a/...droid/analytics.google/3.1.0/timodule.xml → ...droid/analytics.google/3.2.0/timodule.xml b/...droid/analytics.google/3.1.0/timodule.xml → ...droid/analytics.google/3.2.0/timodule.xml