Merge pull request #19 from ashcoding/MOD-2166

[MOD-2166] (stable) Android: Recompiled binary for Android 6.0 support
tidev · Nov 25, 2015 · 5b26bb6 · 5b26bb6
2 parents 6cf92fd + 8849f13
commit 5b26bb6
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/android/dist/ti.imagefactory-android-2.2.1.zip b/android/dist/ti.imagefactory-android-2.2.1.zip
diff --git a/android/dist/ti.imagefactory-android-2.2.2.zip b/android/dist/ti.imagefactory-android-2.2.2.zip
diff --git a/android/documentation/changelog.md b/android/documentation/changelog.md
@@ -1,5 +1,7 @@
 # Change Log
 <pre>
+v2.2.2	[MOD-2166] Recompiled module to solve crashes in Android 6.0
+
 v2.2.1	[MOD-940] Building with 2.1.3.GA and open sourcing
 
 v2.2	[MOD-447] Introduced "format" property. Default format is now JPEG, allowing for compression. Check out documentation to learn more.

diff --git a/android/manifest b/android/manifest
@@ -2,8 +2,9 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 2.2.1
+version: 2.2.2
 apiversion: 2
+architectures: armeabi armeabi-v7a x86
 description: Image Factory
 author: Jeff English
 license: Apache License, Version 2.0
@@ -15,4 +16,4 @@ name: imagefactory
 moduleid: ti.imagefactory
 guid: 0aab25d7-0486-40ab-94a3-ed4f9a293414
 platform: android
-minsdk: 3.2.2.GA
+minsdk: 4.0.0.GA