diff --git a/.swift-version b/.swift-version index 7d5c902e7..bf77d5496 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -4.1 +4.2 diff --git a/.travis.yml b/.travis.yml index 574bfb707..e6b90703d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -osx_image: xcode9.3 +osx_image: xcode10.1 language: generic matrix: include: @@ -6,31 +6,14 @@ matrix: sudo: required env: TYPE=podspec - os: osx - env: TYPE=ios NIMBLE_RUNTIME_IOS_SDK_VERSION=11.3 + env: TYPE=ios - os: osx - env: TYPE=tvos NIMBLE_RUNTIME_TVOS_SDK_VERSION=11.3 + env: TYPE=tvos - os: osx env: TYPE=macos - - os: osx - env: TYPE=macos - osx_image: xcode9.4 - - os: osx - env: TYPE=macos - osx_image: xcode10.1 - - os: osx - env: - - TYPE=swiftpm - os: osx env: - TYPE=swiftpm - osx_image: xcode10.1 - - os: linux - dist: trusty - sudo: required - env: - - TYPE=swiftpm - install: - - eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)" - os: linux dist: trusty sudo: required @@ -48,6 +31,9 @@ matrix: # install: # - eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)" install: - - if [[ "$TYPE" == "podspec" ]]; then sudo gem install bundler; bundle install; fi + - if [[ "$TYPE" == "podspec" ]]; then bundle install; fi script: - ./test $TYPE + +notifications: + email: false diff --git a/Gemfile b/Gemfile index eca921945..206f10938 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,4 @@ # A sample Gemfile source "https://rubygems.org" -gem 'cocoapods', '1.5.0' +gem 'cocoapods', '~> 1.6.0.rc.2' diff --git a/Gemfile.lock b/Gemfile.lock index 36a083949..cc03cbf93 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,75 +2,75 @@ GEM remote: https://rubygems.org/ specs: CFPropertyList (3.0.0) - activesupport (4.2.10) + activesupport (4.2.11) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - atomos (0.1.2) + atomos (0.1.3) claide (1.0.2) - cocoapods (1.5.0) + cocoapods (1.6.0.rc.2) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.5.0) + cocoapods-core (= 1.6.0.rc.2) cocoapods-deintegrate (>= 1.0.2, < 2.0) - cocoapods-downloader (>= 1.2.0, < 2.0) + cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) cocoapods-search (>= 1.0.0, < 2.0) cocoapods-stats (>= 1.0.0, < 2.0) - cocoapods-trunk (>= 1.3.0, < 2.0) + cocoapods-trunk (>= 1.3.1, < 2.0) cocoapods-try (>= 1.1.0, < 2.0) colored2 (~> 3.1) escape (~> 0.0.4) - fourflusher (~> 2.0.1) + fourflusher (>= 2.2.0, < 3.0) gh_inspector (~> 1.0) - molinillo (~> 0.6.5) + molinillo (~> 0.6.6) nap (~> 1.0) - ruby-macho (~> 1.1) - xcodeproj (>= 1.5.7, < 2.0) - cocoapods-core (1.5.0) + ruby-macho (~> 1.3, >= 1.3.1) + xcodeproj (>= 1.8.0, < 2.0) + cocoapods-core (1.6.0.rc.2) activesupport (>= 4.0.2, < 6) fuzzy_match (~> 2.0.4) nap (~> 1.0) cocoapods-deintegrate (1.0.2) - cocoapods-downloader (1.2.0) + cocoapods-downloader (1.2.2) cocoapods-plugins (1.0.0) nap cocoapods-search (1.0.0) - cocoapods-stats (1.0.0) - cocoapods-trunk (1.3.0) + cocoapods-stats (1.1.0) + cocoapods-trunk (1.3.1) nap (>= 0.8, < 2.0) netrc (~> 0.11) cocoapods-try (1.1.0) colored2 (3.1.2) - concurrent-ruby (1.0.5) + concurrent-ruby (1.1.4) escape (0.0.4) - fourflusher (2.0.1) + fourflusher (2.2.0) fuzzy_match (2.0.4) gh_inspector (1.1.3) i18n (0.9.5) concurrent-ruby (~> 1.0) minitest (5.11.3) - molinillo (0.6.5) - nanaimo (0.2.5) + molinillo (0.6.6) + nanaimo (0.2.6) nap (1.1.0) netrc (0.11.0) - ruby-macho (1.1.0) + ruby-macho (1.3.1) thread_safe (0.3.6) tzinfo (1.2.5) thread_safe (~> 0.1) - xcodeproj (1.5.7) + xcodeproj (1.8.0) CFPropertyList (>= 2.3.3, < 4.0) - atomos (~> 0.1.2) + atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) - nanaimo (~> 0.2.4) + nanaimo (~> 0.2.6) PLATFORMS ruby DEPENDENCIES - cocoapods (= 1.5.0) + cocoapods (~> 1.6.0.rc.2) BUNDLED WITH - 1.16.1 + 1.17.2 diff --git a/Nimble.podspec b/Nimble.podspec index 51b3868d0..a5773d584 100644 --- a/Nimble.podspec +++ b/Nimble.podspec @@ -50,4 +50,7 @@ Pod::Spec.new do |s| 'OTHER_SWIFT_FLAGS' => '$(inherited) -suppress-warnings', 'FRAMEWORK_SEARCH_PATHS' => '$(inherited) "$(PLATFORM_DIR)/Developer/Library/Frameworks"', } + + s.cocoapods_version = '>= 1.4.0' + s.swift_version = '4.2' end diff --git a/Nimble.xcodeproj/project.pbxproj b/Nimble.xcodeproj/project.pbxproj index d93ff0c27..2bf9a6a97 100644 --- a/Nimble.xcodeproj/project.pbxproj +++ b/Nimble.xcodeproj/project.pbxproj @@ -1862,7 +1862,7 @@ SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; TVOS_DEPLOYMENT_TARGET = 9.0; VERSIONING_SYSTEM = "apple-generic"; @@ -1920,7 +1920,7 @@ SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; TVOS_DEPLOYMENT_TARGET = 9.0; VALIDATE_PRODUCT = YES; diff --git a/Package.swift b/Package.swift index ea6b43e82..dfa622666 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:4.0 +// swift-tools-version:4.2 import PackageDescription let package = Package( @@ -17,5 +17,5 @@ let package = Package( exclude: ["objc"] ), ], - swiftLanguageVersions: [4] + swiftLanguageVersions: [.v4_2] ) diff --git a/Package@swift-4.2.swift b/Package@swift-4.2.swift deleted file mode 100644 index 1974123bd..000000000 --- a/Package@swift-4.2.swift +++ /dev/null @@ -1,21 +0,0 @@ -// swift-tools-version:4.2 -import PackageDescription - -let package = Package( - name: "Nimble", - products: [ - .library(name: "Nimble", targets: ["Nimble"]), - ], - targets: [ - .target( - name: "Nimble", - dependencies: [] - ), - .testTarget( - name: "NimbleTests", - dependencies: ["Nimble"], - exclude: ["objc"] - ), - ], - swiftLanguageVersions: [.v4, .v4_2] -) diff --git a/test b/test index 8c5a4e4fe..c213afe21 100755 --- a/test +++ b/test @@ -78,7 +78,7 @@ function test_podspec { # `.swift-version` is for swiftenv, not for CocoaPods, so we can't remove the file as suggested. run mv .swift-version .swift-version.backup # Note: remove `--allow-warnings` once old Matcher API has been removed - run bundle exec pod lib lint Nimble.podspec --allow-warnings + run bundle exec pod lib lint Nimble.podspec --allow-warnings --skip-import-validation run mv .swift-version.backup .swift-version }