Skip to content

Commit 4b3134f

Browse files
e-marchande-marchand
committed
Update to Xcode 9.3
Fix swiftlint warning about colon
1 parent ba7fc6f commit 4b3134f

File tree

9 files changed

+34
-26
lines changed

9 files changed

+34
-26
lines changed

‎Prephirences.podspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Pod::Spec.new do |s|
22

33
# ――― Spec Metadata ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
44
s.name = "Prephirences"
5-
s.version = "4.0.0"
5+
s.version = "4.0.1"
66
s.summary = "A Swift library to manage preferences"
77
s.description = <<-DESC
88
Prephirences is a Swift library that provides useful protocols and methods to manage preferences.
@@ -17,10 +17,10 @@ Pod::Spec.new do |s|
1717
s.author = { "phimage" => "[email protected]" }
1818

1919
# ――― Platform Specifics ――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
20-
s.ios.deployment_target = '9.0'
20+
s.ios.deployment_target = '9.3'
2121
s.osx.deployment_target = '10.11'
2222
s.watchos.deployment_target = '3.0'
23-
s.tvos.deployment_target = '9.0'
23+
s.tvos.deployment_target = '9.2'
2424

2525
# ――― Source Location ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
2626
s.source = { :git => "https://github.com/phimage/Prephirences.git", :tag => s.version }

‎Prephirences.xcodeproj/project.pbxproj‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@
527527
attributes = {
528528
LastSwiftMigration = 0700;
529529
LastSwiftUpdateCheck = 0700;
530-
LastUpgradeCheck = 0900;
530+
LastUpgradeCheck = 0930;
531531
ORGANIZATIONNAME = phimage;
532532
TargetAttributes = {
533533
07FC415D1BE66517005F195C = {
@@ -832,7 +832,7 @@
832832
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
833833
SWIFT_VERSION = 4.0;
834834
TARGETED_DEVICE_FAMILY = 3;
835-
TVOS_DEPLOYMENT_TARGET = 9.0;
835+
TVOS_DEPLOYMENT_TARGET = 9.2;
836836
};
837837
name = Debug;
838838
};
@@ -854,7 +854,7 @@
854854
SKIP_INSTALL = YES;
855855
SWIFT_VERSION = 4.0;
856856
TARGETED_DEVICE_FAMILY = 3;
857-
TVOS_DEPLOYMENT_TARGET = 9.0;
857+
TVOS_DEPLOYMENT_TARGET = 9.2;
858858
VALIDATE_PRODUCT = YES;
859859
};
860860
name = Release;
@@ -871,12 +871,14 @@
871871
CLANG_WARN_BOOL_CONVERSION = YES;
872872
CLANG_WARN_COMMA = YES;
873873
CLANG_WARN_CONSTANT_CONVERSION = YES;
874+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
874875
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
875876
CLANG_WARN_EMPTY_BODY = YES;
876877
CLANG_WARN_ENUM_CONVERSION = YES;
877878
CLANG_WARN_INFINITE_RECURSION = YES;
878879
CLANG_WARN_INT_CONVERSION = YES;
879880
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
881+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
880882
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
881883
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
882884
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -909,6 +911,7 @@
909911
ONLY_ACTIVE_ARCH = YES;
910912
SDKROOT = macosx;
911913
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
914+
SWIFT_VERSION = 4.0;
912915
VERSIONING_SYSTEM = "apple-generic";
913916
VERSION_INFO_PREFIX = "";
914917
};
@@ -926,12 +929,14 @@
926929
CLANG_WARN_BOOL_CONVERSION = YES;
927930
CLANG_WARN_COMMA = YES;
928931
CLANG_WARN_CONSTANT_CONVERSION = YES;
932+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
929933
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
930934
CLANG_WARN_EMPTY_BODY = YES;
931935
CLANG_WARN_ENUM_CONVERSION = YES;
932936
CLANG_WARN_INFINITE_RECURSION = YES;
933937
CLANG_WARN_INT_CONVERSION = YES;
934938
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
939+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
935940
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
936941
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
937942
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -956,6 +961,7 @@
956961
MTL_ENABLE_DEBUG_INFO = NO;
957962
SDKROOT = macosx;
958963
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
964+
SWIFT_VERSION = 4.0;
959965
VERSIONING_SYSTEM = "apple-generic";
960966
VERSION_INFO_PREFIX = "";
961967
};
@@ -977,6 +983,7 @@
977983
);
978984
INFOPLIST_FILE = Xcodes/iOS/Info.plist;
979985
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
986+
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
980987
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
981988
PRODUCT_BUNDLE_IDENTIFIER = tv.phimage.Prephirences;
982989
PRODUCT_NAME = Prephirences;
@@ -999,6 +1006,7 @@
9991006
DYLIB_INSTALL_NAME_BASE = "@rpath";
10001007
INFOPLIST_FILE = Xcodes/iOS/Info.plist;
10011008
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1009+
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
10021010
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
10031011
PRODUCT_BUNDLE_IDENTIFIER = tv.phimage.Prephirences;
10041012
PRODUCT_NAME = Prephirences;
@@ -1027,7 +1035,7 @@
10271035
INFOPLIST_FILE = Xcodes/Mac/Info.plist;
10281036
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
10291037
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
1030-
MACOSX_DEPLOYMENT_TARGET = 10.12;
1038+
MACOSX_DEPLOYMENT_TARGET = 10.11;
10311039
PRODUCT_BUNDLE_IDENTIFIER = tv.phimage.Prephirences;
10321040
PRODUCT_NAME = Prephirences;
10331041
SKIP_INSTALL = YES;
@@ -1047,7 +1055,7 @@
10471055
INFOPLIST_FILE = Xcodes/Mac/Info.plist;
10481056
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
10491057
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
1050-
MACOSX_DEPLOYMENT_TARGET = 10.12;
1058+
MACOSX_DEPLOYMENT_TARGET = 10.11;
10511059
PRODUCT_BUNDLE_IDENTIFIER = tv.phimage.Prephirences;
10521060
PRODUCT_NAME = Prephirences;
10531061
SKIP_INSTALL = YES;

