Skip to content

Commit 3701b51

Browse files
kentya6kentya6
committed
Upgrade to Swift4
1 parent e5fe68b commit 3701b51

File tree

7 files changed

+68
-25
lines changed

7 files changed

+68
-25
lines changed

‎.swift-version

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
4.1

‎Example/ViewController.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ class ViewController: UIViewController {
1818
private var animationProgress: UInt8 = 0
1919
@IBOutlet private weak var storyboardCircularProgress1: KYCircularProgress!
2020
@IBOutlet private weak var progressLabel: UILabel!
21-
@IBOutlet fileprivate weak var storyboardCircularProgress2: KYCircularProgress!
22-
@IBOutlet fileprivate weak var progressLabel2: UILabel!
21+
@IBOutlet private weak var storyboardCircularProgress2: KYCircularProgress!
22+
@IBOutlet private weak var progressLabel2: UILabel!
2323
@IBOutlet private weak var storyboardCircularProgress3: KYCircularProgress!
2424

2525
override func viewDidLoad() {

‎KYCircularProgress.xcodeproj/project.pbxproj

+26-4
Original file line numberDiff line numberDiff line change
@@ -102,12 +102,12 @@
102102
isa = PBXProject;
103103
attributes = {
104104
LastSwiftUpdateCheck = 0720;
105-
LastUpgradeCheck = 0800;
105+
LastUpgradeCheck = 0930;
106106
ORGANIZATIONNAME = "Kengo Yokoyama";
107107
TargetAttributes = {
108108
BE06EC8A1B63617B009A1999 = {
109109
CreatedOnToolsVersion = 6.4;
110-
LastSwiftMigration = 0800;
110+
LastSwiftMigration = 0930;
111111
ProvisioningStyle = Automatic;
112112
};
113113
};
@@ -159,14 +159,22 @@
159159
CLANG_CXX_LIBRARY = "libc++";
160160
CLANG_ENABLE_MODULES = YES;
161161
CLANG_ENABLE_OBJC_ARC = YES;
162+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
162163
CLANG_WARN_BOOL_CONVERSION = YES;
164+
CLANG_WARN_COMMA = YES;
163165
CLANG_WARN_CONSTANT_CONVERSION = YES;
166+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
164167
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
165168
CLANG_WARN_EMPTY_BODY = YES;
166169
CLANG_WARN_ENUM_CONVERSION = YES;
167170
CLANG_WARN_INFINITE_RECURSION = YES;
168171
CLANG_WARN_INT_CONVERSION = YES;
172+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
173+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
174+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
169175
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
176+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
177+
CLANG_WARN_STRICT_PROTOTYPES = YES;
170178
CLANG_WARN_SUSPICIOUS_MOVE = YES;
171179
CLANG_WARN_UNREACHABLE_CODE = YES;
172180
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -196,6 +204,7 @@
196204
ONLY_ACTIVE_ARCH = YES;
197205
SDKROOT = iphoneos;
198206
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
207+
SWIFT_VERSION = 4.0;
199208
TARGETED_DEVICE_FAMILY = "1,2";
200209
VERSIONING_SYSTEM = "apple-generic";
201210
VERSION_INFO_PREFIX = "";
@@ -210,14 +219,22 @@
210219
CLANG_CXX_LIBRARY = "libc++";
211220
CLANG_ENABLE_MODULES = YES;
212221
CLANG_ENABLE_OBJC_ARC = YES;
222+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
213223
CLANG_WARN_BOOL_CONVERSION = YES;
224+
CLANG_WARN_COMMA = YES;
214225
CLANG_WARN_CONSTANT_CONVERSION = YES;
226+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
215227
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
216228
CLANG_WARN_EMPTY_BODY = YES;
217229
CLANG_WARN_ENUM_CONVERSION = YES;
218230
CLANG_WARN_INFINITE_RECURSION = YES;
219231
CLANG_WARN_INT_CONVERSION = YES;
232+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
233+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
234+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
220235
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
236+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
237+
CLANG_WARN_STRICT_PROTOTYPES = YES;
221238
CLANG_WARN_SUSPICIOUS_MOVE = YES;
222239
CLANG_WARN_UNREACHABLE_CODE = YES;
223240
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -239,6 +256,7 @@
239256
MTL_ENABLE_DEBUG_INFO = NO;
240257
SDKROOT = iphoneos;
241258
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
259+
SWIFT_VERSION = 4.0;
242260
TARGETED_DEVICE_FAMILY = "1,2";
243261
VALIDATE_PRODUCT = YES;
244262
VERSIONING_SYSTEM = "apple-generic";
@@ -250,6 +268,7 @@
250268
isa = XCBuildConfiguration;
251269
buildSettings = {
252270
CLANG_ENABLE_MODULES = YES;
271+
CODE_SIGN_IDENTITY = "";
253272
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
254273
DEFINES_MODULE = YES;
255274
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -262,14 +281,16 @@
262281
PRODUCT_NAME = "$(TARGET_NAME)";
263282
SKIP_INSTALL = YES;
264283
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
265-
SWIFT_VERSION = 3.0;
284+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
285+
SWIFT_VERSION = 4.0;
266286
};
267287
name = Debug;
268288
};
269289
BE06ECA31B63617B009A1999 /* Release */ = {
270290
isa = XCBuildConfiguration;
271291
buildSettings = {
272292
CLANG_ENABLE_MODULES = YES;
293+
CODE_SIGN_IDENTITY = "";
273294
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
274295
DEFINES_MODULE = YES;
275296
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -281,7 +302,8 @@
281302
PRODUCT_BUNDLE_IDENTIFIER = "appknop.$(PRODUCT_NAME:rfc1034identifier)";
282303
PRODUCT_NAME = "$(TARGET_NAME)";
283304
SKIP_INSTALL = YES;
284-
SWIFT_VERSION = 3.0;
305+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
306+
SWIFT_VERSION = 4.0;
285307
};
286308
name = Release;
287309
};

‎KYCircularProgress.xcodeproj/xcshareddata/xcschemes/KYCircularProgress.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0800"
3+
LastUpgradeVersion = "0930"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎KYCircularProgress.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

+8
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>

‎Source/KYCircularProgress.swift

+6-6
Original file line numberDiff line numberDiff line change
@@ -134,12 +134,12 @@ open class KYCircularProgress: UIView {
134134
/**
135135
This closure is called when set value to `progress` property.
136136
*/
137-
fileprivate var progressChanged: progressChangedHandler?
137+
private var progressChanged: progressChangedHandler?
138138

139139
/**
140140
Main progress view.
141141
*/
142-
fileprivate lazy var progressView: KYCircularShapeView = {
142+
private lazy var progressView: KYCircularShapeView = {
143143
let progressView = KYCircularShapeView(frame: self.bounds)
144144
progressView.shapeLayer.fillColor = UIColor.clear.cgColor
145145
progressView.shapeLayer.lineWidth = CGFloat(self.lineWidth)
@@ -153,7 +153,7 @@ open class KYCircularProgress: UIView {
153153
/**
154154
Gradient mask layer of `progressView`.
155155
*/
156-
fileprivate lazy var gradientLayer: CAGradientLayer = {
156+
private lazy var gradientLayer: CAGradientLayer = {
157157
let gradientLayer = CAGradientLayer(layer: self.layer)
158158
gradientLayer.frame = self.progressView.frame
159159
gradientLayer.startPoint = CGPoint(x: 0, y: 0.5)
@@ -167,7 +167,7 @@ open class KYCircularProgress: UIView {
167167
/**
168168
Guide view of `progressView`.
169169
*/
170-
fileprivate lazy var guideView: KYCircularShapeView = {
170+
private lazy var guideView: KYCircularShapeView = {
171171
let guideView = KYCircularShapeView(frame: self.bounds)
172172
guideView.shapeLayer.fillColor = UIColor.clear.cgColor
173173
guideView.shapeLayer.lineWidth = CGFloat(self.guideLineWidth)
@@ -182,7 +182,7 @@ open class KYCircularProgress: UIView {
182182
/**
183183
Mask layer of `progressGuideView`.
184184
*/
185-
fileprivate lazy var guideLayer: CALayer = {
185+
private lazy var guideLayer: CALayer = {
186186
let guideLayer = CAGradientLayer(layer: self.layer)
187187
guideLayer.frame = self.guideView.frame
188188
guideLayer.mask = self.guideView.shapeLayer
@@ -241,7 +241,7 @@ open class KYCircularProgress: UIView {
241241
delegate?.progressChanged(progress: clipProgress, circularProgress: self)
242242
}
243243

244-
fileprivate func update(colors: [UIColor]) {
244+
private func update(colors: [UIColor]) {
245245
gradientLayer.colors = colors.map {$0.cgColor}
246246
if colors.count == 1 {
247247
gradientLayer.colors?.append(colors.first!.cgColor)

‎iOS Example.xcodeproj/project.pbxproj

+24-12
Original file line numberDiff line numberDiff line change
@@ -119,13 +119,13 @@
119119
BE5E147B19DCFF2500B261B1 /* Project object */ = {
120120
isa = PBXProject;
121121
attributes = {
122-
LastUpgradeCheck = 0800;
122+
LastUpgradeCheck = 0930;
123123
ORGANIZATIONNAME = "Kengo Yokoyama";
124124
TargetAttributes = {
125125
BE5E148219DCFF2500B261B1 = {
126126
CreatedOnToolsVersion = 6.1;
127127
DevelopmentTeam = QZJ74E9669;
128-
LastSwiftMigration = 0800;
128+
LastSwiftMigration = 0930;
129129
};
130130
};
131131
};
@@ -200,14 +200,22 @@
200200
CLANG_CXX_LIBRARY = "libc++";
201201
CLANG_ENABLE_MODULES = YES;
202202
CLANG_ENABLE_OBJC_ARC = YES;
203+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
203204
CLANG_WARN_BOOL_CONVERSION = YES;
205+
CLANG_WARN_COMMA = YES;
204206
CLANG_WARN_CONSTANT_CONVERSION = YES;
207+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
205208
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
206209
CLANG_WARN_EMPTY_BODY = YES;
207210
CLANG_WARN_ENUM_CONVERSION = YES;
208211
CLANG_WARN_INFINITE_RECURSION = YES;
209212
CLANG_WARN_INT_CONVERSION = YES;
213+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
214+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
215+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
210216
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
217+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
218+
CLANG_WARN_STRICT_PROTOTYPES = YES;
211219
CLANG_WARN_SUSPICIOUS_MOVE = YES;
212220
CLANG_WARN_UNREACHABLE_CODE = YES;
213221
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -247,14 +255,22 @@
247255
CLANG_CXX_LIBRARY = "libc++";
248256
CLANG_ENABLE_MODULES = YES;
249257
CLANG_ENABLE_OBJC_ARC = YES;
258+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
250259
CLANG_WARN_BOOL_CONVERSION = YES;
260+
CLANG_WARN_COMMA = YES;
251261
CLANG_WARN_CONSTANT_CONVERSION = YES;
262+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
252263
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
253264
CLANG_WARN_EMPTY_BODY = YES;
254265
CLANG_WARN_ENUM_CONVERSION = YES;
255266
CLANG_WARN_INFINITE_RECURSION = YES;
256267
CLANG_WARN_INT_CONVERSION = YES;
268+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
269+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
270+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
257271
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
272+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
273+
CLANG_WARN_STRICT_PROTOTYPES = YES;
258274
CLANG_WARN_SUSPICIOUS_MOVE = YES;
259275
CLANG_WARN_UNREACHABLE_CODE = YES;
260276
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -285,15 +301,13 @@
285301
buildSettings = {
286302
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
287303
DEVELOPMENT_TEAM = QZJ74E9669;
288-
FRAMEWORK_SEARCH_PATHS = (
289-
"$(inherited)",
290-
"$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/KYCircularProgress-gjippbvmjapmhudfezxxpseouvlq/Build/Products/Debug-iphoneos",
291-
);
304+
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
292305
INFOPLIST_FILE = "$(SRCROOT)/Example/Info.plist";
293306
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
294307
PRODUCT_BUNDLE_IDENTIFIER = "AppKnop.$(PRODUCT_NAME:rfc1034identifier)";
295308
PRODUCT_NAME = "iOS Example";
296-
SWIFT_VERSION = 3.0;
309+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
310+
SWIFT_VERSION = 4.0;
297311
};
298312
name = Debug;
299313
};
@@ -302,15 +316,13 @@
302316
buildSettings = {
303317
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
304318
DEVELOPMENT_TEAM = QZJ74E9669;
305-
FRAMEWORK_SEARCH_PATHS = (
306-
"$(inherited)",
307-
"$(USER_LIBRARY_DIR)/Developer/Xcode/DerivedData/KYCircularProgress-gjippbvmjapmhudfezxxpseouvlq/Build/Products/Debug-iphoneos",
308-
);
319+
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
309320
INFOPLIST_FILE = "$(SRCROOT)/Example/Info.plist";
310321
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
311322
PRODUCT_BUNDLE_IDENTIFIER = "AppKnop.$(PRODUCT_NAME:rfc1034identifier)";
312323
PRODUCT_NAME = "iOS Example";
313-
SWIFT_VERSION = 3.0;
324+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
325+
SWIFT_VERSION = 4.0;
314326
};
315327
name = Release;
316328
};

0 commit comments

Comments
 (0)