diff --git a/.travis.yml b/.travis.yml index b1f35e3..92244a2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: objective-c os: osx -osx_image: xcode12.0 +osx_image: xcode12 notifications: email: false @@ -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" @@ -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 diff --git a/Podfile b/Podfile index f3588f5..1013f56 100644 --- a/Podfile +++ b/Podfile @@ -1,6 +1,3 @@ -source 'https://github.com/CocoaPods/Specs' - - def thridparty pod 'SSZipArchive', '~> 2.2' end diff --git a/XlsxReaderWriter.xcodeproj/project.pbxproj b/XlsxReaderWriter.xcodeproj/project.pbxproj index 1e6d9a7..af0e48d 100644 --- a/XlsxReaderWriter.xcodeproj/project.pbxproj +++ b/XlsxReaderWriter.xcodeproj/project.pbxproj @@ -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;