diff --git a/.travis.yml b/.travis.yml index 105066e..5b1f249 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/ios/build.py b/ios/build.py index 8d09378..ef03a99 100755 --- a/ios/build.py +++ b/ios/build.py @@ -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 diff --git a/ios/manifest b/ios/manifest index 961ee35..2eb809d 100644 --- a/ios/manifest +++ b/ios/manifest @@ -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 diff --git a/ios/titanium.xcconfig b/ios/titanium.xcconfig index 8a825b6..42086c7 100644 --- a/ios/titanium.xcconfig +++ b/ios/titanium.xcconfig @@ -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 //