Skip to content

Commit 193a272

Browse files
Luca HagelLuca Hagel
Luca Hagel
authored and
Luca Hagel
committed
Swift3 Conversiion Part One
1 parent a157f2e commit 193a272

File tree

116 files changed

+983
-3756
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

116 files changed

+983
-3756
lines changed

.gitignore

100644100755
File mode changed.

Menu Checker.xcodeproj/project.pbxproj

100644100755
+13-3
Original file line numberDiff line numberDiff line change
@@ -183,11 +183,12 @@
183183
isa = PBXProject;
184184
attributes = {
185185
LastSwiftUpdateCheck = 0730;
186-
LastUpgradeCheck = 0730;
186+
LastUpgradeCheck = 0800;
187187
ORGANIZATIONNAME = "Luca Hagel";
188188
TargetAttributes = {
189189
8130DBA41D340B7300B56260 = {
190190
CreatedOnToolsVersion = 7.3.1;
191+
LastSwiftMigration = 0800;
191192
};
192193
};
193194
};
@@ -337,8 +338,10 @@
337338
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
338339
CLANG_WARN_EMPTY_BODY = YES;
339340
CLANG_WARN_ENUM_CONVERSION = YES;
341+
CLANG_WARN_INFINITE_RECURSION = YES;
340342
CLANG_WARN_INT_CONVERSION = YES;
341343
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
344+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
342345
CLANG_WARN_UNREACHABLE_CODE = YES;
343346
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
344347
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -360,7 +363,7 @@
360363
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
361364
GCC_WARN_UNUSED_FUNCTION = YES;
362365
GCC_WARN_UNUSED_VARIABLE = YES;
363-
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
366+
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
364367
MTL_ENABLE_DEBUG_INFO = YES;
365368
ONLY_ACTIVE_ARCH = YES;
366369
SDKROOT = iphoneos;
@@ -382,8 +385,10 @@
382385
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
383386
CLANG_WARN_EMPTY_BODY = YES;
384387
CLANG_WARN_ENUM_CONVERSION = YES;
388+
CLANG_WARN_INFINITE_RECURSION = YES;
385389
CLANG_WARN_INT_CONVERSION = YES;
386390
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
391+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
387392
CLANG_WARN_UNREACHABLE_CODE = YES;
388393
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
389394
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -399,9 +404,10 @@
399404
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
400405
GCC_WARN_UNUSED_FUNCTION = YES;
401406
GCC_WARN_UNUSED_VARIABLE = YES;
402-
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
407+
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
403408
MTL_ENABLE_DEBUG_INFO = NO;
404409
SDKROOT = iphoneos;
410+
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
405411
VALIDATE_PRODUCT = YES;
406412
};
407413
name = Release;
@@ -410,23 +416,27 @@
410416
isa = XCBuildConfiguration;
411417
baseConfigurationReference = 38FF0254FA3C9CCEDD69CFB2 /* Pods-Menu Checker.debug.xcconfig */;
412418
buildSettings = {
419+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
413420
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
414421
INFOPLIST_FILE = "Menu Checker/Info.plist";
415422
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
416423
PRODUCT_BUNDLE_IDENTIFIER = "com.luhagel.Menu-Checker";
417424
PRODUCT_NAME = "$(TARGET_NAME)";
425+
SWIFT_VERSION = 3.0;
418426
};
419427
name = Debug;
420428
};
421429
8130DBBB1D340B7300B56260 /* Release */ = {
422430
isa = XCBuildConfiguration;
423431
baseConfigurationReference = 5582611488B19295C0CA678D /* Pods-Menu Checker.release.xcconfig */;
424432
buildSettings = {
433+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
425434
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
426435
INFOPLIST_FILE = "Menu Checker/Info.plist";
427436
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
428437
PRODUCT_BUNDLE_IDENTIFIER = "com.luhagel.Menu-Checker";
429438
PRODUCT_NAME = "$(TARGET_NAME)";
439+
SWIFT_VERSION = 3.0;
430440
};
431441
name = Release;
432442
};

Menu Checker.xcodeproj/project.xcworkspace/contents.xcworkspacedata

100644100755
File mode changed.

Menu Checker.xcodeproj/xcuserdata/luca.xcuserdatad/xcschemes/Menu Checker.xcscheme Menu Checker.xcodeproj/xcuserdata/luhagel.xcuserdatad/xcschemes/Menu Checker.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 = "0730"
3+
LastUpgradeVersion = "0800"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

Menu Checker.xcodeproj/xcuserdata/luca.xcuserdatad/xcschemes/xcschememanagement.plist Menu Checker.xcodeproj/xcuserdata/luhagel.xcuserdatad/xcschemes/xcschememanagement.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<key>Menu Checker.xcscheme</key>
88
<dict>
99
<key>orderHint</key>
10-
<integer>0</integer>
10+
<integer>2</integer>
1111
</dict>
1212
</dict>
1313
<key>SuppressBuildableAutocreation</key>

Menu Checker/AppDelegate.swift

100644100755
+4-27
Original file line numberDiff line numberDiff line change
@@ -17,35 +17,12 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
1717

1818
func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
1919
Fabric.with([Answers.self, Crashlytics.self])
20-
let defaults = NSUserDefaults.standardUserDefaults()
21-
if defaults.arrayForKey("UserPrefs") == nil {
22-
defaults.setObject([String](), forKey: "UserPrefs")
20+
let defaults = UserDefaults.standard
21+
if defaults.array(forKey: "UserPrefs") == nil {
22+
defaults.set([String](), forKey: "UserPrefs")
2323
}
24-
24+
2525
return true
2626
}
27-
28-
func applicationWillResignActive(application: UIApplication) {
29-
// 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.
30-
// 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.
31-
}
32-
33-
func applicationDidEnterBackground(application: UIApplication) {
34-
// 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.
35-
// If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
36-
}
37-
38-
func applicationWillEnterForeground(application: UIApplication) {
39-
// 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.
40-
}
41-
42-
func applicationDidBecomeActive(application: UIApplication) {
43-
// 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.
44-
}
45-
46-
func applicationWillTerminate(application: UIApplication) {
47-
// Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
48-
}
49-
5027
}
5128

