Skip to content

Commit f158149

Browse files
igorkulmanigorkulman
committed
🔧 upgrade to Xcode 10.1 and Swift 4.2
1 parent ef46385 commit f158149

3 files changed

Lines changed: 40 additions & 9 deletions

File tree

‎LocalizationEditor.xcodeproj/project.pbxproj‎

Lines changed: 38 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
F3D9C97420BEF0A50081830A /* Files.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = F3D9C97220BEF0A50081830A /* Files.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
2525
F3D9C97720BEFF230081830A /* CleanroomLogger.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F3D9C97620BEFF220081830A /* CleanroomLogger.framework */; };
2626
F3D9C97820BEFF230081830A /* CleanroomLogger.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = F3D9C97620BEFF220081830A /* CleanroomLogger.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
27+
F3EA77C721AEB4DC00337B3B /* CleanroomLogger.framework.dSYM in CopyFiles */ = {isa = PBXBuildFile; fileRef = F3EA77C521AEB4DC00337B3B /* CleanroomLogger.framework.dSYM */; };
28+
F3EA77C821AEB4DC00337B3B /* Files.framework.dSYM in CopyFiles */ = {isa = PBXBuildFile; fileRef = F3EA77C621AEB4DC00337B3B /* Files.framework.dSYM */; };
2729
/* End PBXBuildFile section */
2830

2931
/* Begin PBXCopyFilesBuildPhase section */
@@ -39,6 +41,17 @@
3941
name = "Embed Frameworks";
4042
runOnlyForDeploymentPostprocessing = 0;
4143
};
44+
F3EA77C421AEB45000337B3B /* CopyFiles */ = {
45+
isa = PBXCopyFilesBuildPhase;
46+
buildActionMask = 2147483647;
47+
dstPath = "";
48+
dstSubfolderSpec = 16;
49+
files = (
50+
F3EA77C721AEB4DC00337B3B /* CleanroomLogger.framework.dSYM in CopyFiles */,
51+
F3EA77C821AEB4DC00337B3B /* Files.framework.dSYM in CopyFiles */,
52+
);
53+
runOnlyForDeploymentPostprocessing = 0;
54+
};
4255
/* End PBXCopyFilesBuildPhase section */
4356

4457
/* Begin PBXFileReference section */
@@ -59,8 +72,10 @@
5972
F3D9C96620BEDF640081830A /* KeyCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyCell.swift; sourceTree = "<group>"; };
6073
F3D9C96D20BEEAA10081830A /* LocalizationsDataSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalizationsDataSource.swift; sourceTree = "<group>"; };
6174
F3D9C97020BEF0740081830A /* Files.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Files.framework; path = Carthage/Build/Mac/Files.framework; sourceTree = "<group>"; };
62-
F3D9C97220BEF0A50081830A /* Files.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Files.framework; path = Carthage/Build/Mac/Files.framework; sourceTree = "<group>"; };
63-
F3D9C97620BEFF220081830A /* CleanroomLogger.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CleanroomLogger.framework; path = Carthage/Build/Mac/CleanroomLogger.framework; sourceTree = "<group>"; };
75+
F3D9C97220BEF0A50081830A /* Files.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Files.framework; path = ../Carthage/Build/Mac/Files.framework; sourceTree = "<group>"; };
76+
F3D9C97620BEFF220081830A /* CleanroomLogger.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CleanroomLogger.framework; path = ../Carthage/Build/Mac/CleanroomLogger.framework; sourceTree = "<group>"; };
77+
F3EA77C521AEB4DC00337B3B /* CleanroomLogger.framework.dSYM */ = {isa = PBXFileReference; lastKnownFileType = wrapper.dsym; name = CleanroomLogger.framework.dSYM; path = ../Carthage/Build/Mac/CleanroomLogger.framework.dSYM; sourceTree = "<group>"; };
78+
F3EA77C621AEB4DC00337B3B /* Files.framework.dSYM */ = {isa = PBXFileReference; lastKnownFileType = wrapper.dsym; name = Files.framework.dSYM; path = ../Carthage/Build/Mac/Files.framework.dSYM; sourceTree = "<group>"; };
6479
/* End PBXFileReference section */
6580

