Skip to content

Commit ef969d3

Browse files
committed
Merge branch 'release/0.5.2'
2 parents 9df1568 + c19397a commit ef969d3

File tree

16 files changed

+373
-283
lines changed

16 files changed

+373
-283
lines changed

.swiftlint.yml

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
disabled_rules: # rule identifiers to exclude from running
2+
- line_length
3+
- function_body_length
4+
- cyclomatic_complexity
5+
- multiple_closures_with_trailing_closure
6+
- xctfail_message
7+
8+
# Swift 3 rules that do not make sense for Swift 2.3
9+
- implicit_getter
10+
11+
identifier_name:
12+
min_length:
13+
warning: 1
14+
error: 1
15+
max_length:
16+
warning: 60
17+
error: 80
18+
19+
type_name:
20+
max_length:
21+
warning: 60
22+
error: 100
23+
24+
type_body_length:
25+
warning: 300
26+
error: 400
27+
28+
file_length:
29+
warning: 700
30+
error: 800
31+
32+
excluded:
33+
- Pods
34+
35+
function_parameter_count:
36+
warning: 7
37+
error: 10
38+
39+
large_tuple:
40+
warning: 3
41+
42+
opt_in_rules: # some rules are only opt-in
43+
- closure_end_indentation
44+
- closure_spacing
45+
- syntactic_sugar
46+
- redundant_nil_coalescing
47+
- number_separator
48+
- sorted_imports
49+
- overridden_super_call
50+
- object_literal
51+
- explicit_init
52+
- first_where
53+
- operator_usage_whitespace
54+
55+
56+
number_separator:
57+
minimum_length: 7
58+
59+
custom_rules:
60+
double_space: # from https://github.com/IBM-Swift/Package-Builder
61+
include: "*.swift"
62+
name: "Double space"
63+
regex: '([a-z,A-Z] \s+)'
64+
message: "Double space between keywords"
65+
match_kinds: keyword
66+
severity: warning
67+
comments_space: # from https://github.com/brandenr/swiftlintconfig
68+
name: "Space After Comment"
69+
regex: '(^ *//\w+)'
70+
message: "There should be a space after //"
71+
severity: warning
72+
empty_line_after_guard: # from https://github.com/brandenr/swiftlintconfig
73+
name: "Empty Line After Guard"
74+
regex: '(^ *guard[ a-zA-Z0-9=?.\(\),><!]*\{[ a-zA-Z0-9=?.\(\),><!]*\}\n *(?!(?:return|guard))\S+)'
75+
message: "There should be an empty line after a guard"
76+
severity: warning
77+
unnecessary_type: # from https://github.com/brandenr/swiftlintconfig
78+
name: "Unnecessary Type"
79+
regex: '[ a-zA-Z0-9]*(?:let|var) [ a-zA-Z0-9]*: ([a-zA-Z0-9]*)[ ]*= \1'
80+
message: "Type Definition Not Needed"
81+
severity: warning

CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
## CHANGELOG
22

3-
Latest version of Repeat is [0.5.1](https://github.com/malcommac/Repeat/releases/tag/0.5.1) published on 2018/03/18.
3+
Latest version of Repeat is [0.5.2](https://github.com/malcommac/Repeat/releases/tag/0.5.2) published on 2018/04/19.
4+
5+
**Changelog - 0.5.2**:
6+
7+
- [#14](https://github.com/malcommac/Repeat/pull/14): Refactors equatable implementation to use an identity operator.
48

59
**Changelog - 0.5.1**:
610

Package.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ let package = Package(
99
// Products define the executables and libraries produced by a package, and make them visible to other packages.
1010
.library(
1111
name: "Repeat",
12-
targets: ["Repeat"]),
12+
targets: ["Repeat"])
1313
],
1414
dependencies: [
1515
// Dependencies declare other packages that this package depends on.
@@ -23,6 +23,6 @@ let package = Package(
2323
dependencies: []),
2424
.testTarget(
2525
name: "RepeatTests",
26-
dependencies: ["Repeat"]),
26+
dependencies: ["Repeat"])
2727
]
2828
)

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ All Apple platforms are supported:
202202

203203
## Latest Version
204204

