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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TIMOB-19794] Android: Recompile with NDK r11c #31

Closed
wants to merge 1 commit into from
Closed
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
18 changes: 13 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,24 @@
language: objective-c
osx_image: xcode7.3
env:
global:
- "MODULE_NAME=appcelerator.https"
- TRAVIS_NODE_VERSION="4"
before_install:
- MODULE_ROOT=$PWD
- brew update
- brew install nvm
- source $(brew --prefix nvm)/nvm.sh
- nvm install 4
- npm config delete prefix
- nvm use --delete-prefix v4.4.7 4
install:
- cd $MODULE_ROOT
- curl -o install.sh https://raw.githubusercontent.com/appcelerator-modules/ci/master/travis/install.sh
- source install.sh
script:
- curl -o script.sh https://raw.githubusercontent.com/appcelerator-modules/ci/master/travis/script.sh
- curl -o install.sh https://raw.githubusercontent.com/sgtcoolguy/ci/v8/travis/install.sh
- source install.sh -s "--branch master"
script:
- curl -o script.sh https://raw.githubusercontent.com/sgtcoolguy/ci/v8/travis/script.sh
- source script.sh
after_success: # and this only on success
- curl -o deploy.sh https://raw.githubusercontent.com/appcelerator-modules/ci/master/travis/deploy.sh
- source deploy.sh
- source deploy.sh
8 changes: 4 additions & 4 deletions android/manifest
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version: 1.1.3
apiversion: 2
architectures: armeabi armeabi-v7a x86
version: 2.0.0
apiversion: 3
architectures: armeabi-v7a x86
description: Authenticate server in HTTPS connections made by TiHTTPClient
author: Matt Langston
license: Appcelerator Commercial License
Expand All @@ -10,4 +10,4 @@ name: https
moduleid: appcelerator.https
guid: 2163621d-1a78-4215-8244-bda08724ffed
platform: android
minsdk: 5.0.0
minsdk: 6.0.0
2 changes: 2 additions & 0 deletions documentation/changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Change Log
<pre>
v2.0.0 [TIMOB-19794] Android: Recompile Native modules against latest LTS of V8 library

v1.1.3 [TIMOB-19729] Rebuilding binary for Android 23 SDK. No changes to code.

v1.1.2 [TIMOB-18129] Parity in handling Man In the Middle Attack
Expand Down
2 changes: 1 addition & 1 deletion iphone/manifest
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: 1.1.3
version: 2.0.0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need to bump for iOS, changes affect on android half.

apiversion: 2
architectures: armv7 i386 x86_64 arm64
description: Authenticate server in HTTPS connections made by TiHTTPClient
Expand Down