Skip to content

Commit c694d87

Browse files
wiboscowibosco
committed
Updated project to Swift 5
1 parent 2a9083a commit c694d87

11 files changed

Lines changed: 291 additions & 198 deletions

File tree

‎.ruby-version‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.3.10

‎.travis.yml‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎CoreDataMigration-Example.xcodeproj/project.pbxproj‎

Lines changed: 57 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 48;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -431,8 +431,9 @@
431431
43AB8ADD1F66E6A5003153B3 /* Project object */ = {
432432
isa = PBXProject;
433433
attributes = {
434+
BuildIndependentTargetsInParallel = YES;
434435
LastSwiftUpdateCheck = 0900;
435-
LastUpgradeCheck = 1010;
436+
LastUpgradeCheck = 2630;
436437
ORGANIZATIONNAME = "William Boles";
437438
TargetAttributes = {
438439
43AB8AE41F66E6A5003153B3 = {
@@ -586,6 +587,7 @@
586587
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
587588
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
588589
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
590+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
589591
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
590592
CLANG_WARN_STRICT_PROTOTYPES = YES;
591593
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -597,6 +599,7 @@
597599
DEBUG_INFORMATION_FORMAT = dwarf;
598600
ENABLE_STRICT_OBJC_MSGSEND = YES;
599601
ENABLE_TESTABILITY = YES;
602+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
600603
GCC_C_LANGUAGE_STANDARD = gnu11;
601604
GCC_DYNAMIC_NO_PIC = NO;
602605
GCC_NO_COMMON_BLOCKS = YES;
@@ -611,12 +614,14 @@
611614
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
612615
GCC_WARN_UNUSED_FUNCTION = YES;
613616
GCC_WARN_UNUSED_VARIABLE = YES;
614-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
617+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
615618
MTL_ENABLE_DEBUG_INFO = YES;
616619
ONLY_ACTIVE_ARCH = YES;
617620
SDKROOT = iphoneos;
621+
STRING_CATALOG_GENERATE_SYMBOLS = YES;
618622
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
619623
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
624+
SWIFT_VERSION = 5.0;
620625
};
621626
name = Debug;
622627
};
@@ -645,6 +650,7 @@
645650
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
646651
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
647652
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
653+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
648654
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
649655
CLANG_WARN_STRICT_PROTOTYPES = YES;
650656
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -656,6 +662,7 @@
656662
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
657663
ENABLE_NS_ASSERTIONS = NO;
658664
ENABLE_STRICT_OBJC_MSGSEND = YES;
665+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
659666
GCC_C_LANGUAGE_STANDARD = gnu11;
660667
GCC_NO_COMMON_BLOCKS = YES;
661668
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -664,10 +671,13 @@
664671
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
665672
GCC_WARN_UNUSED_FUNCTION = YES;
666673
GCC_WARN_UNUSED_VARIABLE = YES;
667-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
674+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
668675
MTL_ENABLE_DEBUG_INFO = NO;
669676
SDKROOT = iphoneos;
670-
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
677+
STRING_CATALOG_GENERATE_SYMBOLS = YES;
678+
SWIFT_COMPILATION_MODE = wholemodule;
679+
SWIFT_OPTIMIZATION_LEVEL = "-O";
680+
SWIFT_VERSION = 5.0;
671681
VALIDATE_PRODUCT = YES;
672682
};
673683
name = Release;
@@ -678,12 +688,18 @@
678688
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
679689
CODE_SIGN_STYLE = Automatic;
680690
INFOPLIST_FILE = "CoreDataMigration-Example/Application/Info.plist";
681-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
682-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
691+
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
692+
LD_RUNPATH_SEARCH_PATHS = (
693+
"$(inherited)",
694+
"@executable_path/Frameworks",
695+
);
683696
PRODUCT_BUNDLE_IDENTIFIER = "com.williamboles.CoreDataMigration-Example";
684697
PRODUCT_NAME = "$(TARGET_NAME)";
685-
SWIFT_VERSION = 4.2;
686-
TARGETED_DEVICE_FAMILY = "1,2";
698+
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
699+
SUPPORTS_MACCATALYST = NO;
700+
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
701+
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
702+
TARGETED_DEVICE_FAMILY = 1;
687703
};
688704
name = Debug;
689705
};
@@ -693,48 +709,68 @@
693709
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
694710
CODE_SIGN_STYLE = Automatic;
695711
INFOPLIST_FILE = "CoreDataMigration-Example/Application/Info.plist";
696-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
697-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
712+
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
713+
LD_RUNPATH_SEARCH_PATHS = (
714+
"$(inherited)",
715+
"@executable_path/Frameworks",
716+
);
698717
PRODUCT_BUNDLE_IDENTIFIER = "com.williamboles.CoreDataMigration-Example";
699718
PRODUCT_NAME = "$(TARGET_NAME)";
700-
SWIFT_VERSION = 4.2;
701-
TARGETED_DEVICE_FAMILY = "1,2";
719+
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
720+
SUPPORTS_MACCATALYST = NO;
721+
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
722+
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
723+
TARGETED_DEVICE_FAMILY = 1;
702724
};
703725
name = Release;
704726
};
705727
43AB8B091F66E6A5003153B3 /* Debug */ = {
706728
isa = XCBuildConfiguration;
707729
buildSettings = {
708-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
709730
BUNDLE_LOADER = "$(TEST_HOST)";
710731
CLANG_ENABLE_MODULES = YES;
711732
CODE_SIGN_STYLE = Automatic;
712733
INFOPLIST_FILE = "CoreDataMigration-ExampleTests/Supporting Files/Info.plist";
713-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
734+
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
735+
LD_RUNPATH_SEARCH_PATHS = (
736+
"$(inherited)",
737+
"@executable_path/Frameworks",
738+
"@loader_path/Frameworks",
739+
);
714740
PRODUCT_BUNDLE_IDENTIFIER = "com.williamboles.CoreDataMigration-ExampleTests";
715741
PRODUCT_NAME = "$(TARGET_NAME)";
742+
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
743+
SUPPORTS_MACCATALYST = NO;
744+
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
745+
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
716746
SWIFT_OBJC_BRIDGING_HEADER = "";
717747
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
718-
SWIFT_VERSION = 4.2;
719-
TARGETED_DEVICE_FAMILY = "1,2";
748+
TARGETED_DEVICE_FAMILY = 1;
720749
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/CoreDataMigration-Example.app/CoreDataMigration-Example";
721750
};
722751
name = Debug;
723752
};
724753
43AB8B0A1F66E6A5003153B3 /* Release */ = {
725754
isa = XCBuildConfiguration;
726755
buildSettings = {
727-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
728756
BUNDLE_LOADER = "$(TEST_HOST)";
729757
CLANG_ENABLE_MODULES = YES;
730758
CODE_SIGN_STYLE = Automatic;
731759
INFOPLIST_FILE = "CoreDataMigration-ExampleTests/Supporting Files/Info.plist";
732-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
760+
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
761+
LD_RUNPATH_SEARCH_PATHS = (
762+
"$(inherited)",
763+
"@executable_path/Frameworks",
764+
"@loader_path/Frameworks",
765+
);
733766
PRODUCT_BUNDLE_IDENTIFIER = "com.williamboles.CoreDataMigration-ExampleTests";
734767
PRODUCT_NAME = "$(TARGET_NAME)";
768+
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
769+
SUPPORTS_MACCATALYST = NO;
770+
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
771+
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
735772
SWIFT_OBJC_BRIDGING_HEADER = "";
736-
SWIFT_VERSION = 4.2;
737-
TARGETED_DEVICE_FAMILY = "1,2";
773+
TARGETED_DEVICE_FAMILY = 1;
738774
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/CoreDataMigration-Example.app/CoreDataMigration-Example";
739775
};
740776
name = Release;

‎CoreDataMigration-Example.xcodeproj/xcshareddata/xcschemes/CoreDataMigration-Example.xcscheme‎

Lines changed: 13 additions & 17 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 = "1010"
3+
LastUpgradeVersion = "2630"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -27,18 +27,6 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "NO">
30-
<Testables>
31-
<TestableReference
32-
skipped = "NO">
33-
<BuildableReference
34-
BuildableIdentifier = "primary"
35-
BlueprintIdentifier = "43AB8AFB1F66E6A5003153B3"
36-
BuildableName = "CoreDataMigration-ExampleTests.xctest"
37-
BlueprintName = "CoreDataMigration-ExampleTests"
38-
ReferencedContainer = "container:CoreDataMigration-Example.xcodeproj">
39-
</BuildableReference>
40-
</TestableReference>
41-
</Testables>
4230
<MacroExpansion>
4331
<BuildableReference
4432
BuildableIdentifier = "primary"
@@ -55,8 +43,18 @@
5543
isEnabled = "YES">
5644
</EnvironmentVariable>
5745
</EnvironmentVariables>
58-
<AdditionalOptions>
59-
</AdditionalOptions>
46+
<Testables>
47+
<TestableReference
48+
skipped = "NO">
49+
<BuildableReference
50+
BuildableIdentifier = "primary"
51+
BlueprintIdentifier = "43AB8AFB1F66E6A5003153B3"
52+
BuildableName = "CoreDataMigration-ExampleTests.xctest"
53+
BlueprintName = "CoreDataMigration-ExampleTests"
54+
ReferencedContainer = "container:CoreDataMigration-Example.xcodeproj">
55+
</BuildableReference>
56+
</TestableReference>
57+
</Testables>
6058
</TestAction>
6159
<LaunchAction
6260
buildConfiguration = "Debug"
@@ -78,8 +76,6 @@
7876
ReferencedContainer = "container:CoreDataMigration-Example.xcodeproj">
7977
</BuildableReference>
8078
</BuildableProductRunnable>
81-
<AdditionalOptions>
82-
</AdditionalOptions>
8379
</LaunchAction>
8480
<ProfileAction
8581
buildConfiguration = "Release"

‎CoreDataMigration-Example/Application/AppDelegate.swift‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -31,28 +31,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
3131
return true
3232
}
3333

