Release OneTimePassword 3.1.5

mattrubin · Apr 12, 2019 · 8e32517 · 8e32517
2 parents 09b940e + d72bb69
commit 8e32517
Show file tree

Hide file tree

Showing 9 changed files with 55 additions and 15 deletions.
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -5,8 +5,10 @@ excluded:
 opt_in_rules:
   - array_init
   - attributes
+  - closure_body_length
   - closure_end_indentation
   - closure_spacing
+  - collection_alignment
   - conditional_returns_on_newline
   - contains_over_first_not_nil
   - convenience_type
@@ -23,14 +25,17 @@ opt_in_rules:
   - fatal_error_message
   - file_header
   - first_where
+  - identical_operands
   - implicit_return
   - implicitly_unwrapped_optional
   - joined_default_parameter
+  - legacy_random
   - let_var_whitespace
   - literal_expression_end_indentation
   - lower_acl_than_parent
   - modifier_order
   - multiline_function_chains
+  - multiline_literal_brackets
   - multiline_parameters
   - nimble_operator
   - operator_usage_whitespace
@@ -43,10 +48,14 @@ opt_in_rules:
   - redundant_nil_coalescing
   - single_test_class
   - sorted_first_last
+  - static_operator
   - switch_case_on_newline
+  - toggle_bool
   - unavailable_function
   - unneeded_parentheses_in_closure_argument
   - untyped_error_in_catch
+  - unused_import
+  - unused_private_declaration
   - vertical_parameter_alignment_on_call
   - yoda_condition
 disabled_rules:

diff --git a/.travis.yml b/.travis.yml
@@ -34,9 +34,30 @@ matrix:
       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"
-
-# Check out nested dependencies
-before_install: git submodule update --init --recursive
+    # Include Carthage builds
+    - env:
+      before_script:
+      script: carthage build --no-skip-current
+    - osx_image: xcode9
+      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
 
 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,13 @@
 
 <!--## [In development][develop]-->
 
+## [3.1.5][] (2019-04-11)
+- Enable additional linting and CI testing.
+([#196](https://github.com/mattrubin/OneTimePassword/pull/196),
+[#192](https://github.com/mattrubin/OneTimePassword/pull/192))
+- Satisfy various project-level warnings introduced in Xcode 10.2.
+([#198](https://github.com/mattrubin/OneTimePassword/pull/198))
+
 ## [3.1.4][] (2018-09-15)
 - Fix compilation errors and add CI testing for Xcode 10.
 ([#182](https://github.com/mattrubin/OneTimePassword/pull/182),
@@ -166,8 +173,9 @@ Changes between prerelease versions of OneTimePassword version 2 can be found be
 
 ## [1.0.0][] (2014-07-17)
 
-[develop]: https://github.com/mattrubin/OneTimePassword/compare/3.1.4...develop
+[develop]: https://github.com/mattrubin/OneTimePassword/compare/3.1.5...develop
 
+[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
 [3.1.2]: https://github.com/mattrubin/OneTimePassword/compare/3.1.1...3.1.2

diff --git a/Cartfile b/Cartfile
@@ -1,3 +1,3 @@
 # Configuration for Carthage (https://github.com/Carthage/Carthage)
 
-github "mattrubin/Base32" "xcode9"
+github "mattrubin/Base32" "1.1.2+xcode10.2"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,2 +1,2 @@
 github "jspahrsummers/xcconfigs" "0.12"
-github "mattrubin/Base32" "xcode9"
+github "mattrubin/Base32" "1.1.2+xcode10.2"
diff --git a/Carthage/Checkouts/Base32 b/Carthage/Checkouts/Base32
diff --git a/OneTimePassword.podspec b/OneTimePassword.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "OneTimePassword"
-  s.version      = "3.1.4"
+  s.version      = "3.1.5"
   s.summary      = "A small library for generating TOTP and HOTP one-time passwords."
   s.homepage     = "https://github.com/mattrubin/OneTimePassword"
   s.license      = "MIT"

diff --git a/OneTimePassword.xcodeproj/project.pbxproj b/OneTimePassword.xcodeproj/project.pbxproj
@@ -526,27 +526,28 @@
 				TargetAttributes = {
 					5B39F4931DBD06BA00CD2DAB = {
 						CreatedOnToolsVersion = 8.0;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Manual;
 					};
 					C97C82371946E51D00FD9F4C = {
 						CreatedOnToolsVersion = 6.0;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Manual;
 					};
 					C97C82421946E51D00FD9F4C = {
 						CreatedOnToolsVersion = 6.0;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Manual;
 						TestTargetID = FD6C3C0B1E0200F800EC4528;
 					};
 					C9A486B2196F352E00524F51 = {
 						CreatedOnToolsVersion = 6.0;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Manual;
 					};
 					FD6C3C0B1E0200F800EC4528 = {
 						CreatedOnToolsVersion = 8.2;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Automatic;
 					};
 					FDD3B8661DD6E59E00F87980 = {
@@ -557,10 +558,11 @@
 			};
 			buildConfigurationList = C97C82321946E51D00FD9F4C /* Build configuration list for PBXProject "OneTimePassword" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = C97C822E1946E51D00FD9F4C;
 			productRefGroup = C97C82391946E51D00FD9F4C /* Products */;

diff --git a/Sources/Info.plist b/Sources/Info.plist
@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.1.4</string>
+	<string>3.1.5</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>3.1.4</string>
+	<string>3.1.5</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>