205-
Latest version of Repeat is [0.5.1](https://github.com/malcommac/Repeat/releases/tag/0.5.1) published on 2018/03/18.
205+
Latest version of Repeat is [0.5.2](https://github.com/malcommac/Repeat/releases/tag/0.5.2) published on 2018/04/19.
206206
Full changelog is available in [CHANGELOG.md](CHANGELOG.md) file.
207207

208208
## Installation

Repeat.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 = "Repeat"
3-
s.version = "0.5.1"
3+
s.version = "0.5.2"
44
s.summary = "Modern NSTimer alternative in Swift"
55
s.description = <<-DESC
66
Repeat is a modern alternative to NSTimer; no strong references, multiple observers, reusable instances with start/stop/pause support in swifty syntax.

Repeat.xcodeproj/project.pbxproj

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
644EE2E4205D228D00238416 /* Repeat.podspec */ = {isa = PBXFileReference; lastKnownFileType = text; path = Repeat.podspec; sourceTree = "<group>"; };
6464
644EE2E5205D229300238416 /* CHANGELOG.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = CHANGELOG.md; sourceTree = "<group>"; };
6565
64A18883204D313800DC2B4B /* Repeater.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Repeater.swift; path = Repeat/Repeater.swift; sourceTree = "<group>"; };
66+
64D71A022088AB3B0042C1A2 /* .swiftlint.yml */ = {isa = PBXFileReference; lastKnownFileType = text; path = .swiftlint.yml; sourceTree = "<group>"; };
6667
8933C7891EB5B82A000D00A4 /* RepeatTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RepeatTests.swift; sourceTree = "<group>"; };
6768
AD2FAA261CD0B6D800659CF4 /* Repeat.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Repeat.plist; sourceTree = "<group>"; };
6869
AD2FAA281CD0B6E100659CF4 /* RepeatTests.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = RepeatTests.plist; sourceTree = "<group>"; };
@@ -132,6 +133,7 @@
132133
644EE2E3205D15D100238416 /* README.md */,
133134
644EE2E5205D229300238416 /* CHANGELOG.md */,
134135
644EE2E4205D228D00238416 /* Repeat.podspec */,
136+
64D71A022088AB3B0042C1A2 /* .swiftlint.yml */,
135137
8933C7811EB5B7E0000D00A4 /* Sources */,
136138
8933C7831EB5B7EB000D00A4 /* Tests */,
137139
52D6D99C1BEFF38C002C0205 /* Configs */,
@@ -239,6 +241,7 @@
239241
52D6D9781BEFF229002C0205 /* Frameworks */,
240242
52D6D9791BEFF229002C0205 /* Headers */,
241243
52D6D97A1BEFF229002C0205 /* Resources */,
244+
64D71A042088AB880042C1A2 /* SwiftLint */,
242245
);
243246
buildRules = (
244247
);
@@ -364,7 +367,7 @@
364367
isa = PBXProject;
365368
attributes = {
366369
LastSwiftUpdateCheck = 0720;
367-
LastUpgradeCheck = 0900;
370+
LastUpgradeCheck = 0930;
368371
ORGANIZATIONNAME = Repeat;
369372
TargetAttributes = {
370373
52D6D97B1BEFF229002C0205 = {
@@ -472,6 +475,23 @@
472475
};
473476
/* End PBXResourcesBuildPhase section */
474477

478+
/* Begin PBXShellScriptBuildPhase section */
479+
64D71A042088AB880042C1A2 /* SwiftLint */ = {
480+
isa = PBXShellScriptBuildPhase;
481+
buildActionMask = 2147483647;
482+
files = (
483+
);
484+
inputPaths = (
485+
);
486+
name = SwiftLint;
487+
outputPaths = (
488+
);
489+
runOnlyForDeploymentPostprocessing = 0;
490+
shellPath = /bin/sh;
491+
shellScript = "swiftlint autocorrect\nif which swiftlint >/dev/null; then\nswiftlint\nelse\necho \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi";
492+
};
493+
/* End PBXShellScriptBuildPhase section */
494+
475495
/* Begin PBXSourcesBuildPhase section */
476496
52D6D9771BEFF229002C0205 /* Sources */ = {
477497
isa = PBXSourcesBuildPhase;
@@ -570,12 +590,14 @@
570590
CLANG_WARN_BOOL_CONVERSION = YES;
571591
CLANG_WARN_COMMA = YES;
572592
CLANG_WARN_CONSTANT_CONVERSION = YES;
593+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
573594
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
574595
CLANG_WARN_EMPTY_BODY = YES;
575596
CLANG_WARN_ENUM_CONVERSION = YES;
576597
CLANG_WARN_INFINITE_RECURSION = YES;
577598
CLANG_WARN_INT_CONVERSION = YES;
578599
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
600+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
579601
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
580602
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
581603
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -627,12 +649,14 @@
627649
CLANG_WARN_BOOL_CONVERSION = YES;
628650
CLANG_WARN_COMMA = YES;
629651
CLANG_WARN_CONSTANT_CONVERSION = YES;
652+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
630653
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
631654
CLANG_WARN_EMPTY_BODY = YES;
632655
CLANG_WARN_ENUM_CONVERSION = YES;
633656
CLANG_WARN_INFINITE_RECURSION = YES;
634657
CLANG_WARN_INT_CONVERSION = YES;
635658
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
659+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
636660
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
637661
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
638662
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

Repeat.xcodeproj/xcshareddata/xcschemes/Repeat-iOS.xcscheme

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0900"
3+
LastUpgradeVersion = "0930"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
3029
shouldUseLaunchSchemeArgsEnv = "YES">
3130
<Testables>
3231
<TestableReference
@@ -56,7 +55,6 @@
5655
buildConfiguration = "Debug"
5756
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5857
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
59-
language = ""
6058
launchStyle = "0"
6159
useCustomWorkingDirectory = "NO"
6260
ignoresPersistentStateOnLaunch = "NO"

Repeat.xcodeproj/xcshareddata/xcschemes/Repeat-macOS.xcscheme

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0900"
3+
LastUpgradeVersion = "0930"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
3029
shouldUseLaunchSchemeArgsEnv = "YES">
3130
<Testables>
3231
<TestableReference
@@ -56,7 +55,6 @@
5655
buildConfiguration = "Debug"
5756
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5857
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
59-
language = ""
6058
launchStyle = "0"
6159
useCustomWorkingDirectory = "NO"
6260
ignoresPersistentStateOnLaunch = "NO"

Repeat.xcodeproj/xcshareddata/xcschemes/Repeat-tvOS.xcscheme

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0900"
3+
LastUpgradeVersion = "0930"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
3029
shouldUseLaunchSchemeArgsEnv = "YES">
3130
<Testables>
3231
<TestableReference
@@ -56,7 +55,6 @@
5655
buildConfiguration = "Debug"
5756
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5857
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
59-
language = ""
6058
launchStyle = "0"
6159
useCustomWorkingDirectory = "NO"
6260
ignoresPersistentStateOnLaunch = "NO"

0 commit comments

Comments
 (0)