Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TIMOB-18092] Rebuild modules for 64-bit architectures #23

Merged
merged 3 commits into from
Dec 9, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion android/manifest
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Binary file removed appcelerator.https-titanium-1.0.0.zip
Binary file not shown.
4 changes: 0 additions & 4 deletions documentation/ChangeLog

This file was deleted.

7 changes: 7 additions & 0 deletions documentation/changelog.md
Original file line number Diff line number Diff line change
@@ -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
5 changes: 3 additions & 2 deletions iphone/manifest
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion iphone/titanium.xcconfig
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion manifest
Original file line number Diff line number Diff line change
@@ -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
Expand Down