Skip to content

Commit 431e320

Browse files
WorldDownTownWorldDownTown
committed
Swift 4
1 parent 277f5a2 commit 431e320

File tree

4 files changed

+30
-18
lines changed

4 files changed

+30
-18
lines changed

‎.swift-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0
1+
4.1.2

‎Demo/Demo.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@
261261
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
262262
GCC_WARN_UNUSED_FUNCTION = YES;
263263
GCC_WARN_UNUSED_VARIABLE = YES;
264-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
264+
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
265265
MTL_ENABLE_DEBUG_INFO = YES;
266266
ONLY_ACTIVE_ARCH = YES;
267267
SDKROOT = iphoneos;
@@ -311,7 +311,7 @@
311311
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
312312
GCC_WARN_UNUSED_FUNCTION = YES;
313313
GCC_WARN_UNUSED_VARIABLE = YES;
314-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
314+
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
315315
MTL_ENABLE_DEBUG_INFO = NO;
316316
SDKROOT = iphoneos;
317317
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -326,11 +326,10 @@
326326
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
327327
DEVELOPMENT_TEAM = S3LY459S86;
328328
INFOPLIST_FILE = Demo/Info.plist;
329-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
330329
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
331330
PRODUCT_BUNDLE_IDENTIFIER = com.shoji.Demo;
332331
PRODUCT_NAME = "$(TARGET_NAME)";
333-
SWIFT_SWIFT3_OBJC_INFERENCE = On;
332+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
334333
SWIFT_VERSION = 4.0;
335334
};
336335
name = Debug;
@@ -341,11 +340,10 @@
341340
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
342341
DEVELOPMENT_TEAM = S3LY459S86;
343342
INFOPLIST_FILE = Demo/Info.plist;
344-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
345343
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
346344
PRODUCT_BUNDLE_IDENTIFIER = com.shoji.Demo;
347345
PRODUCT_NAME = "$(TARGET_NAME)";
348-
SWIFT_SWIFT3_OBJC_INFERENCE = On;
346+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
349347
SWIFT_VERSION = 4.0;
350348
};
351349
name = Release;

