Merge pull request #201 from mattrubin/next

Xcode 10 and Swift 4.2

.swift-version

@@ -1 +1 @@
-4.0
+4.2

.travis.yml

@@ -5,59 +5,35 @@ language: objective-c
 xcode_workspace: OneTimePassword.xcworkspace
 xcode_scheme: OneTimePassword (iOS)
 
-osx_image: xcode10
+osx_image: xcode10.1
 
 env:
+  - RUNTIME="iOS 8.4"  DEVICE="iPhone 4s"
+  - RUNTIME="iOS 9.3"  DEVICE="iPhone 6s"
   - RUNTIME="iOS 10.3" DEVICE="iPhone 7 Plus"
-  - RUNTIME="iOS 11.3" DEVICE="iPhone X"
-  - RUNTIME="iOS 12.0" DEVICE="iPhone XS Max"
+  - RUNTIME="iOS 11.4" DEVICE="iPhone X"
+  - RUNTIME="iOS 12.1" DEVICE="iPhone XS Max"
 
 # Include builds for watchOS
 matrix:
   include:
-    # Include an Xcode 9.0 build to test Swift 4.0 support
-    - osx_image: xcode9
-      env: RUNTIME="iOS 11.0" DEVICE="iPhone 8"
-    # Include an Xcode 9.2 build to test on iOS 8.x, because Xcode 9.3's iOS 8 simulator fails to launch
-    - osx_image: xcode9.2
-      env: RUNTIME="iOS 8.4"  DEVICE="iPhone 4s"
-    # Include an Xcode 9.4 build to ensure compatibility until Xcode 10 is in widespread use
-    - osx_image: xcode9.4
-      env: RUNTIME="iOS 9.3"  DEVICE="iPhone 6s"
     # Include several build-only jobs for watchOS
     - xcode_scheme: OneTimePassword (watchOS)
-      env: BUILD_ONLY="YES" RUNTIME="watchOS 5.0" DEVICE="Apple Watch Series 4 - 44mm"
+      env: BUILD_ONLY="YES" RUNTIME="watchOS 5.1" DEVICE="Apple Watch Series 4 - 44mm"
     - xcode_scheme: OneTimePassword (watchOS)
-      osx_image: xcode9.4
-      env: BUILD_ONLY="YES" RUNTIME="watchOS 4.3" DEVICE="Apple Watch Series 3 - 38mm"
+      env: BUILD_ONLY="YES" RUNTIME="watchOS 4.2" DEVICE="Apple Watch Series 3 - 38mm"
     - xcode_scheme: OneTimePassword (watchOS)
       env: BUILD_ONLY="YES" RUNTIME="watchOS 3.2" DEVICE="Apple Watch Series 2 - 42mm"
     - xcode_scheme: OneTimePassword (watchOS)
       env: BUILD_ONLY="YES" RUNTIME="watchOS 2.0" DEVICE="Apple Watch - 38mm"
-    # Include Carthage builds
+    # Build with Carthage
     - env:
       before_script:
       script: carthage build --no-skip-current
-    - osx_image: xcode9
-      env:
-      before_script:
-      script: carthage build --no-skip-current
-    # Include CocoaPods builds
+    # Build with CocoaPods
     - env:
       before_script:
       script: pod lib lint --allow-warnings
-    - osx_image: xcode9
-      env:
-      before_install: gem update cocoapods
-      before_script:
-      script: pod lib lint --allow-warnings --verbose
-  allow_failures:
-    # Allow the Xcode 9 `pod lib lint` to fail, as this test method currently has an issue using the custom CommonCrypto module maps.
-    - osx_image: xcode9
-      env:
-      before_install: gem update cocoapods
-      before_script:
-      script: pod lib lint --allow-warnings --verbose
 
 before_script:
   - DEVICE_ID=com.apple.CoreSimulator.SimDeviceType.$(echo $DEVICE | sed -E -e "s/[ \-]+/ /g" -e "s/[^[:alnum:]]/-/g")

