Skip to content
This repository was archived by the owner on Jan 5, 2021. It is now read-only.

Commit 4acaa5b

Browse files
MartinRGBMartinRGB
committed
* Convert 'Eleasticdraw''s Swift Version to 4.2
* Convert 'Eleasticdraw''s Swift Version to 4.2
1 parent e69b93c commit 4acaa5b

23 files changed

Lines changed: 110 additions & 55 deletions

File tree

‎4.Design-TearDowns/2.Elasticdrawer/Drawer.xcodeproj/project.pbxproj‎

100644100755
Lines changed: 38 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -187,12 +187,13 @@
187187
2E8AF6E11BB0F60500598E25 /* Project object */ = {
188188
isa = PBXProject;
189189
attributes = {
190-
LastUpgradeCheck = 0700;
190+
LastUpgradeCheck = 1000;
191191
ORGANIZATIONNAME = KingMartin;
192192
TargetAttributes = {
193193
2E8AF6E81BB0F60500598E25 = {
194194
CreatedOnToolsVersion = 7.0;
195-
DevelopmentTeam = LK5TSF8WY2;
195+
DevelopmentTeam = W6JVN55AN7;
196+
ProvisioningStyle = Automatic;
196197
};
197198
2E8AF6FC1BB0F60500598E25 = {
198199
CreatedOnToolsVersion = 7.0;
@@ -322,13 +323,23 @@
322323
CLANG_CXX_LIBRARY = "libc++";
323324
CLANG_ENABLE_MODULES = YES;
324325
CLANG_ENABLE_OBJC_ARC = YES;
326+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
325327
CLANG_WARN_BOOL_CONVERSION = YES;
328+
CLANG_WARN_COMMA = YES;
326329
CLANG_WARN_CONSTANT_CONVERSION = YES;
330+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
327331
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
328332
CLANG_WARN_EMPTY_BODY = YES;
329333
CLANG_WARN_ENUM_CONVERSION = YES;
334+
CLANG_WARN_INFINITE_RECURSION = YES;
330335
CLANG_WARN_INT_CONVERSION = YES;
336+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
337+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
338+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
331339
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
340+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
341+
CLANG_WARN_STRICT_PROTOTYPES = YES;
342+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
332343
CLANG_WARN_UNREACHABLE_CODE = YES;
333344
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
334345
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -350,7 +361,7 @@
350361
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
351362
GCC_WARN_UNUSED_FUNCTION = YES;
352363
GCC_WARN_UNUSED_VARIABLE = YES;
353-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
364+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
354365
MTL_ENABLE_DEBUG_INFO = YES;
355366
ONLY_ACTIVE_ARCH = YES;
356367
SDKROOT = iphoneos;
@@ -366,13 +377,23 @@
366377
CLANG_CXX_LIBRARY = "libc++";
367378
CLANG_ENABLE_MODULES = YES;
368379
CLANG_ENABLE_OBJC_ARC = YES;
380+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
369381
CLANG_WARN_BOOL_CONVERSION = YES;
382+
CLANG_WARN_COMMA = YES;
370383
CLANG_WARN_CONSTANT_CONVERSION = YES;
384+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
371385
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
372386
CLANG_WARN_EMPTY_BODY = YES;
373387
CLANG_WARN_ENUM_CONVERSION = YES;
388+
CLANG_WARN_INFINITE_RECURSION = YES;
374389
CLANG_WARN_INT_CONVERSION = YES;
390+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
391+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
392+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
375393
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
394+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
395+
CLANG_WARN_STRICT_PROTOTYPES = YES;
396+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
376397
CLANG_WARN_UNREACHABLE_CODE = YES;
377398
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
378399
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -388,9 +409,10 @@
388409
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
389410
GCC_WARN_UNUSED_FUNCTION = YES;
390411
GCC_WARN_UNUSED_VARIABLE = YES;
391-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
412+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
392413
MTL_ENABLE_DEBUG_INFO = NO;
393414
SDKROOT = iphoneos;
415+
SWIFT_COMPILATION_MODE = wholemodule;
394416
VALIDATE_PRODUCT = YES;
395417
};
396418
name = Release;
@@ -399,25 +421,35 @@
399421
isa = XCBuildConfiguration;
400422
buildSettings = {
401423
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
402-
CODE_SIGN_IDENTITY = "iPhone Developer: Yinyan Qiu (Z6CGVL437S)";
424+
CODE_SIGN_IDENTITY = "iPhone Developer";
425+
CODE_SIGN_STYLE = Automatic;
426+
DEVELOPMENT_TEAM = W6JVN55AN7;
403427
INFOPLIST_FILE = Drawer/Info.plist;
428+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
404429
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
405430
PRODUCT_BUNDLE_IDENTIFIER = com.MartinStudio.Drawer;
406431
PRODUCT_NAME = "$(TARGET_NAME)";
407432
PROVISIONING_PROFILE = "";
433+
PROVISIONING_PROFILE_SPECIFIER = "";
434+
SWIFT_VERSION = 4.2;
408435
};
409436
name = Debug;
410437
};
411438
2E8AF7131BB0F60500598E25 /* Release */ = {
412439
isa = XCBuildConfiguration;
413440
buildSettings = {
414441
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
415-
CODE_SIGN_IDENTITY = "iPhone Developer: Yinyan Qiu (Z6CGVL437S)";
442+
CODE_SIGN_IDENTITY = "iPhone Developer";
443+
CODE_SIGN_STYLE = Automatic;
444+
DEVELOPMENT_TEAM = W6JVN55AN7;
416445
INFOPLIST_FILE = Drawer/Info.plist;
446+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
417447
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
418448
PRODUCT_BUNDLE_IDENTIFIER = com.MartinStudio.Drawer;
419449
PRODUCT_NAME = "$(TARGET_NAME)";
420450
PROVISIONING_PROFILE = "";
451+
PROVISIONING_PROFILE_SPECIFIER = "";
452+
SWIFT_VERSION = 4.2;
421453
};
422454
name = Release;
423455
};

‎4.Design-TearDowns/2.Elasticdrawer/Drawer.xcodeproj/project.xcworkspace/contents.xcworkspacedata‎

100644100755
File mode changed.

‎4.Design-TearDowns/2.Elasticdrawer/Drawer.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>

‎4.Design-TearDowns/2.Elasticdrawer/Drawer.xcodeproj/project.xcworkspace/xcuserdata/MartinRGB.xcuserdatad/UserInterfaceState.xcuserstate‎

100644100755
21.7 KB
Binary file not shown.

‎4.Design-TearDowns/2.Elasticdrawer/Drawer.xcodeproj/xcuserdata/MartinRGB.xcuserdatad/xcschemes/Drawer.xcscheme‎

100644100755
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 = "0700"
3+
LastUpgradeVersion = "1000"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎4.Design-TearDowns/2.Elasticdrawer/Drawer.xcodeproj/xcuserdata/MartinRGB.xcuserdatad/xcschemes/xcschememanagement.plist‎

100644100755
File mode changed.

‎4.Design-TearDowns/2.Elasticdrawer/Drawer/AppDelegate.swift‎

100644100755
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,30 +14,30 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
1414
var window: UIWindow?
1515

1616

17-
func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
17+
private func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
1818
// Override point for customization after application launch.
1919
return true
2020
}
2121

22-
func applicationWillResignActive(application: UIApplication) {
22+
func applicationWillResignActive(_ application: UIApplication) {
2323
// Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
2424
// Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
2525
}
2626

27-
func applicationDidEnterBackground(application: UIApplication) {
27+
func applicationDidEnterBackground(_ application: UIApplication) {
2828
// Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
2929
// If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
3030
}
3131

32-
func applicationWillEnterForeground(application: UIApplication) {
32+
func applicationWillEnterForeground(_ application: UIApplication) {
3333
// Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
3434
}
3535

36-
func applicationDidBecomeActive(application: UIApplication) {
36+
func applicationDidBecomeActive(_ application: UIApplication) {
3737
// Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
3838
}
3939

40-
func applicationWillTerminate(application: UIApplication) {
40+
func applicationWillTerminate(_ application: UIApplication) {
4141
// Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
4242
}
4343

‎4.Design-TearDowns/2.Elasticdrawer/Drawer/Assets.xcassets/AppIcon.appiconset/Contents.json‎

100644100755
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
{
22
"images" : [
3+
{
4+
"idiom" : "iphone",
5+
"size" : "20x20",
6+
"scale" : "2x"
7+
},
8+
{
9+
"idiom" : "iphone",
10+
"size" : "20x20",
11+
"scale" : "3x"
12+
},
313
{
414
"size" : "29x29",
515
"idiom" : "iphone",
@@ -35,6 +45,11 @@
3545
"idiom" : "iphone",
3646
"filename" : "Icon-60@3x.png",
3747
"scale" : "3x"
48+
},
49+
{
50+
"idiom" : "ios-marketing",
51+
"size" : "1024x1024",
52+
"scale" : "1x"
3853
}
3954
],
4055
"info" : {

‎4.Design-TearDowns/2.Elasticdrawer/Drawer/Assets.xcassets/AppIcon.appiconset/Icon-29@2x.png‎

100644100755
File mode changed.

‎4.Design-TearDowns/2.Elasticdrawer/Drawer/Assets.xcassets/AppIcon.appiconset/Icon-29@3x.png‎

100644100755
File mode changed.

0 commit comments

Comments
 (0)