Skip to content

Commit

Permalink
Merge pull request #55 from sgtcoolguy/v8-update
Browse files Browse the repository at this point in the history
[TIMOB-23596] Android: Recompile ti.facebook module against latest SDK
  • Loading branch information
sgtcoolguy committed Jul 11, 2016
2 parents 69a1edb + 1f70b21 commit 11af157
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 9 deletions.
16 changes: 11 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,22 @@
language: objective-c
osx_image: xcode7.1
osx_image: xcode7.3
env:
global:
- "MODULE_NAME=facebook"
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 -s "--branch 5_1_X"
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 #change this to appcelerator-modules once PR has been merged
- 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
Expand Down
8 changes: 4 additions & 4 deletions android/manifest
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
# this is your module manifest and used by Titanium
# during compilation, packaging, distribution, etc.
#
version: 5.2.0
apiversion: 2
architectures: armeabi armeabi-v7a x86
version: 6.0.0
apiversion: 3
architectures: armeabi-v7a x86
description: facebook
author: Mark Mokryn and Ashraf A. S. (Appcelerator)
license: Apache License Version 2.0
Expand All @@ -16,4 +16,4 @@ name: Facebook
moduleid: facebook
guid: e4f7ac61-1ee7-44c5-bc27-fa6876e2dce9
platform: android
minsdk: 5.0.0.GA
minsdk: 6.0.0

0 comments on commit 11af157

Please sign in to comment.