6681
/* Begin PBXFrameworksBuildPhase section */
@@ -79,8 +94,6 @@
7994
F3D9C93920BEC7460081830A = {
8095
isa = PBXGroup;
8196
children = (
82-
F3D9C97620BEFF220081830A /* CleanroomLogger.framework */,
83-
F3D9C97220BEF0A50081830A /* Files.framework */,
8497
F3D9C94420BEC7460081830A /* LocalizationEditor */,
8598
F3D9C94320BEC7460081830A /* Products */,
8699
F3D9C96F20BEF0730081830A /* Frameworks */,
@@ -98,6 +111,7 @@
98111
F3D9C94420BEC7460081830A /* LocalizationEditor */ = {
99112
isa = PBXGroup;
100113
children = (
114+
F3EA77C921AEB50600337B3B /* Dependencies */,
101115
F3D9C95520BEC9E30081830A /* Models */,
102116
F3D9C95A20BECDB20081830A /* Providers */,
103117
F3D9C96C20BEEA2F0081830A /* UI */,
@@ -157,6 +171,17 @@
157171
name = Frameworks;
158172
sourceTree = "<group>";
159173
};
174+
F3EA77C921AEB50600337B3B /* Dependencies */ = {
175+
isa = PBXGroup;
176+
children = (
177+
F3EA77C521AEB4DC00337B3B /* CleanroomLogger.framework.dSYM */,
178+
F3EA77C621AEB4DC00337B3B /* Files.framework.dSYM */,
179+
F3D9C97620BEFF220081830A /* CleanroomLogger.framework */,
180+
F3D9C97220BEF0A50081830A /* Files.framework */,
181+
);
182+
name = Dependencies;
183+
sourceTree = "<group>";
184+
};
160185
/* End PBXGroup section */
161186

162187
/* Begin PBXNativeTarget section */
@@ -168,6 +193,7 @@
168193
F3D9C93F20BEC7460081830A /* Frameworks */,
169194
F3D9C94020BEC7460081830A /* Resources */,
170195
F3D9C97520BEF0A50081830A /* Embed Frameworks */,
196+
F3EA77C421AEB45000337B3B /* CopyFiles */,
171197
);
172198
buildRules = (
173199
);
@@ -185,11 +211,12 @@
185211
isa = PBXProject;
186212
attributes = {
187213
LastSwiftUpdateCheck = 0920;
188-
LastUpgradeCheck = 0920;
214+
LastUpgradeCheck = 1010;
189215
ORGANIZATIONNAME = "Igor Kulman";
190216
TargetAttributes = {
191217
F3D9C94120BEC7460081830A = {
192218
CreatedOnToolsVersion = 9.2;
219+
LastSwiftMigration = 1010;
193220
ProvisioningStyle = Automatic;
194221
};
195222
};
@@ -271,13 +298,15 @@
271298
CLANG_WARN_BOOL_CONVERSION = YES;
272299
CLANG_WARN_COMMA = YES;
273300
CLANG_WARN_CONSTANT_CONVERSION = YES;
301+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
274302
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
275303
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
276304
CLANG_WARN_EMPTY_BODY = YES;
277305
CLANG_WARN_ENUM_CONVERSION = YES;
278306
CLANG_WARN_INFINITE_RECURSION = YES;
279307
CLANG_WARN_INT_CONVERSION = YES;
280308
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
309+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
281310
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
282311
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
283312
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -328,13 +357,15 @@
328357
CLANG_WARN_BOOL_CONVERSION = YES;
329358
CLANG_WARN_COMMA = YES;
330359
CLANG_WARN_CONSTANT_CONVERSION = YES;
360+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
331361
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
332362
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
333363
CLANG_WARN_EMPTY_BODY = YES;
334364
CLANG_WARN_ENUM_CONVERSION = YES;
335365
CLANG_WARN_INFINITE_RECURSION = YES;
336366
CLANG_WARN_INT_CONVERSION = YES;
337367
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
368+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
338369
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
339370
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
340371
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -379,7 +410,7 @@
379410
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
380411
PRODUCT_BUNDLE_IDENTIFIER = sk.kulman.LocalizationEditor;
381412
PRODUCT_NAME = "$(TARGET_NAME)";
382-
SWIFT_VERSION = 4.0;
413+
SWIFT_VERSION = 4.2;
383414
};
384415
name = Debug;
385416
};
@@ -399,7 +430,7 @@
399430
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
400431
PRODUCT_BUNDLE_IDENTIFIER = sk.kulman.LocalizationEditor;
401432
PRODUCT_NAME = "$(TARGET_NAME)";
402-
SWIFT_VERSION = 4.0;
433+
SWIFT_VERSION = 4.2;
403434
};
404435
name = Release;
405436
};

‎LocalizationEditor/UI/Cells/LocalizationCell.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class LocalizationCell: NSTableCellView {
3535
}
3636

3737
extension LocalizationCell: NSTextFieldDelegate {
38-
override func controlTextDidEndEditing(_: Notification) {
38+
func controlTextDidEndEditing(_: Notification) {
3939
guard let language = language, let value = value else {
4040
return
4141
}

‎LocalizationEditor/UI/ViewController.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class ViewController: NSViewController {
4040
private func setupData() {
4141
let cellIdentifiers = [KeyCell.identifier, LocalizationCell.identifier]
4242
cellIdentifiers.forEach { identifier in
43-
let cell = NSNib(nibNamed: NSNib.Name(rawValue: identifier), bundle: nil)
43+
let cell = NSNib(nibNamed: identifier, bundle: nil)
4444
tableView.register(cell, forIdentifier: NSUserInterfaceItemIdentifier(rawValue: identifier))
4545
}
4646

0 commit comments

Comments
 (0)