Skip to content

Commit 8e32517

Browse files
authored
Release OneTimePassword 3.1.5
2 parents 09b940e + d72bb69 commit 8e32517

File tree

9 files changed

+55
-15
lines changed

9 files changed

+55
-15
lines changed

.swiftlint.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@ excluded:
55
opt_in_rules:
66
- array_init
77
- attributes
8+
- closure_body_length
89
- closure_end_indentation
910
- closure_spacing
11+
- collection_alignment
1012
- conditional_returns_on_newline
1113
- contains_over_first_not_nil
1214
- convenience_type
@@ -23,14 +25,17 @@ opt_in_rules:
2325
- fatal_error_message
2426
- file_header
2527
- first_where
28+
- identical_operands
2629
- implicit_return
2730
- implicitly_unwrapped_optional
2831
- joined_default_parameter
32+
- legacy_random
2933
- let_var_whitespace
3034
- literal_expression_end_indentation
3135
- lower_acl_than_parent
3236
- modifier_order
3337
- multiline_function_chains
38+
- multiline_literal_brackets
3439
- multiline_parameters
3540
- nimble_operator
3641
- operator_usage_whitespace
@@ -43,10 +48,14 @@ opt_in_rules:
4348
- redundant_nil_coalescing
4449
- single_test_class
4550
- sorted_first_last
51+
- static_operator
4652
- switch_case_on_newline
53+
- toggle_bool
4754
- unavailable_function
4855
- unneeded_parentheses_in_closure_argument
4956
- untyped_error_in_catch
57+
- unused_import
58+
- unused_private_declaration
5059
- vertical_parameter_alignment_on_call
5160
- yoda_condition
5261
disabled_rules:

.travis.yml

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,30 @@ matrix:
3434
env: BUILD_ONLY="YES" RUNTIME="watchOS 3.2" DEVICE="Apple Watch Series 2 - 42mm"
3535
- xcode_scheme: OneTimePassword (watchOS)
3636
env: BUILD_ONLY="YES" RUNTIME="watchOS 2.0" DEVICE="Apple Watch - 38mm"
37-
38-
# Check out nested dependencies
39-
before_install: git submodule update --init --recursive
37+
# Include Carthage builds
38+
- env:
39+
before_script:
40+
script: carthage build --no-skip-current
41+
- osx_image: xcode9
42+
env:
43+
before_script:
44+
script: carthage build --no-skip-current
45+
# Include CocoaPods builds
46+
- env:
47+
before_script:
48+
script: pod lib lint --allow-warnings
49+
- osx_image: xcode9
50+
env:
51+
before_install: gem update cocoapods
52+
before_script:
53+
script: pod lib lint --allow-warnings --verbose
54+
allow_failures:
55+
# Allow the Xcode 9 `pod lib lint` to fail, as this test method currently has an issue using the custom CommonCrypto module maps.
56+
- osx_image: xcode9
57+
env:
58+
before_install: gem update cocoapods
59+
before_script:
60+
script: pod lib lint --allow-warnings --verbose
4061

4162
before_script:
4263
- DEVICE_ID=com.apple.CoreSimulator.SimDeviceType.$(echo $DEVICE | sed -E -e "s/[ \-]+/ /g" -e "s/[^[:alnum:]]/-/g")

CHANGELOG.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22

33
<!--## [In development][develop]-->
44

