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

Swift 5 support #118

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Swift 5 support #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9e0c794
Swift 5 support
batjo Apr 9, 2019
b0ece34
Merge branch 'master' of https://github.com/3lvis/DATAStack
batjo Apr 9, 2019
40d8f08
Swift 5 support
batjo Apr 9, 2019
a1a2f5e
Converted ObjC demo to Swift 5 as well
batjo Apr 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
osx_image: xcode9
osx_image: xcode10.2
language: objective-c
script:
- xcodebuild -project Demo.xcodeproj -scheme DemoObjectiveC -destination 'platform=iOS Simulator,name=iPhone 7' build | xcpretty
- xcodebuild -project Demo.xcodeproj -scheme DemoSwift -destination 'platform=iOS Simulator,name=iPhone 7' build | xcpretty
- xcodebuild -project Demo.xcodeproj -scheme iOSTests -destination 'platform=iOS Simulator,name=iPhone 7' test | xcpretty
- xcodebuild -project Demo.xcodeproj -scheme DemoObjectiveC -destination 'platform=iOS Simulator,name=iPhone 8' build | xcpretty
- xcodebuild -project Demo.xcodeproj -scheme DemoSwift -destination 'platform=iOS Simulator,name=iPhone 8' build | xcpretty
- xcodebuild -project Demo.xcodeproj -scheme iOSTests -destination 'platform=iOS Simulator,name=iPhone 8' test | xcpretty
- xcodebuild -project Demo.xcodeproj -scheme tvOSTests -destination 'platform=tvOS Simulator,name=Apple TV 1080p' test | xcpretty
- xcodebuild -project Demo.xcodeproj -scheme macOSTests -destination 'platform=OS X' test | xcpretty
notifications:
Expand Down
6 changes: 4 additions & 2 deletions Carthage/Build/.DATASource.version
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified Carthage/Build/iOS/DATASource.framework.dSYM/Contents/Resources/DWARF/DATASource
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/DATASource.framework/DATASource
View file
Open in desktop
Binary file not shown.
1,136 changes: 1,127 additions & 9 deletions Carthage/Build/iOS/DATASource.framework/Headers/DATASource-Swift.h
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified Carthage/Build/iOS/DATASource.framework/Info.plist
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/DATASource.framework/Modules/DATASource.swiftmodule/arm.swiftdoc
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/DATASource.framework/Modules/DATASource.swiftmodule/arm.swiftmodule
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/DATASource.framework/Modules/DATASource.swiftmodule/arm64.swiftdoc
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/DATASource.framework/Modules/DATASource.swiftmodule/arm64.swiftmodule
View file
Open in desktop
Binary file not shown.
Binary file added Carthage/Build/iOS/DATASource.framework/Modules/DATASource.swiftmodule/armv7.swiftdoc
View file
Open in desktop
Binary file not shown.
Binary file added Carthage/Build/iOS/DATASource.framework/Modules/DATASource.swiftmodule/armv7.swiftmodule
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/DATASource.framework/Modules/DATASource.swiftmodule/i386.swiftdoc
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/DATASource.framework/Modules/DATASource.swiftmodule/i386.swiftmodule
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/DATASource.framework/Modules/DATASource.swiftmodule/x86_64.swiftdoc
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/DATASource.framework/Modules/DATASource.swiftmodule/x86_64.swiftmodule
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/tvOS/DATASource.framework.dSYM/Contents/Resources/DWARF/DATASource
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/tvOS/DATASource.framework/DATASource
View file
Open in desktop
Binary file not shown.
390 changes: 382 additions & 8 deletions Carthage/Build/tvOS/DATASource.framework/Headers/DATASource-Swift.h
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified Carthage/Build/tvOS/DATASource.framework/Info.plist
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/tvOS/DATASource.framework/Modules/DATASource.swiftmodule/arm64.swiftdoc
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/tvOS/DATASource.framework/Modules/DATASource.swiftmodule/arm64.swiftmodule
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/tvOS/DATASource.framework/Modules/DATASource.swiftmodule/x86_64.swiftdoc
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/tvOS/DATASource.framework/Modules/DATASource.swiftmodule/x86_64.swiftmodule
View file
Open in desktop
Binary file not shown.
26 changes: 13 additions & 13 deletions Demo.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@
attributes = {
CLASSPREFIX = "";
LastSwiftUpdateCheck = 0730;
LastUpgradeCheck = 0940;
LastUpgradeCheck = 1020;
ORGANIZATIONNAME = "";
TargetAttributes = {
144136EF1DBC057400EC9D44 = {
Expand Down Expand Up @@ -554,19 +554,19 @@
CreatedOnToolsVersion = 7.0.1;
DevelopmentTeam = C6K65RDJHL;
DevelopmentTeamName = "Elvis Nunez (Personal Team)";
LastSwiftMigration = 0800;
LastSwiftMigration = 1020;
};
148C33641BD7CB74009701BF = {
CreatedOnToolsVersion = 7.0.1;
DevelopmentTeam = C6K65RDJHL;
DevelopmentTeamName = "Elvis Nunez (Personal Team)";
LastSwiftMigration = 0800;
LastSwiftMigration = 1020;
};
14B389A21CBF830D001123DC = {
CreatedOnToolsVersion = 7.3;
DevelopmentTeam = C6K65RDJHL;
DevelopmentTeamName = "Elvis Nunez (Personal Team)";
LastSwiftMigration = 0900;
LastSwiftMigration = 1020;
};
14EEAC2E1CBFAD61002E495A = {
CreatedOnToolsVersion = 7.3;
Expand All @@ -578,7 +578,7 @@
};
buildConfigurationList = 146D728E1AB782920058798C /* Build configuration list for PBXProject "Demo" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
en,
Expand Down Expand Up @@ -875,6 +875,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
Expand Down Expand Up @@ -929,6 +930,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
Expand Down Expand Up @@ -1147,7 +1149,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = x.DemoObjectiveC;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -1168,7 +1170,7 @@
PRODUCT_BUNDLE_IDENTIFIER = x.DemoObjectiveC;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand All @@ -1189,7 +1191,7 @@
PRODUCT_BUNDLE_IDENTIFIER = x.DemoSwift;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -1210,7 +1212,7 @@
PRODUCT_BUNDLE_IDENTIFIER = x.DemoSwift;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand All @@ -1235,8 +1237,7 @@
PRODUCT_NAME = DATAStack;
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
Expand Down Expand Up @@ -1264,8 +1265,7 @@
PRODUCT_NAME = DATAStack;
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
Expand Down
2 changes: 1 addition & 1 deletion Demo.xcodeproj/xcshareddata/xcschemes/DATAStack-iOS.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0940"
LastUpgradeVersion = "1020"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion Demo.xcodeproj/xcshareddata/xcschemes/DATAStack-macOS.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0940"
LastUpgradeVersion = "1020"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion Demo.xcodeproj/xcshareddata/xcschemes/DATAStack-tvOS.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0940"
LastUpgradeVersion = "1020"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion Demo.xcodeproj/xcshareddata/xcschemes/DATAStack-watchOS.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0940"
LastUpgradeVersion = "1020"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion Demo.xcodeproj/xcshareddata/xcschemes/DemoObjectiveC.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0940"
LastUpgradeVersion = "1020"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion Demo.xcodeproj/xcshareddata/xcschemes/DemoSwift.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0940"
LastUpgradeVersion = "1020"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion Demo.xcodeproj/xcshareddata/xcschemes/iOSTests.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0940"
LastUpgradeVersion = "1020"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion Demo.xcodeproj/xcshareddata/xcschemes/macOSTests.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0940"
LastUpgradeVersion = "1020"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion Demo.xcodeproj/xcshareddata/xcschemes/tvOSTests.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0940"
LastUpgradeVersion = "1020"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion DemoObjectiveC/AppDelegate.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ @implementation AppDelegate
- (DATAStack *)dataStack {
if (_dataStack) return _dataStack;

_dataStack = [[DATAStack alloc] initWithModelName:@"DemoObjectiveC"];
_dataStack = [[DATAStack alloc] initWithModelName:@"DemoObjectiveC" isExcludedFromBackup:YES];

return _dataStack;
}
Expand Down
2 changes: 1 addition & 1 deletion DemoSwift/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
return dataStack
}()

func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
if let window = self.window {
let viewController = ViewController(dataStack: self.dataStack)
window.rootViewController = UINavigationController(rootViewController: viewController)
Expand Down