Skip to content

Commit ac3d589

Browse files
vikmeupvikmeup
authored
Merge pull request #240 from m-tatsuto/swift3
Swift3
2 parents 7e13200 + 69121cc commit ac3d589

File tree

15 files changed

+94
-63
lines changed

15 files changed

+94
-63
lines changed

‎Example/SCLAlertViewExample.xcodeproj/project.pbxproj‎

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -214,11 +214,13 @@
214214
attributes = {
215215
LastSwiftMigration = 0700;
216216
LastSwiftUpdateCheck = 0700;
217-
LastUpgradeCheck = 0700;
217+
LastUpgradeCheck = 0800;
218218
ORGANIZATIONNAME = "Viktor Radchenko";
219219
TargetAttributes = {
220220
CEABB2401942AD9700FCB13C = {
221221
CreatedOnToolsVersion = 6.0;
222+
DevelopmentTeam = H9USWT9VUG;
223+
LastSwiftMigration = 0800;
222224
};
223225
CEABB2541942AD9700FCB13C = {
224226
CreatedOnToolsVersion = 6.0;
@@ -339,8 +341,10 @@
339341
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
340342
CLANG_WARN_EMPTY_BODY = YES;
341343
CLANG_WARN_ENUM_CONVERSION = YES;
344+
CLANG_WARN_INFINITE_RECURSION = YES;
342345
CLANG_WARN_INT_CONVERSION = YES;
343346
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
347+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
344348
CLANG_WARN_UNREACHABLE_CODE = YES;
345349
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
346350
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -349,6 +353,7 @@
349353
ENABLE_TESTABILITY = YES;
350354
GCC_C_LANGUAGE_STANDARD = gnu99;
351355
GCC_DYNAMIC_NO_PIC = NO;
356+
GCC_NO_COMMON_BLOCKS = YES;
352357
GCC_OPTIMIZATION_LEVEL = 0;
353358
GCC_PREPROCESSOR_DEFINITIONS = (
354359
"DEBUG=1",
@@ -361,7 +366,7 @@
361366
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
362367
GCC_WARN_UNUSED_FUNCTION = YES;
363368
GCC_WARN_UNUSED_VARIABLE = YES;
364-
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
369+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
365370
METAL_ENABLE_DEBUG_INFO = YES;
366371
ONLY_ACTIVE_ARCH = YES;
367372
SDKROOT = iphoneos;
@@ -382,56 +387,64 @@
382387
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
383388
CLANG_WARN_EMPTY_BODY = YES;
384389
CLANG_WARN_ENUM_CONVERSION = YES;
390+
CLANG_WARN_INFINITE_RECURSION = YES;
385391
CLANG_WARN_INT_CONVERSION = YES;
386392
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
393+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
387394
CLANG_WARN_UNREACHABLE_CODE = YES;
388395
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
389396
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
390397
COPY_PHASE_STRIP = YES;
391398
ENABLE_NS_ASSERTIONS = NO;
392399
ENABLE_STRICT_OBJC_MSGSEND = YES;
393400
GCC_C_LANGUAGE_STANDARD = gnu99;
401+
GCC_NO_COMMON_BLOCKS = YES;
394402
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
395403
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
396404
GCC_WARN_UNDECLARED_SELECTOR = YES;
397405
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
398406
GCC_WARN_UNUSED_FUNCTION = YES;
399407
GCC_WARN_UNUSED_VARIABLE = YES;
400-
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
408+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
401409
METAL_ENABLE_DEBUG_INFO = NO;
402410
SDKROOT = iphoneos;
411+
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
403412
VALIDATE_PRODUCT = YES;
404413
};
405414
name = Release;
406415
};
407416
CEABB2601942AD9700FCB13C /* Debug */ = {
408417
isa = XCBuildConfiguration;
409418
buildSettings = {
419+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
410420
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
411421
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
412-
EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
422+
DEVELOPMENT_TEAM = H9USWT9VUG;
413423
ENABLE_BITCODE = YES;
414424
INFOPLIST_FILE = SCLAlertViewExample/Info.plist;
415425
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
416426
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
417427
PRODUCT_BUNDLE_IDENTIFIER = "SIX-DAYS-LLC.${PRODUCT_NAME:rfc1034identifier}";
418428
PRODUCT_NAME = "$(TARGET_NAME)";
429+
SWIFT_VERSION = 3.0;
419430
TARGETED_DEVICE_FAMILY = "1,2";
420431
};
421432
name = Debug;
422433
};
423434
CEABB2611942AD9700FCB13C /* Release */ = {
424435
isa = XCBuildConfiguration;
425436
buildSettings = {
437+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
426438
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
427439
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
428-
EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
440+
DEVELOPMENT_TEAM = H9USWT9VUG;
429441
ENABLE_BITCODE = YES;
430442
INFOPLIST_FILE = SCLAlertViewExample/Info.plist;
431443
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
432444
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
433445
PRODUCT_BUNDLE_IDENTIFIER = "SIX-DAYS-LLC.${PRODUCT_NAME:rfc1034identifier}";
434446
PRODUCT_NAME = "$(TARGET_NAME)";
447+
SWIFT_VERSION = 3.0;
435448
TARGETED_DEVICE_FAMILY = "1,2";
436449
};
437450
name = Release;

‎Example/SCLAlertViewExample.xcodeproj/xcuserdata/user.xcuserdatad/xcschemes/SCLAlertViewExample.xcscheme‎

Lines changed: 12 additions & 7 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 = "0600"
3+
LastUpgradeVersion = "0800"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -23,10 +23,10 @@
2323
</BuildActionEntries>
2424
</BuildAction>
2525
<TestAction
26+
buildConfiguration = "Debug"
2627
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2728
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
28-
shouldUseLaunchSchemeArgsEnv = "YES"
29-
buildConfiguration = "Debug">
29+
shouldUseLaunchSchemeArgsEnv = "YES">
3030
<Testables>
3131
<TestableReference
3232
skipped = "NO">
@@ -48,17 +48,21 @@
4848
ReferencedContainer = "container:SCLAlertViewExample.xcodeproj">
4949
</BuildableReference>
5050
</MacroExpansion>
51+
<AdditionalOptions>
52+
</AdditionalOptions>
5153
</TestAction>
5254
<LaunchAction
55+
buildConfiguration = "Debug"
5356
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5457
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
5558
launchStyle = "0"
5659
useCustomWorkingDirectory = "NO"
57-
buildConfiguration = "Debug"
5860
ignoresPersistentStateOnLaunch = "NO"
5961
debugDocumentVersioning = "YES"
62+
debugServiceExtension = "internal"
6063
allowLocationSimulation = "YES">
61-
<BuildableProductRunnable>
64+
<BuildableProductRunnable
65+
runnableDebuggingMode = "0">
6266
<BuildableReference
6367
BuildableIdentifier = "primary"
6468
BlueprintIdentifier = "CEABB2401942AD9700FCB13C"
@@ -71,12 +75,13 @@
7175
</AdditionalOptions>
7276
</LaunchAction>
7377
<ProfileAction
78+
buildConfiguration = "Release"
7479
shouldUseLaunchSchemeArgsEnv = "YES"
7580
savedToolIdentifier = ""
7681
useCustomWorkingDirectory = "NO"
77-
buildConfiguration = "Release"
7882
debugDocumentVersioning = "YES">
79-
<BuildableProductRunnable>
83+
<BuildableProductRunnable
84+
runnableDebuggingMode = "0">
8085
<BuildableReference
8186
BuildableIdentifier = "primary"
8287
BlueprintIdentifier = "CEABB2401942AD9700FCB13C"

‎Example/SCLAlertViewExample/AppDelegate.swift‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,30 +13,30 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
1313

1414
var window: UIWindow?
1515

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

21-
func applicationWillResignActive(application: UIApplication) {
21+
func applicationWillResignActive(_ application: UIApplication) {
2222
// 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.
2323
// 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.
2424
}
2525

26-
func applicationDidEnterBackground(application: UIApplication) {
26+
func applicationDidEnterBackground(_ application: UIApplication) {
2727
// 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.
2828
// If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
2929
}
3030

31-
func applicationWillEnterForeground(application: UIApplication) {
31+
func applicationWillEnterForeground(_ application: UIApplication) {
3232
// 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.
3333
}
3434

35-
func applicationDidBecomeActive(application: UIApplication) {
35+
func applicationDidBecomeActive(_ application: UIApplication) {
3636
// 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.
3737
}
3838

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

‎Example/SCLAlertViewExample/Images.xcassets/AppIcon.appiconset/Contents.json‎

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,51 @@
11
{
22
"images" : [
33
{
4+
"size" : "20x20",
45
"idiom" : "iphone",
5-
"size" : "29x29",
6+
"filename" : "icon_40x40.png",
67
"scale" : "2x"
78
},
89
{
10+
"size" : "20x20",
911
"idiom" : "iphone",
10-
"size" : "29x29",
12+
"filename" : "icon_60x60.png",
1113
"scale" : "3x"
1214
},
1315
{
16+
"size" : "29x29",
1417
"idiom" : "iphone",
15-
"size" : "40x40",
18+
"filename" : "icon_58x58.png",
1619
"scale" : "2x"
1720
},
1821
{
22+
"size" : "29x29",
1923
"idiom" : "iphone",
20-
"size" : "40x40",
24+
"filename" : "icon_87x87.png",
2125
"scale" : "3x"
2226
},
2327
{
28+
"size" : "40x40",
2429
"idiom" : "iphone",
25-
"size" : "60x60",
30+
"filename" : "icon_80x80.png",
2631
"scale" : "2x"
2732
},
2833
{
34+
"size" : "40x40",
35+
"idiom" : "iphone",
36+
"filename" : "icon_120x120.png",
37+
"scale" : "3x"
38+
},
39+
{
40+
"size" : "60x60",
2941
"idiom" : "iphone",
42+
"filename" : "icon_120x120-1.png",
43+
"scale" : "2x"
44+
},
45+
{
3046
"size" : "60x60",
47+
"idiom" : "iphone",
48+
"filename" : "icon_180x180.png",
3149
"scale" : "3x"
3250
}
3351
],

‎Example/SCLAlertViewExample/Images.xcassets/AppIcon.appiconset/icon_120x120-1.png‎

7.37 KB
Loading

‎Example/SCLAlertViewExample/Images.xcassets/AppIcon.appiconset/icon_120x120.png‎

7.37 KB
Loading

‎Example/SCLAlertViewExample/Images.xcassets/AppIcon.appiconset/icon_180x180.png‎

13.3 KB
Loading

‎Example/SCLAlertViewExample/Images.xcassets/AppIcon.appiconset/icon_40x40.png‎

2.15 KB
Loading

‎Example/SCLAlertViewExample/Images.xcassets/AppIcon.appiconset/icon_58x58.png‎

2.96 KB
Loading

‎Example/SCLAlertViewExample/Images.xcassets/AppIcon.appiconset/icon_60x60.png‎

3.09 KB
Loading

0 commit comments

Comments
 (0)