Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update project to Swift 5. #564

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -120,4 +120,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: c0d3ac6392c31961b5f3a0108501cdaf990069ee

COCOAPODS: 1.7.2
COCOAPODS: 1.6.0
15 changes: 7 additions & 8 deletions Susi.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -792,24 +792,23 @@
6D215B911EB0BE7300CD2C1D = {
CreatedOnToolsVersion = 8.3.2;
DevelopmentTeam = MLF4G8Y374;
LastSwiftMigration = 1000;
LastSwiftMigration = 1100;
ProvisioningStyle = Automatic;
TestTargetID = 6D4D9B361E768E190067459C;
};
6D4D9B361E768E190067459C = {
CreatedOnToolsVersion = 8.2.1;
DevelopmentTeam = 7P4K4M8A4Q;
LastSwiftMigration = 1000;
LastSwiftMigration = 1100;
ProvisioningStyle = Automatic;
};
};
};
buildConfigurationList = 6D4D9B321E768E190067459C /* Build configuration list for PBXProject "Susi" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
Base,
ru,
Expand Down Expand Up @@ -1124,7 +1123,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.chashmeet.SusiUITests;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TEST_TARGET_NAME = Susi;
};
name = Debug;
Expand All @@ -1143,7 +1142,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.chashmeet.SusiUITests;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TEST_TARGET_NAME = Susi;
};
name = Release;
Expand Down Expand Up @@ -1287,7 +1286,7 @@
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "Susi/Snowboy Files/Susi-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 1;
};
name = Debug;
Expand All @@ -1313,7 +1312,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "Susi/Snowboy Files/Susi-Bridging-Header.h";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 1;
};
name = Release;
Expand Down
26 changes: 12 additions & 14 deletions Susi.xcworkspace/xcshareddata/xcschemes/Susi.xcscheme
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 = "1100"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -26,8 +26,17 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
codeCoverageEnabled = "YES"
shouldUseLaunchSchemeArgsEnv = "YES">
shouldUseLaunchSchemeArgsEnv = "YES"
codeCoverageEnabled = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "6D4D9B361E768E190067459C"
BuildableName = "Susi.app"
BlueprintName = "Susi"
ReferencedContainer = "container:Susi.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables>
<TestableReference
skipped = "NO">
Expand All @@ -45,17 +54,6 @@
</SkippedTests>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "6D4D9B361E768E190067459C"
BuildableName = "Susi.app"
BlueprintName = "Susi"
ReferencedContainer = "container:Susi.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand Down