34-
func applicationWillResignActive(_ application: UIApplication) {
35-
// 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.
36-
// Use this method to pause ongoing tasks, disable timers, and invalidate graphics rendering callbacks. Games should use this method to pause the game.
37-
}
38-
39-
func applicationDidEnterBackground(_ application: UIApplication) {
40-
// 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.
41-
// If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
42-
}
43-
44-
func applicationWillEnterForeground(_ application: UIApplication) {
45-
// Called as part of the transition from the background to the active state; here you can undo many of the changes made on entering the background.
46-
}
47-
48-
func applicationDidBecomeActive(_ application: UIApplication) {
49-
// 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.
50-
}
51-
5234
func applicationWillTerminate(_ application: UIApplication) {
53-
// Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
54-
// Saves changes in the application's managed object context before the application terminates.
55-
5635
try? CoreDataManager.shared.mainContext.save()
5736
}
5837

‎CoreDataMigration-Example/ViewControllers/Loading/AppLoadingViewController.swift‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,4 @@
88

99
import UIKit
1010

11-
class AppLoadingViewController: UIViewController {
12-
13-
}
11+
class AppLoadingViewController: UIViewController { }

‎CoreDataMigration-Example/ViewControllers/Writer/PostSectionWriterTableViewCell.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ struct PostSectionWriterTableViewCellViewModel {
1414
var body: String
1515
}
1616

17-
protocol PostSectionWriterTableViewCellDelegate: class {
17+
protocol PostSectionWriterTableViewCellDelegate: AnyObject {
1818

1919
func didSetTitle(cell: PostSectionWriterTableViewCell, to title: String)
2020
func didSetBody(cell: PostSectionWriterTableViewCell, to body: String)

‎Gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
source "https://rubygems.org"
22

3-
gem "fastlane", "2.104.0"
3+
gem "fastlane", "2.232.2"

0 commit comments

Comments
 (0)