‎ZoomTransitioning.xcodeproj/project.pbxproj‎

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
/* Begin PBXBuildFile section */
1010
CE3611EF1D3DA70500E8A268 /* ZoomTransitioning.h in Headers */ = {isa = PBXBuildFile; fileRef = CE3611EE1D3DA70500E8A268 /* ZoomTransitioning.h */; settings = {ATTRIBUTES = (Public, ); }; };
11+
CECC5736211FD40900D9A1F6 /* ZoomInteractiveTransition.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEED3EEF1D3DB0830083383E /* ZoomInteractiveTransition.swift */; };
1112
CEED3EF41D3DB0830083383E /* UIImageView+extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEED3EEE1D3DB0830083383E /* UIImageView+extension.swift */; };
12-
CEED3EF51D3DB0830083383E /* ZoomInteractiveTransition.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEED3EEF1D3DB0830083383E /* ZoomInteractiveTransition.swift */; };
1313
CEED3EF61D3DB0830083383E /* ZoomNavigationControllerDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEED3EF01D3DB0830083383E /* ZoomNavigationControllerDelegate.swift */; };
1414
CEED3EF71D3DB0830083383E /* ZoomTransitionDestinationDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEED3EF11D3DB0830083383E /* ZoomTransitionDestinationDelegate.swift */; };
1515
CEED3EF81D3DB0830083383E /* ZoomTransitioning.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEED3EF21D3DB0830083383E /* ZoomTransitioning.swift */; };
@@ -58,14 +58,14 @@
5858
CE3611ED1D3DA70500E8A268 /* ZoomTransitioning */ = {
5959
isa = PBXGroup;
6060
children = (
61+
CE3611EE1D3DA70500E8A268 /* ZoomTransitioning.h */,
62+
CE3611F01D3DA70500E8A268 /* Info.plist */,
6163
CEED3EEE1D3DB0830083383E /* UIImageView+extension.swift */,
6264
CEED3EEF1D3DB0830083383E /* ZoomInteractiveTransition.swift */,
6365
CEED3EF01D3DB0830083383E /* ZoomNavigationControllerDelegate.swift */,
6466
CEED3EF11D3DB0830083383E /* ZoomTransitionDestinationDelegate.swift */,
6567
CEED3EF21D3DB0830083383E /* ZoomTransitioning.swift */,
6668
CEED3EF31D3DB0830083383E /* ZoomTransitionSourceDelegate.swift */,
67-
CE3611EE1D3DA70500E8A268 /* ZoomTransitioning.h */,
68-
CE3611F01D3DA70500E8A268 /* Info.plist */,
6969
);
7070
path = ZoomTransitioning;
7171
sourceTree = "<group>";
@@ -108,12 +108,12 @@
108108
CE3611E21D3DA70500E8A268 /* Project object */ = {
109109
isa = PBXProject;
110110
attributes = {
111-
LastUpgradeCheck = 0800;
111+
LastUpgradeCheck = 0940;
112112
ORGANIZATIONNAME = com.shoji;
113113
TargetAttributes = {
114114
CE3611EA1D3DA70500E8A268 = {
115115
CreatedOnToolsVersion = 7.3.1;
116-
LastSwiftMigration = 0800;
116+
LastSwiftMigration = 0940;
117117
};
118118
};
119119
};
@@ -149,8 +149,8 @@
149149
isa = PBXSourcesBuildPhase;
150150
buildActionMask = 2147483647;
151151
files = (
152+
CECC5736211FD40900D9A1F6 /* ZoomInteractiveTransition.swift in Sources */,
152153
CEED3EF61D3DB0830083383E /* ZoomNavigationControllerDelegate.swift in Sources */,
153-
CEED3EF51D3DB0830083383E /* ZoomInteractiveTransition.swift in Sources */,
154154
CEED3EF41D3DB0830083383E /* UIImageView+extension.swift in Sources */,
155155
CEED3EF91D3DB0830083383E /* ZoomTransitionSourceDelegate.swift in Sources */,
156156
CEED3EF81D3DB0830083383E /* ZoomTransitioning.swift in Sources */,
@@ -170,14 +170,22 @@
170170
CLANG_CXX_LIBRARY = "libc++";
171171
CLANG_ENABLE_MODULES = YES;
172172
CLANG_ENABLE_OBJC_ARC = YES;
173+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
173174
CLANG_WARN_BOOL_CONVERSION = YES;
175+
CLANG_WARN_COMMA = YES;
174176
CLANG_WARN_CONSTANT_CONVERSION = YES;
177+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
175178
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
176179
CLANG_WARN_EMPTY_BODY = YES;
177180
CLANG_WARN_ENUM_CONVERSION = YES;
178181
CLANG_WARN_INFINITE_RECURSION = YES;
179182
CLANG_WARN_INT_CONVERSION = YES;
183+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
184+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
185+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
180186
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
187+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
188+
CLANG_WARN_STRICT_PROTOTYPES = YES;
181189
CLANG_WARN_SUSPICIOUS_MOVE = YES;
182190
CLANG_WARN_UNREACHABLE_CODE = YES;
183191
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -221,14 +229,22 @@
221229
CLANG_CXX_LIBRARY = "libc++";
222230
CLANG_ENABLE_MODULES = YES;
223231
CLANG_ENABLE_OBJC_ARC = YES;
232+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
224233
CLANG_WARN_BOOL_CONVERSION = YES;
234+
CLANG_WARN_COMMA = YES;
225235
CLANG_WARN_CONSTANT_CONVERSION = YES;
236+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
226237
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
227238
CLANG_WARN_EMPTY_BODY = YES;
228239
CLANG_WARN_ENUM_CONVERSION = YES;
229240
CLANG_WARN_INFINITE_RECURSION = YES;
230241
CLANG_WARN_INT_CONVERSION = YES;
242+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
243+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
244+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
231245
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
246+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
247+
CLANG_WARN_STRICT_PROTOTYPES = YES;
232248
CLANG_WARN_SUSPICIOUS_MOVE = YES;
233249
CLANG_WARN_UNREACHABLE_CODE = YES;
234250
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -268,13 +284,12 @@
268284
DYLIB_INSTALL_NAME_BASE = "@rpath";
269285
INFOPLIST_FILE = ZoomTransitioning/Info.plist;
270286
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
271-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
272287
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
273288
PRODUCT_BUNDLE_IDENTIFIER = com.shoji.ZoomTransitioning;
274289
PRODUCT_NAME = "$(TARGET_NAME)";
275290
SKIP_INSTALL = YES;
276291
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
277-
SWIFT_VERSION = 3.0;
292+
SWIFT_VERSION = 4.0;
278293
};
279294
name = Debug;
280295
};
@@ -289,12 +304,11 @@
289304
DYLIB_INSTALL_NAME_BASE = "@rpath";
290305
INFOPLIST_FILE = ZoomTransitioning/Info.plist;
291306
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
292-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
293307
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
294308
PRODUCT_BUNDLE_IDENTIFIER = com.shoji.ZoomTransitioning;
295309
PRODUCT_NAME = "$(TARGET_NAME)";
296310
SKIP_INSTALL = YES;
297-
SWIFT_VERSION = 3.0;
311+
SWIFT_VERSION = 4.0;
298312
};
299313
name = Release;
300314
};

‎ZoomTransitioning.xcodeproj/xcshareddata/xcschemes/ZoomTransitioning.xcscheme‎

Lines changed: 1 addition & 1 deletion
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 = "0940"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

0 commit comments

Comments
 (0)