Skip to content

Commit

Permalink
Merge pull request #4 from ashcoding/pr3
Browse files Browse the repository at this point in the history
Pr3
  • Loading branch information
ashcoding committed Mar 8, 2016
2 parents 2d97abe + 75add27 commit a81edb1
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 5 deletions.
8 changes: 7 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,19 @@
language: objective-c
osx_image: xcode7.1
env:
global:
- "MODULE_NAME=ti.crypto"
before_install:
- MODULE_ROOT=$PWD
- brew update
- brew outdated caskroom/cask/brew-cask || brew upgrade caskroom/cask/brew-cask
- brew tap caskroom/versions
- sudo rm -rf /Library/Java/JavaVirtualMachines
- brew cask install caskroom/versions/java7
install:
- cd $MODULE_ROOT
- curl -o install.sh https://raw.githubusercontent.com/appcelerator-modules/ci/master/travis/install.sh
- source install.sh -s 3.2.2.GA
- source install.sh -s "--branch 5_1_X"
script:
- curl -o script.sh https://raw.githubusercontent.com/appcelerator-modules/ci/master/travis/script.sh
- source script.sh
Expand Down
4 changes: 2 additions & 2 deletions ios/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -150,10 +150,10 @@ def glob_libfiles():
return files

def build_module(manifest,config):
rc = os.system("xcodebuild -sdk iphoneos -configuration Release")
rc = os.system("xcodebuild -sdk iphoneos -configuration Release OTHER_CFLAGS=\"-fembed-bitcode\" CLANG_ENABLE_MODULE_DEBUGGING=NO GCC_PRECOMPILE_PREFIX_HEADER=NO DEBUG_INFORMATION_FORMAT=\"DWARF with dSYM\"")
if rc != 0:
die("xcodebuild failed")
rc = os.system("xcodebuild -sdk iphonesimulator -configuration Release")
rc = os.system("xcodebuild -sdk iphonesimulator -configuration Release OTHER_CFLAGS=\"-fembed-bitcode\" CLANG_ENABLE_MODULE_DEBUGGING=NO GCC_PRECOMPILE_PREFIX_HEADER=NO DEBUG_INFORMATION_FORMAT=\"DWARF with dSYM\"")
if rc != 0:
die("xcodebuild failed")
# build the merged library using lipo
Expand Down
2 changes: 1 addition & 1 deletion ios/manifest
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ name: crypto
moduleid: ti.crypto
guid: 5041eaca-a895-4229-a44b-de2f582c9133
platform: iphone
minsdk: 3.3.0.GA
minsdk: 5.1.0
2 changes: 1 addition & 1 deletion ios/titanium.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// OF YOUR TITANIUM SDK YOU'RE BUILDING FOR
//
//
TITANIUM_SDK_VERSION = 3.3.0.GA
TITANIUM_SDK_VERSION = 5.1.2.GA


//
Expand Down

0 comments on commit a81edb1

Please sign in to comment.