Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
* develop:
  Update .travis.yml
  Update .travis.yml
  Update .travis.yml
  Reverted custom bundle install
  Setup cocoapods on Travis to speed up things
  Fixed typo
  Removed pod dir
  Removed source from PodFile (travis)
  Another attenpts to fix cocoapods
  Fix strict ssh
  Added -oBjC flag
  Fixed travis source
  Remove git pull/fetch
  Added pod setup
  Travis pod repo update via git
  Removed outdated
  Fixed travis cocoapods
  Fixed test and cahching cocoapods in .travis
  • Loading branch information
charlymr committed Nov 2, 2020
2 parents 6523af9 + da8eacc commit ec655c8
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 9 deletions.
15 changes: 10 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: objective-c
os: osx
osx_image: xcode12.0
osx_image: xcode12
notifications:
email: false

Expand All @@ -10,8 +10,8 @@ env:
- LANG=en_US.UTF-8
- WORKSPACE=XlsxReaderWriter.xcworkspace
- IOS_SCHEME="XlsxReaderWriter"
- IOS_SDK=iphonesimulator14.1
- IOS_DEST="OS=14.1,name=iPhone 12"
- IOS_SDK=iphonesimulator14.0
- IOS_DEST="OS=14.0,name=iPhone 11"

matrix:
- DESTINATION="$IOS_DEST" SCHEME="$IOS_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES"
Expand All @@ -20,10 +20,15 @@ cache:
directories:
- $HOME/.cocoapods/

before_install:
- gem install cocoapods-acknowledgements
- gem install cocoapods
- pod setup
- pod repo update

script:
- set -o pipefail
- xcodebuild -version
- xcodebuild -showsdks
- source bundle.sh
- lbundle exex pod install
- pod install
- xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES test -enableCodeCoverage YES | xcpretty -c
3 changes: 0 additions & 3 deletions Podfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
source 'https://github.com/CocoaPods/Specs'


def thridparty
pod 'SSZipArchive', '~> 2.2'
end
Expand Down
5 changes: 4 additions & 1 deletion XlsxReaderWriter.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1881,7 +1881,10 @@
MACOSX_DEPLOYMENT_TARGET = 10.9;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "$(inherited)";
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
);
SDKROOT = iphoneos;
};
name = Debug;
Expand Down

0 comments on commit ec655c8

Please sign in to comment.