diff --git a/CHANGELOG.md b/CHANGELOG.md index d6bd3c1..d9524a8 100644 --- 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 index 1ed1e70..d1fea0e 100644 --- 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 new file mode 100644 index 0000000..80d6bab Binary files /dev/null and b/android/dist/analytics.google-android-3.2.0.zip differ diff --git a/android/dist/analytics.google-android-3.2.1.zip b/android/dist/analytics.google-android-3.2.1.zip new file mode 100644 index 0000000..37055a4 Binary files /dev/null and b/android/dist/analytics.google-android-3.2.1.zip differ diff --git a/android/lib/google-play-services.jar b/android/lib/google-play-services.jar index 563d4d6..d20ef78 100644 Binary files a/android/lib/google-play-services.jar and b/android/lib/google-play-services.jar differ diff --git a/android/manifest b/android/manifest index bf065cc..2fe7af4 100644 --- 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 index 8a5844c..5f7a38f 100644 --- a/android/platform/android/res/values/version.xml +++ b/android/platform/android/res/values/version.xml @@ -1,4 +1,4 @@ - 6171000 - \ No newline at end of file + 7895000 + 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 deleted file mode 100644 index 563d4d6..0000000 Binary files a/test/modules/android/analytics.google/3.1.0/lib/google-play-services.jar and /dev/null differ diff --git a/test/modules/android/analytics.google/3.1.0/LICENSE b/test/modules/android/analytics.google/3.2.0/LICENSE similarity index 100% rename from test/modules/android/analytics.google/3.1.0/LICENSE rename to test/modules/android/analytics.google/3.2.0/LICENSE diff --git a/test/modules/android/analytics.google/3.1.0/analytics.google.jar b/test/modules/android/analytics.google/3.2.0/analytics.google.jar similarity index 71% rename from test/modules/android/analytics.google/3.1.0/analytics.google.jar rename to test/modules/android/analytics.google/3.2.0/analytics.google.jar index 044a9bd..02c7039 100644 Binary files a/test/modules/android/analytics.google/3.1.0/analytics.google.jar and b/test/modules/android/analytics.google/3.2.0/analytics.google.jar differ diff --git a/test/modules/android/analytics.google/3.1.0/documentation/index.html b/test/modules/android/analytics.google/3.2.0/documentation/index.html similarity index 100% rename from test/modules/android/analytics.google/3.1.0/documentation/index.html rename to test/modules/android/analytics.google/3.2.0/documentation/index.html diff --git a/test/modules/android/analytics.google/3.1.0/example/app.js b/test/modules/android/analytics.google/3.2.0/example/app.js similarity index 97% rename from test/modules/android/analytics.google/3.1.0/example/app.js rename to test/modules/android/analytics.google/3.2.0/example/app.js index 8b2d248..684419f 100644 --- a/test/modules/android/analytics.google/3.1.0/example/app.js +++ b/test/modules/android/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 new file mode 100644 index 0000000..d20ef78 Binary files /dev/null and b/test/modules/android/analytics.google/3.2.0/lib/google-play-services.jar differ diff --git a/test/modules/android/analytics.google/3.1.0/manifest b/test/modules/android/analytics.google/3.2.0/manifest similarity index 93% rename from test/modules/android/analytics.google/3.1.0/manifest rename to test/modules/android/analytics.google/3.2.0/manifest index bf065cc..5dde7b9 100644 --- a/test/modules/android/analytics.google/3.1.0/manifest +++ b/test/modules/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/test/modules/android/analytics.google/3.1.0/platform/android/res/values/version.xml b/test/modules/android/analytics.google/3.2.0/platform/android/res/values/version.xml similarity index 100% rename from test/modules/android/analytics.google/3.1.0/platform/android/res/values/version.xml rename to test/modules/android/analytics.google/3.2.0/platform/android/res/values/version.xml diff --git a/test/modules/android/analytics.google/3.1.0/timodule.xml b/test/modules/android/analytics.google/3.2.0/timodule.xml similarity index 100% rename from test/modules/android/analytics.google/3.1.0/timodule.xml rename to test/modules/android/analytics.google/3.2.0/timodule.xml