Release OneTimePassword 3.2.0

mattrubin · Sep 21, 2019 · ce76e15 · ce76e15
2 parents 8e32517 + 1a203dc
commit ce76e15
Show file tree

Hide file tree

Showing 39 changed files with 240 additions and 441 deletions.
diff --git a/.swift-version b/.swift-version
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -29,6 +29,8 @@ opt_in_rules:
   - implicit_return
   - implicitly_unwrapped_optional
   - joined_default_parameter
+  - last_where
+  - legacy_multiple
   - legacy_random
   - let_var_whitespace
   - literal_expression_end_indentation
@@ -38,13 +40,16 @@ opt_in_rules:
   - multiline_literal_brackets
   - multiline_parameters
   - nimble_operator
+  - nslocalizedstring_key
   - operator_usage_whitespace
   - overridden_super_call
   - override_in_extension
   - pattern_matching_keywords
   - private_action
   - private_outlet
+  - prohibited_interface_builder
   - prohibited_super_call
+  - reduce_into
   - redundant_nil_coalescing
   - single_test_class
   - sorted_first_last
@@ -53,14 +58,18 @@ opt_in_rules:
   - toggle_bool
   - unavailable_function
   - unneeded_parentheses_in_closure_argument
+  - unowned_variable_capture
   - untyped_error_in_catch
+  - unused_declaration
   - unused_import
-  - unused_private_declaration
   - vertical_parameter_alignment_on_call
+  - vertical_whitespace_closing_braces
+  - vertical_whitespace_opening_braces
+  - xct_specific_matcher
   - yoda_condition
+
 disabled_rules:
   - cyclomatic_complexity
-  - identifier_name
 
 colon:
   flexible_right_spacing: true

diff --git a/.travis.yml b/.travis.yml
@@ -5,59 +5,49 @@ language: objective-c
 xcode_workspace: OneTimePassword.xcworkspace
 xcode_scheme: OneTimePassword (iOS)
 
-osx_image: xcode10
+osx_image: xcode10.3
+
+before_install:
+- gem install cocoapods -v 1.7
 
 env:
   - 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.4" 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)
+      osx_image: xcode10.2
       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
+    # Build with CocoaPods
+    - &cocoapods
       env:
       before_script:
-      script: carthage build --no-skip-current
-    # Include CocoaPods builds
-    - 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
+    # Build with Xcode 10.1 and Swift 4.2
+    - &swift42
+      osx_image: xcode10.1
+      env: RUNTIME="iOS 8.4"  DEVICE="iPhone 4s"
+      script: set -o pipefail && xcodebuild -workspace "$TRAVIS_XCODE_WORKSPACE" -scheme "$TRAVIS_XCODE_SCHEME" -destination "id=$DESTINATION_ID" SWIFT_VERSION=4.2 $ACTIONS | xcpretty -c
+    - <<: *swift42
+      env: RUNTIME="iOS 9.3"  DEVICE="iPhone 6s"
+    # Build with CocoaPods and Swift 4.2
+    - <<: *cocoapods
+      osx_image: xcode10.1
+      script: pod lib lint --allow-warnings --verbose --swift-version=4.2
 
 before_script:
   - DEVICE_ID=com.apple.CoreSimulator.SimDeviceType.$(echo $DEVICE | sed -E -e "s/[ \-]+/ /g" -e "s/[^[:alnum:]]/-/g")

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,21 @@
 
 <!--## [In development][develop]-->
 