‎Prephirences.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist‎

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>

‎Prephirences.xcodeproj/xcshareddata/xcschemes/PrephirencesMac.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
</Testables>
@@ -46,7 +45,6 @@
4645
buildConfiguration = "Debug"
4746
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4847
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
49-
language = ""
5048
launchStyle = "0"
5149
useCustomWorkingDirectory = "NO"
5250
ignoresPersistentStateOnLaunch = "NO"

‎Prephirences.xcodeproj/xcshareddata/xcschemes/PrephirencesTvOS.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
</Testables>
@@ -37,7 +36,6 @@
3736
buildConfiguration = "Debug"
3837
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
3938
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
40-
language = ""
4139
launchStyle = "0"
4240
useCustomWorkingDirectory = "NO"
4341
ignoresPersistentStateOnLaunch = "NO"

‎Prephirences.xcodeproj/xcshareddata/xcschemes/PrephirencesWatchOS.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 = "0830"
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
</Testables>
@@ -37,7 +36,6 @@
3736
buildConfiguration = "Debug"
3837
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
3938
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
40-
language = ""
4139
launchStyle = "0"
4240
useCustomWorkingDirectory = "NO"
4341
ignoresPersistentStateOnLaunch = "NO"

‎Prephirences.xcodeproj/xcshareddata/xcschemes/PrephirencesiOS.xcscheme‎

Lines changed: 3 additions & 5 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,9 +26,8 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
30-
shouldUseLaunchSchemeArgsEnv = "YES"
31-
codeCoverageEnabled = "YES">
29+
codeCoverageEnabled = "YES"
30+
shouldUseLaunchSchemeArgsEnv = "YES">
3231
<Testables>
3332
<TestableReference
3433
skipped = "NO">
@@ -57,7 +56,6 @@
5756
buildConfiguration = "Debug"
5857
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5958
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
60-
language = ""
6159
launchStyle = "0"
6260
useCustomWorkingDirectory = "NO"
6361
ignoresPersistentStateOnLaunch = "NO"

‎Sources/PreferenceOperators.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,17 +146,17 @@ public func -=<T> (preference: inout MutablePreference<T>, addend: T) where T: B
146146
preference.value = c - addend
147147
}
148148

149-
public func *=<T> (preference: inout MutablePreference<T>, multiplier : T) where T: BinaryInteger, T: Initializable {
149+
public func *=<T> (preference: inout MutablePreference<T>, multiplier: T) where T: BinaryInteger, T: Initializable {
150150
let c = preference.value ?? T()
151151
preference.value = c * multiplier
152152
}
153153

154-
public func /=<T> (preference: inout MutablePreference<T>, divisor : T) where T: BinaryInteger, T: Initializable {
154+
public func /=<T> (preference: inout MutablePreference<T>, divisor: T) where T: BinaryInteger, T: Initializable {
155155
let c = preference.value ?? T()
156156
preference.value = c / divisor
157157
}
158158

159-
public func %=<T> (preference: inout MutablePreference<T>, modulo : T) where T: BinaryInteger, T: Initializable {
159+
public func %=<T> (preference: inout MutablePreference<T>, modulo: T) where T: BinaryInteger, T: Initializable {
160160
let c = preference.value ?? T()
161161
preference.value = c % modulo
162162
}

‎Sources/RawRepresentableKey/RawRepresentable+Prephirences.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public extension PreferencesType {
4949
return array(forKey: rawRepresentableKey.rawValue)
5050
}
5151

52-
public func dictionary<R: RawRepresentable>(forKey rawRepresentableKey: R) -> [PreferenceKey : PreferenceObject]? where R.RawValue == PreferenceKey {
52+
public func dictionary<R: RawRepresentable>(forKey rawRepresentableKey: R) -> [PreferenceKey: PreferenceObject]? where R.RawValue == PreferenceKey {
5353
return dictionary(forKey: rawRepresentableKey.rawValue)
5454
}
5555

0 commit comments

Comments
 (0)