Configuration/OneTimePassword.xcconfig

@@ -3,11 +3,3 @@ PRODUCT_BUNDLE_IDENTIFIER = me.mattrubin.onetimepassword;
 INFOPLIST_FILE = Sources/Info.plist;
 
 SWIFT_INSTALL_OBJC_HEADER = NO;
-
-SWIFT_INCLUDE_PATHS[sdk=appletvos*] = $(SRCROOT)/CommonCrypto/appletvos;
-SWIFT_INCLUDE_PATHS[sdk=appletvsimulator*] = $(SRCROOT)/CommonCrypto/appletvsimulator;
-SWIFT_INCLUDE_PATHS[sdk=iphoneos*] = $(SRCROOT)/CommonCrypto/iphoneos;
-SWIFT_INCLUDE_PATHS[sdk=iphonesimulator*] = $(SRCROOT)/CommonCrypto/iphonesimulator;
-SWIFT_INCLUDE_PATHS[sdk=macosx*] = $(SRCROOT)/CommonCrypto/macosx;
-SWIFT_INCLUDE_PATHS[sdk=watchos*] = $(SRCROOT)/CommonCrypto/watchos;
-SWIFT_INCLUDE_PATHS[sdk=watchsimulator*] = $(SRCROOT)/CommonCrypto/watchsimulator;

OneTimePassword.podspec

@@ -5,27 +5,11 @@ Pod::Spec.new do |s|
   s.homepage     = "https://github.com/mattrubin/OneTimePassword"
   s.license      = "MIT"
   s.author       = "Matt Rubin"
-  s.swift_version             = "4.0"
+  s.swift_version             = "4.2"
   s.ios.deployment_target     = "8.0"
   s.watchos.deployment_target = "2.0"
   s.source       = { :git => "https://github.com/mattrubin/OneTimePassword.git", :tag => s.version }
   s.source_files = "Sources/*.{swift}"
   s.requires_arc = true
   s.dependency "Base32", "~> 1.1.2"
-  s.pod_target_xcconfig = {
-    "SWIFT_INCLUDE_PATHS[sdk=appletvos*]"         => "$(SRCROOT)/OneTimePassword/CommonCrypto/appletvos",
-    "SWIFT_INCLUDE_PATHS[sdk=appletvsimulator*]"  => "$(SRCROOT)/OneTimePassword/CommonCrypto/appletvsimulator",
-    "SWIFT_INCLUDE_PATHS[sdk=iphoneos*]"          => "$(SRCROOT)/OneTimePassword/CommonCrypto/iphoneos",
-    "SWIFT_INCLUDE_PATHS[sdk=iphonesimulator*]"   => "$(SRCROOT)/OneTimePassword/CommonCrypto/iphonesimulator",
-    "SWIFT_INCLUDE_PATHS[sdk=macosx*]"            => "$(SRCROOT)/OneTimePassword/CommonCrypto/macosx",
-    "SWIFT_INCLUDE_PATHS[sdk=watchos*]"           => "$(SRCROOT)/OneTimePassword/CommonCrypto/watchos",
-    "SWIFT_INCLUDE_PATHS[sdk=watchsimulator*]"    => "$(SRCROOT)/OneTimePassword/CommonCrypto/watchsimulator",
-  }
-  s.preserve_paths = "CommonCrypto/*"
-  # The prepare_command "will be executed after the Pod is downloaded."
-  # The script is *not* run on every build, or even on every `pod install`, so if the selected
-  # Xcode path changes after the pod is downloaded, you may need to clear the pod from the cache at
-  # ~/Library/Caches/CocoaPods so the script can update the modulemaps with the new path.
-  # https://guides.cocoapods.org/syntax/podspec.html#prepare_command
-  s.prepare_command = "CommonCrypto/injectXcodePath.sh"
 end