Skip to content

Commit 6cb84ec

Browse files
author
Anna Sahaidak
committed
Migrate to Swift 5
1 parent 8f70955 commit 6cb84ec

File tree

4 files changed

+25
-30
lines changed

4 files changed

+25
-30
lines changed

MenuExample.xcodeproj/project.pbxproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -242,17 +242,17 @@
242242
TargetAttributes = {
243243
50B9664D1A25E40E00208F2E = {
244244
CreatedOnToolsVersion = 6.1;
245-
LastSwiftMigration = 0800;
245+
LastSwiftMigration = 1140;
246246
};
247247
};
248248
};
249249
buildConfigurationList = 50B966491A25E40E00208F2E /* Build configuration list for PBXProject "MenuExample" */;
250250
compatibilityVersion = "Xcode 3.2";
251-
developmentRegion = English;
251+
developmentRegion = en;
252252
hasScannedForEncodings = 0;
253253
knownRegions = (
254-
English,
255254
en,
255+
Base,
256256
);
257257
mainGroup = 50B966451A25E40E00208F2E;
258258
productRefGroup = 50B9664F1A25E40E00208F2E /* Products */;
@@ -425,7 +425,7 @@
425425
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
426426
PRODUCT_BUNDLE_IDENTIFIER = "com.yalantis.ios.$(PRODUCT_NAME:rfc1034identifier)";
427427
PRODUCT_NAME = MenuExample;
428-
SWIFT_VERSION = 4.2;
428+
SWIFT_VERSION = 5.0;
429429
};
430430
name = Debug;
431431
};
@@ -438,7 +438,7 @@
438438
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
439439
PRODUCT_BUNDLE_IDENTIFIER = "com.yalantis.ios.$(PRODUCT_NAME:rfc1034identifier)";
440440
PRODUCT_NAME = MenuExample;
441-
SWIFT_VERSION = 4.2;
441+
SWIFT_VERSION = 5.0;
442442
};
443443
name = Release;
444444
};

MenuExample.xcodeproj/xcshareddata/xcschemes/MenuExample.xcscheme

Lines changed: 3 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 = "1000"
3+
LastUpgradeVersion = "1140"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -27,8 +27,6 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30-
<Testables>
31-
</Testables>
3230
<MacroExpansion>
3331
<BuildableReference
3432
BuildableIdentifier = "primary"
@@ -38,8 +36,8 @@
3836
ReferencedContainer = "container:MenuExample.xcodeproj">
3937
</BuildableReference>
4038
</MacroExpansion>
41-
<AdditionalOptions>
42-
</AdditionalOptions>
39+
<Testables>
40+
</Testables>
4341
</TestAction>
4442
<LaunchAction
4543
buildConfiguration = "Debug"
@@ -61,8 +59,6 @@
6159
ReferencedContainer = "container:MenuExample.xcodeproj">
6260
</BuildableReference>
6361
</BuildableProductRunnable>
64-
<AdditionalOptions>
65-
</AdditionalOptions>
6662
</LaunchAction>
6763
<ProfileAction
6864
buildConfiguration = "Release"

SideMenu.xcodeproj/project.pbxproj

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,12 +109,12 @@
109109
attributes = {
110110
LastSwiftMigration = 0700;
111111
LastSwiftUpdateCheck = 0700;
112-
LastUpgradeCheck = 1000;
112+
LastUpgradeCheck = 1140;
113113
ORGANIZATIONNAME = Yalantis;
114114
TargetAttributes = {
115115
50B42EFF1A6A879C00B05352 = {
116116
CreatedOnToolsVersion = 6.1.1;
117-
LastSwiftMigration = 0800;
117+
LastSwiftMigration = 1140;
118118
};
119119
};
120120
};
@@ -123,6 +123,7 @@
123123
developmentRegion = English;
124124
hasScannedForEncodings = 0;
125125
knownRegions = (
126+
English,
126127
en,
127128
);
128129
mainGroup = 50B42EF61A6A879C00B05352;
@@ -163,6 +164,7 @@
163164
isa = XCBuildConfiguration;
164165
buildSettings = {
165166
ALWAYS_SEARCH_USER_PATHS = NO;
167+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
166168
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
167169
CLANG_CXX_LIBRARY = "libc++";
168170
CLANG_ENABLE_MODULES = YES;
@@ -222,6 +224,7 @@
222224
isa = XCBuildConfiguration;
223225
buildSettings = {
224226
ALWAYS_SEARCH_USER_PATHS = NO;
227+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
225228
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
226229
CLANG_CXX_LIBRARY = "libc++";
227230
CLANG_ENABLE_MODULES = YES;
@@ -286,7 +289,7 @@
286289
PRODUCT_BUNDLE_IDENTIFIER = "com.yalantis.ios.$(PRODUCT_NAME:rfc1034identifier)";
287290
PRODUCT_NAME = "$(TARGET_NAME)";
288291
SKIP_INSTALL = YES;
289-
SWIFT_VERSION = 4.2;
292+
SWIFT_VERSION = 5.0;
290293
};
291294
name = Debug;
292295
};
@@ -306,7 +309,7 @@
306309
PRODUCT_BUNDLE_IDENTIFIER = "com.yalantis.ios.$(PRODUCT_NAME:rfc1034identifier)";
307310
PRODUCT_NAME = "$(TARGET_NAME)";
308311
SKIP_INSTALL = YES;
309-
SWIFT_VERSION = 4.2;
312+
SWIFT_VERSION = 5.0;
310313
};
311314
name = Release;
312315
};

SideMenu.xcodeproj/xcshareddata/xcschemes/SideMenu.xcscheme

Lines changed: 10 additions & 14 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 = "1000"
3+
LastUpgradeVersion = "1140"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -41,6 +41,15 @@
4141
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4242
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
4343
shouldUseLaunchSchemeArgsEnv = "YES">
44+
<MacroExpansion>
45+
<BuildableReference
46+
BuildableIdentifier = "primary"
47+
BlueprintIdentifier = "50B42EFF1A6A879C00B05352"
48+
BuildableName = "SideMenu.framework"
49+
BlueprintName = "SideMenu"
50+
ReferencedContainer = "container:SideMenu.xcodeproj">
51+
</BuildableReference>
52+
</MacroExpansion>
4453
<Testables>
4554
<TestableReference
4655
skipped = "NO">
@@ -53,17 +62,6 @@
5362
</BuildableReference>
5463
</TestableReference>
5564
</Testables>
56-
<MacroExpansion>
57-
<BuildableReference
58-
BuildableIdentifier = "primary"
59-
BlueprintIdentifier = "50B42EFF1A6A879C00B05352"
60-
BuildableName = "SideMenu.framework"
61-
BlueprintName = "SideMenu"
62-
ReferencedContainer = "container:SideMenu.xcodeproj">
63-
</BuildableReference>
64-
</MacroExpansion>
65-
<AdditionalOptions>
66-
</AdditionalOptions>
6765
</TestAction>
6866
<LaunchAction
6967
buildConfiguration = "Debug"
@@ -84,8 +82,6 @@
8482
ReferencedContainer = "container:SideMenu.xcodeproj">
8583
</BuildableReference>
8684
</MacroExpansion>
87-
<AdditionalOptions>
88-
</AdditionalOptions>
8985
</LaunchAction>
9086
<ProfileAction
9187
buildConfiguration = "Release"

0 commit comments

Comments
 (0)