Merge pull request #23 from muhammaddadu/TIMOB-18092

[TIMOB-18092] Rebuild modules for 64-bit architectures
tidev · Dec 9, 2014 · 00598db · 00598db
2 parents 125036b + 22aac95
commit 00598db
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,7 +7,7 @@ before_install:
 install:
     - cd $MODULE_ROOT
     - curl -o install.sh https://raw.githubusercontent.com/appcelerator-modules/ci/master/travis/install.sh
-    - source install.sh -s 3.3.0.GA
+    - source install.sh
 script: 
     - curl -o script.sh https://raw.githubusercontent.com/appcelerator-modules/ci/master/travis/script.sh
     - source script.sh

diff --git a/android/manifest b/android/manifest
@@ -1,5 +1,6 @@
-version: 1.0.0
+version: 1.1.1
 apiversion: 2
+architectures: armeabi armeabi-v7a x86
 description: Authenticate server in HTTPS connections made by TiHTTPClient
 author: Matt Langston
 license: Appcelerator Commercial License

diff --git a/appcelerator.https-titanium-1.0.0.zip b/appcelerator.https-titanium-1.0.0.zip
diff --git a/documentation/ChangeLog b/documentation/ChangeLog
diff --git a/documentation/changelog.md b/documentation/changelog.md
@@ -0,0 +1,7 @@
+# Change Log
+<pre>
+v1.1.1 [TIMOB-18144] Update manifest with architectures
+
+v1.1.0 [TIMOB-18092] iOS: add 64 bit support
+
+v1.0.0	Initial Release
diff --git a/iphone/manifest b/iphone/manifest
@@ -1,5 +1,6 @@
-version: 1.1.0
+version: 1.1.1
 apiversion: 2
+architectures: armv7 i386 x86_64 arm64
 description: Authenticate server in HTTPS connections made by TiHTTPClient
 author: Matt Langston
 license: Appcelerator Commercial License
@@ -9,4 +10,4 @@ name: https
 moduleid: appcelerator.https
 guid: 2163621d-1a78-4215-8244-bda08724ffed
 platform: iphone
-minsdk: 3.3.0.GA
+minsdk: 3.4.1.GA
diff --git a/iphone/titanium.xcconfig b/iphone/titanium.xcconfig
@@ -1,5 +1,5 @@
 //GCC_PREPROCESSOR_DEFINITIONS = USE_TI_NETWORK;
-TITANIUM_SDK_VERSION = 3.3.0.GA
+TITANIUM_SDK_VERSION = 3.4.1.GA
 TITANIUM_SDK_DIR = "~/Library/Application Support/Titanium/mobilesdk/osx/$(TITANIUM_SDK_VERSION)"
 TITANIUM_SDK_INCLUDE1 = $(TITANIUM_SDK_DIR)/iphone/include
 TITANIUM_SDK_INCLUDE2 = $(TITANIUM_SDK_DIR)/iphone/include/APSHTTPClient

diff --git a/manifest b/manifest
@@ -1,4 +1,4 @@
-version: 1.0.0
+version: 1.1.1
 apiversion: 2
 description: Authenticate server in HTTPS connections made by TiHTTPClient
 author: Matt Langston