5+
## [3.1.5][] (2019-04-11)
6+
- Enable additional linting and CI testing.
7+
([#196](https://github.com/mattrubin/OneTimePassword/pull/196),
8+
[#192](https://github.com/mattrubin/OneTimePassword/pull/192))
9+
- Satisfy various project-level warnings introduced in Xcode 10.2.
10+
([#198](https://github.com/mattrubin/OneTimePassword/pull/198))
11+
512
## [3.1.4][] (2018-09-15)
613
- Fix compilation errors and add CI testing for Xcode 10.
714
([#182](https://github.com/mattrubin/OneTimePassword/pull/182),
@@ -166,8 +173,9 @@ Changes between prerelease versions of OneTimePassword version 2 can be found be
166173

167174
## [1.0.0][] (2014-07-17)
168175

169-
[develop]: https://github.com/mattrubin/OneTimePassword/compare/3.1.4...develop
176+
[develop]: https://github.com/mattrubin/OneTimePassword/compare/3.1.5...develop
170177

178+
[3.1.5]: https://github.com/mattrubin/OneTimePassword/compare/3.1.4...3.1.5
171179
[3.1.4]: https://github.com/mattrubin/OneTimePassword/compare/3.1.3...3.1.4
172180
[3.1.3]: https://github.com/mattrubin/OneTimePassword/compare/3.1.2...3.1.3
173181
[3.1.2]: https://github.com/mattrubin/OneTimePassword/compare/3.1.1...3.1.2

Cartfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Configuration for Carthage (https://github.com/Carthage/Carthage)
22

3-
github "mattrubin/Base32" "xcode9"
3+
github "mattrubin/Base32" "1.1.2+xcode10.2"

Cartfile.resolved

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
github "jspahrsummers/xcconfigs" "0.12"
2-
github "mattrubin/Base32" "xcode9"
2+
github "mattrubin/Base32" "1.1.2+xcode10.2"

OneTimePassword.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "OneTimePassword"
3-
s.version = "3.1.4"
3+
s.version = "3.1.5"
44
s.summary = "A small library for generating TOTP and HOTP one-time passwords."
55
s.homepage = "https://github.com/mattrubin/OneTimePassword"
66
s.license = "MIT"

OneTimePassword.xcodeproj/project.pbxproj

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -526,27 +526,28 @@
526526
TargetAttributes = {
527527
5B39F4931DBD06BA00CD2DAB = {
528528
CreatedOnToolsVersion = 8.0;
529+
LastSwiftMigration = 1020;
529530
ProvisioningStyle = Manual;
530531
};
531532
C97C82371946E51D00FD9F4C = {
532533
CreatedOnToolsVersion = 6.0;
533-
LastSwiftMigration = 0900;
534+
LastSwiftMigration = 1020;
534535
ProvisioningStyle = Manual;
535536
};
536537
C97C82421946E51D00FD9F4C = {
537538
CreatedOnToolsVersion = 6.0;
538-
LastSwiftMigration = 0900;
539+
LastSwiftMigration = 1020;
539540
ProvisioningStyle = Manual;
540541
TestTargetID = FD6C3C0B1E0200F800EC4528;
541542
};
542543
C9A486B2196F352E00524F51 = {
543544
CreatedOnToolsVersion = 6.0;
544-
LastSwiftMigration = 0900;
545+
LastSwiftMigration = 1020;
545546
ProvisioningStyle = Manual;
546547
};
547548
FD6C3C0B1E0200F800EC4528 = {
548549
CreatedOnToolsVersion = 8.2;
549-
LastSwiftMigration = 0900;
550+
LastSwiftMigration = 1020;
550551
ProvisioningStyle = Automatic;
551552
};
552553
FDD3B8661DD6E59E00F87980 = {
@@ -557,10 +558,11 @@
557558
};
558559
buildConfigurationList = C97C82321946E51D00FD9F4C /* Build configuration list for PBXProject "OneTimePassword" */;
559560
compatibilityVersion = "Xcode 3.2";
560-
developmentRegion = English;
561+
developmentRegion = en;
561562
hasScannedForEncodings = 0;
562563
knownRegions = (
563564
en,
565+
Base,
564566
);
565567
mainGroup = C97C822E1946E51D00FD9F4C;
566568
productRefGroup = C97C82391946E51D00FD9F4C /* Products */;

Sources/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>3.1.4</string>
18+
<string>3.1.5</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
22-
<string>3.1.4</string>
22+
<string>3.1.5</string>
2323
<key>NSPrincipalClass</key>
2424
<string></string>
2525
</dict>

0 commit comments

Comments
 (0)