Merge branch 'release/2.1'

obscure-com · Jan 15, 2015 · bb160c7 · bb160c7
2 parents 0c31916 + 4c49c36
commit bb160c7
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/mobile/android/manifest b/mobile/android/manifest
@@ -3,7 +3,6 @@
 # during compilation, packaging, distribution, etc.
 #
 version: 2.1
-architectures: armeabi armeabi-v7a x86
 apiversion: 2
 description: Keychain access module for iPhone
 author: Paul Mietz Egli
@@ -16,4 +15,5 @@ name: keychain
 moduleid: com.obscure.keychain
 guid: eb0a9be8-02b5-43a2-a115-a220b293d202
 platform: android
-minsdk: 3.5.0.Beta
+minsdk: 3.5.0.GA
+architectures: armeabi armeabi-v7a x86
diff --git a/mobile/ios/manifest b/mobile/ios/manifest
@@ -1,5 +1,4 @@
 version: 2.1
-architectures: armv7 arm64 i386 x86_64
 description: Keychain access module for iPhone
 author: Paul Mietz Egli
 license: Apache 2.0
@@ -11,4 +10,5 @@ name: keychain
 moduleid: com.obscure.keychain
 guid: acf8434d-5290-4b73-8f39-e4cd7349860a
 platform: iphone
-minsdk: 3.5.0.Beta
+minsdk: 3.5.0.GA
+architectures: armv7 arm64 i386 x86_64
diff --git a/mobile/ios/titanium.xcconfig b/mobile/ios/titanium.xcconfig
@@ -4,7 +4,7 @@
 // OF YOUR TITANIUM SDK YOU'RE BUILDING FOR
 //
 //
-TITANIUM_SDK_VERSION = 3.5.0.Beta
+TITANIUM_SDK_VERSION = 3.5.0.GA
 
 
 // 

diff --git a/mobile/noarch/testapp/tiapp.xml b/mobile/noarch/testapp/tiapp.xml
@@ -50,5 +50,5 @@
 		<target device="iphone">true</target>
 		<target device="mobileweb">false</target>
 	</deployment-targets>
-	<sdk-version>3.5.0.Beta</sdk-version>
-</ti:app>
+	<sdk-version>3.5.0.GA</sdk-version>
+</ti:app>