diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..cedc6d3 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,12 @@ +language: objective-c +osx_image: xcode10.2 +xcode_workspace: TunnelKit.xcworkspace +xcode_scheme: TunnelKit-iOS +xcode_destination: platform=iOS Simulator,OS=12.2,name=iPhone 8 Plus +cache: + - bundler + - cocoapods +install: + - bundle install --jobs=3 --deployment --path=${BUNDLE_PATH:-vendor/bundle} + - bundle exec pod repo update + - travis_wait 20 bundle exec pod install diff --git a/Gemfile b/Gemfile index 61dfe75..bbf0fbf 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,3 @@ source "https://rubygems.org" -gem "cocoapods", "~> 1.6" +gem "cocoapods", "~> 1.6.0" diff --git a/Gemfile.lock b/Gemfile.lock index e498e79..a2aec17 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,17 +2,17 @@ GEM remote: https://rubygems.org/ specs: CFPropertyList (3.0.0) - activesupport (4.2.11) + activesupport (4.2.11.1) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) atomos (0.1.3) claide (1.0.2) - cocoapods (1.6.1) + cocoapods (1.6.2) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.6.1) + cocoapods-core (= 1.6.2) cocoapods-deintegrate (>= 1.0.2, < 2.0) cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -28,11 +28,11 @@ GEM nap (~> 1.0) ruby-macho (~> 1.4) xcodeproj (>= 1.8.1, < 2.0) - cocoapods-core (1.6.1) + cocoapods-core (1.6.2) activesupport (>= 4.0.2, < 6) fuzzy_match (~> 2.0.4) nap (~> 1.0) - cocoapods-deintegrate (1.0.3) + cocoapods-deintegrate (1.0.4) cocoapods-downloader (1.2.2) cocoapods-plugins (1.0.0) nap @@ -43,7 +43,7 @@ GEM netrc (~> 0.11) cocoapods-try (1.1.0) colored2 (3.1.2) - concurrent-ruby (1.1.4) + concurrent-ruby (1.1.5) escape (0.0.4) fourflusher (2.2.0) fuzzy_match (2.0.4) @@ -59,7 +59,7 @@ GEM thread_safe (0.3.6) tzinfo (1.2.5) thread_safe (~> 0.1) - xcodeproj (1.8.1) + xcodeproj (1.9.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) @@ -70,7 +70,7 @@ PLATFORMS ruby DEPENDENCIES - cocoapods (~> 1.6) + cocoapods (~> 1.6.0) BUNDLED WITH 1.17.2 diff --git a/Podfile b/Podfile index 0ef3aba..8605fe6 100644 --- a/Podfile +++ b/Podfile @@ -1,12 +1,15 @@ source 'https://github.com/CocoaPods/Specs.git' use_frameworks! -abstract_target 'TunnelKit' do +def shared_pods pod 'SwiftyBeaver' pod 'OpenSSL-Apple', '~> 1.1.0j.2' +end +abstract_target 'TunnelKit' do target 'TunnelKit-iOS' do platform :ios, '11.0' + shared_pods end target 'TunnelKitTests-iOS' do platform :ios, '11.0' @@ -17,6 +20,7 @@ abstract_target 'TunnelKit' do target 'TunnelKit-macOS' do platform :osx, '10.11' + shared_pods end target 'TunnelKitTests-macOS' do platform :osx, '10.11' diff --git a/Podfile.lock b/Podfile.lock index 689a921..0e0bdfe 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -15,6 +15,6 @@ SPEC CHECKSUMS: OpenSSL-Apple: e88e1eb314acb4a05e2348069790c4aa49f6d319 SwiftyBeaver: 4cc0080d2e23f980652e28978db11a5c9da39165 -PODFILE CHECKSUM: dc55526966bd4c25d125b4d7bd2e0d70a75d4abd +PODFILE CHECKSUM: 2c211e625a970d8de7fd272e68aa83bdef7599e1 -COCOAPODS: 1.6.1 +COCOAPODS: 1.6.2 diff --git a/ci/set_version.sh b/ci/set-version.sh similarity index 100% rename from ci/set_version.sh rename to ci/set-version.sh