+## [3.2.0][] (2019-09-20)
+
+- Upgrade the source to compile with both Swift 4.2 and Swift 5.
+  ([#201](https://github.com/mattrubin/OneTimePassword/pull/201),
+   [#202](https://github.com/mattrubin/OneTimePassword/pull/202),
+   [#204](https://github.com/mattrubin/OneTimePassword/pull/204),
+   [#209](https://github.com/mattrubin/OneTimePassword/pull/209),
+   [#215](https://github.com/mattrubin/OneTimePassword/pull/215),
+   [#216](https://github.com/mattrubin/OneTimePassword/pull/216))
+- Update the SwiftLint configuration, and move the SwiftLint build phase to a separate dedicated target so that new lint errors do not interfere with consumers of the framework.
+  ([#212](https://github.com/mattrubin/OneTimePassword/pull/212),
+   [#206](https://github.com/mattrubin/OneTimePassword/pull/206))
+- Upgrade xcconfigs to enable new warnings introduced in Xcode 10.2
+  ([#203](https://github.com/mattrubin/OneTimePassword/pull/203))
+
 ## [3.1.5][] (2019-04-11)
 - Enable additional linting and CI testing.
 ([#196](https://github.com/mattrubin/OneTimePassword/pull/196),
@@ -175,6 +190,7 @@ Changes between prerelease versions of OneTimePassword version 2 can be found be
 
 [develop]: https://github.com/mattrubin/OneTimePassword/compare/3.1.5...develop
 
+[3.2.0]: https://github.com/mattrubin/OneTimePassword/compare/3.1.5...3.2.0
 [3.1.5]: https://github.com/mattrubin/OneTimePassword/compare/3.1.4...3.1.5
 [3.1.4]: https://github.com/mattrubin/OneTimePassword/compare/3.1.3...3.1.4
 [3.1.3]: https://github.com/mattrubin/OneTimePassword/compare/3.1.2...3.1.3

diff --git a/Cartfile.private b/Cartfile.private
@@ -1,3 +1,3 @@
 # Configuration for Carthage (https://github.com/Carthage/Carthage)
 
-github "jspahrsummers/xcconfigs" ~> 0.12
+github "jspahrsummers/xcconfigs" ~> 1.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,2 +1,2 @@
-github "jspahrsummers/xcconfigs" "0.12"
+github "jspahrsummers/xcconfigs" "1.0"
 github "mattrubin/Base32" "1.1.2+xcode10.2"
diff --git a/Carthage/Checkouts/xcconfigs b/Carthage/Checkouts/xcconfigs
diff --git a/CommonCrypto/README.md b/CommonCrypto/README.md
diff --git a/CommonCrypto/appletvos/module.modulemap b/CommonCrypto/appletvos/module.modulemap
diff --git a/CommonCrypto/appletvsimulator/module.modulemap b/CommonCrypto/appletvsimulator/module.modulemap
diff --git a/CommonCrypto/injectXcodePath.sh b/CommonCrypto/injectXcodePath.sh
diff --git a/CommonCrypto/iphoneos/module.modulemap b/CommonCrypto/iphoneos/module.modulemap
diff --git a/CommonCrypto/iphonesimulator/module.modulemap b/CommonCrypto/iphonesimulator/module.modulemap
diff --git a/CommonCrypto/macosx/module.modulemap b/CommonCrypto/macosx/module.modulemap
diff --git a/CommonCrypto/watchos/module.modulemap b/CommonCrypto/watchos/module.modulemap
diff --git a/CommonCrypto/watchsimulator/module.modulemap b/CommonCrypto/watchsimulator/module.modulemap
diff --git a/Configuration/OneTimePassword.xcconfig b/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;
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013-2017 Matt Rubin and the [OneTimePassword authors](AUTHORS.txt)
+Copyright (c) 2013-2019 Matt Rubin and the [OneTimePassword authors](AUTHORS.txt)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/OneTimePassword.podspec b/OneTimePassword.podspec
@@ -1,31 +1,15 @@
 Pod::Spec.new do |s|
   s.name         = "OneTimePassword"
-  s.version      = "3.1.5"
+  s.version      = "3.2.0"
   s.summary      = "A small library for generating TOTP and HOTP one-time passwords."
   s.homepage     = "https://github.com/mattrubin/OneTimePassword"
   s.license      = "MIT"
   s.author       = "Matt Rubin"
-  s.swift_version             = "4.0"
+  s.swift_versions            = ["4.2", "5.0"]
   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