Menu Checker/Assets.xcassets/AllergenIcons/Contents.json

100644100755
File mode changed.

Menu Checker/Assets.xcassets/AllergenIcons/Corn.imageset/Contents.json

100644100755
File mode changed.

Menu Checker/Assets.xcassets/AllergenIcons/Corn.imageset/corn.png

100644100755
File mode changed.

Menu Checker/Assets.xcassets/AllergenIcons/Eggs.imageset/Contents.json

100644100755
File mode changed.

Menu Checker/Assets.xcassets/AllergenIcons/Eggs.imageset/egg.png

100644100755
File mode changed.

Menu Checker/Assets.xcassets/AllergenIcons/Fish.imageset/Contents.json

100644100755
File mode changed.

Menu Checker/Assets.xcassets/AllergenIcons/Fish.imageset/fish.png

100644100755
File mode changed.

Menu Checker/Assets.xcassets/AllergenIcons/Milk.imageset/Contents.json

100644100755
File mode changed.

Menu Checker/Assets.xcassets/AllergenIcons/Milk.imageset/dairy.png

100644100755
File mode changed.

Menu Checker/Assets.xcassets/AllergenIcons/Oats.imageset/Contents.json

100644100755
File mode changed.

Menu Checker/Assets.xcassets/AllergenIcons/Oats.imageset/oats.png

100644100755
File mode changed.

Menu Checker/Assets.xcassets/AllergenIcons/Peanuts.imageset/Contents.json

100644100755
File mode changed.

Menu Checker/Assets.xcassets/AllergenIcons/Peanuts.imageset/peanuts.png

100644100755
File mode changed.

Menu Checker/Assets.xcassets/AllergenIcons/SesameSeeds.imageset/Contents.json

100644100755
File mode changed.

Menu Checker/Assets.xcassets/AllergenIcons/SesameSeeds.imageset/sesame_seeds.png

100644100755
File mode changed.

Menu Checker/Assets.xcassets/AllergenIcons/Shellfish.imageset/Contents.json

100644100755
File mode changed.

Menu Checker/Assets.xcassets/AllergenIcons/Shellfish.imageset/shellfish.png

100644100755
File mode changed.

Menu Checker/Assets.xcassets/AllergenIcons/Soybeans.imageset/Contents.json

100644100755
File mode changed.

Menu Checker/Assets.xcassets/AllergenIcons/Soybeans.imageset/soybeans.png

100644100755
File mode changed.

Menu Checker/Assets.xcassets/AllergenIcons/TreeNuts.imageset/Contents.json

100644100755
File mode changed.

Menu Checker/Assets.xcassets/AllergenIcons/TreeNuts.imageset/tree_nuts.png

100644100755
File mode changed.

Menu Checker/Assets.xcassets/AllergenIcons/Wheat.imageset/Contents.json

100644100755
File mode changed.

Menu Checker/Assets.xcassets/AllergenIcons/Wheat.imageset/wheat.png

100644100755
File mode changed.

Menu Checker/Assets.xcassets/AppIcon.appiconset/Contents.json

100644100755
File mode changed.

Menu Checker/Assets.xcassets/AppIcon.appiconset/[email protected]

100644100755
File mode changed.

Menu Checker/Assets.xcassets/AppIcon.appiconset/[email protected]

100644100755
File mode changed.

Menu Checker/Assets.xcassets/AppIcon.appiconset/[email protected]

100644100755
File mode changed.

Menu Checker/Assets.xcassets/AppIcon.appiconset/[email protected]

100644100755
File mode changed.

Menu Checker/Assets.xcassets/AppIcon.appiconset/[email protected]

100644100755
File mode changed.

Menu Checker/Assets.xcassets/AppIcon.appiconset/[email protected]

100644100755
File mode changed.

Menu Checker/Assets.xcassets/Contents.json

100644100755
File mode changed.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"info" : {
3+
"version" : 1,
4+
"author" : "xcode"
5+
}
6+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"filename" : "mcdonalds.jpg",
6+
"scale" : "1x"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"scale" : "2x"
11+
},
12+
{
13+
"idiom" : "universal",
14+
"scale" : "3x"
15+
}
16+
],
17+
"info" : {
18+
"version" : 1,
19+
"author" : "xcode"
20+
}
21+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"filename" : "subway.jpg",
6+
"scale" : "1x"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"scale" : "2x"
11+
},
12+
{
13+
"idiom" : "universal",
14+
"scale" : "3x"
15+
}
16+
],
17+
"info" : {
18+
"version" : 1,
19+
"author" : "xcode"
20+
}
21+
}

Menu Checker/Assets.xcassets/cog.imageset/Contents.json

100644100755
File mode changed.

Menu Checker/Assets.xcassets/cog.imageset/cog.png

100644100755
File mode changed.

Menu Checker/Assets.xcassets/splashscreen.imageset/Contents.json

100644100755
File mode changed.

Menu Checker/Assets.xcassets/splashscreen.imageset/splashscreen.jpg

100644100755
File mode changed.

Menu Checker/Base.lproj/LaunchScreen.storyboard

100644100755
File mode changed.

0 commit comments

Comments
 (0)