diff --git a/.travis.yml b/.travis.yml index 2e558c4cc..d74bd91e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -89,5 +89,28 @@ matrix: script: - cd iOS/SampleSwift - IPHONESIMULATOR=$(xcodebuild -showsdks | grep -o "iphonesimulator[0-9]\\+\\.[0-9]\\+$") - - travis_wait xcodebuild build -workspace SampleSwift.xcworkspace -scheme SampleSwift -sdk $IPHONESIMULATOR -quiet > ./build.log + - travis_wait 30 xcodebuild build -workspace SampleSwift.xcworkspace -scheme SampleSwift -sdk $IPHONESIMULATOR -quiet > ./build.log + - tail -100 ./build.log + + - language: objective-c + cache: + cocoapods: true + directories: + - $HOME/Library/Caches/CocoaPods/Pods/Release/ + + before_install: + - gem install cocoapods + - pod --version + - rm -f iOS/Tutorial/Podfile.lock + - rm -f iOS/Tutorial/build.log + - pod repo update --silent + + install: + - cd iOS/Tutorial + - travis_wait 30 pod install --silent + - cd ../../ + script: + - cd iOS/Tutorial + - IPHONESIMULATOR=$(xcodebuild -showsdks | grep -o "iphonesimulator[0-9]\\+\\.[0-9]\\+$") + - travis_wait 30 xcodebuild build -workspace Tutorial.xcworkspace -scheme Tutorial -sdk $IPHONESIMULATOR -quiet > ./build.log - tail -100 ./build.log diff --git a/docs/getting-started.md b/docs/getting-started.md index 55faeba73..fb5f54840 100644 --- a/docs/getting-started.md +++ b/docs/getting-started.md @@ -113,7 +113,7 @@ dependencies { ## Setup your iOS app -We support both Swift and Objective-C for Flipper with CocoaPods as build and distribution mechanism. For CocoaPods 1.7+ following is the configuration. +We support both Swift and Objective-C for Flipper with CocoaPods as build and distribution mechanism. For CocoaPods 1.9+ following is the configuration. ### CocoaPods @@ -147,7 +147,7 @@ target 'MyApp' do # installer.pod_targets.each do |pod| # if $static_framework.include?(pod.name) # def pod.build_type; - # Pod::Target::BuildType.static_library + # Pod::BuildType.static_library # end # end # end @@ -210,7 +210,7 @@ target 'MyApp' do # installer.pod_targets.each do |pod| # if $static_framework.include?(pod.name) # def pod.build_type; - # Pod::Target::BuildType.static_library + # Pod::BuildType.static_library # end # end # end @@ -547,7 +547,7 @@ Finally, open the Flipper desktop app, and run `yarn android` in your terminal. ### iOS -We support both Swift and Objective-C for Flipper with CocoaPods as build and distribution mechanism. For CocoaPods 1.7+, follow this configuration. +We support both Swift and Objective-C for Flipper with CocoaPods as build and distribution mechanism. For CocoaPods 1.9+, follow this configuration.