Skip to content

Commit 53a97e5

Browse files
tnantokatnantoka
committed
2.1.0: Xcode 9 GM
1 parent b34dd20 commit 53a97e5

File tree

8 files changed

+44
-22
lines changed

8 files changed

+44
-22
lines changed

Diff for: ‎Edhita.xcodeproj/project.pbxproj

+23-7
Original file line numberDiff line numberDiff line change
@@ -244,17 +244,17 @@
244244
isa = PBXProject;
245245
attributes = {
246246
LastSwiftUpdateCheck = 0700;
247-
LastUpgradeCheck = 0800;
247+
LastUpgradeCheck = 0900;
248248
ORGANIZATIONNAME = tnantoka;
249249
TargetAttributes = {
250250
9B6E1E8C19E2EB2100C72D13 = {
251251
CreatedOnToolsVersion = 6.0.1;
252252
DevelopmentTeam = H4Z42X3L6X;
253-
LastSwiftMigration = 0800;
253+
LastSwiftMigration = 0900;
254254
};
255255
9B6E1EA319E2EB2100C72D13 = {
256256
CreatedOnToolsVersion = 6.0.1;
257-
LastSwiftMigration = 0800;
257+
LastSwiftMigration = 0900;
258258
TestTargetID = 9B6E1E8C19E2EB2100C72D13;
259259
};
260260
};
@@ -426,14 +426,20 @@
426426
CLANG_CXX_LIBRARY = "libc++";
427427
CLANG_ENABLE_MODULES = YES;
428428
CLANG_ENABLE_OBJC_ARC = YES;
429+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
429430
CLANG_WARN_BOOL_CONVERSION = YES;
431+
CLANG_WARN_COMMA = YES;
430432
CLANG_WARN_CONSTANT_CONVERSION = YES;
431433
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
432434
CLANG_WARN_EMPTY_BODY = YES;
433435
CLANG_WARN_ENUM_CONVERSION = YES;
434436
CLANG_WARN_INFINITE_RECURSION = YES;
435437
CLANG_WARN_INT_CONVERSION = YES;
438+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
439+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
436440
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
441+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
442+
CLANG_WARN_STRICT_PROTOTYPES = YES;
437443
CLANG_WARN_SUSPICIOUS_MOVE = YES;
438444
CLANG_WARN_UNREACHABLE_CODE = YES;
439445
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -474,14 +480,20 @@
474480
CLANG_CXX_LIBRARY = "libc++";
475481
CLANG_ENABLE_MODULES = YES;
476482
CLANG_ENABLE_OBJC_ARC = YES;
483+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
477484
CLANG_WARN_BOOL_CONVERSION = YES;
485+
CLANG_WARN_COMMA = YES;
478486
CLANG_WARN_CONSTANT_CONVERSION = YES;
479487
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
480488
CLANG_WARN_EMPTY_BODY = YES;
481489
CLANG_WARN_ENUM_CONVERSION = YES;
482490
CLANG_WARN_INFINITE_RECURSION = YES;
483491
CLANG_WARN_INT_CONVERSION = YES;
492+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
493+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
484494
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
495+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
496+
CLANG_WARN_STRICT_PROTOTYPES = YES;
485497
CLANG_WARN_SUSPICIOUS_MOVE = YES;
486498
CLANG_WARN_UNREACHABLE_CODE = YES;
487499
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -519,7 +531,8 @@
519531
PRODUCT_NAME = "$(TARGET_NAME)";
520532
SWIFT_OBJC_BRIDGING_HEADER = "Edhita/Edhita-Bridging-Header.h";
521533
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
522-
SWIFT_VERSION = 3.0;
534+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
535+
SWIFT_VERSION = 4.0;
523536
};
524537
name = Debug;
525538
};
@@ -535,7 +548,8 @@
535548
PRODUCT_BUNDLE_IDENTIFIER = "com.bornneet.$(PRODUCT_NAME:rfc1034identifier)";
536549
PRODUCT_NAME = "$(TARGET_NAME)";
537550
SWIFT_OBJC_BRIDGING_HEADER = "Edhita/Edhita-Bridging-Header.h";
538-
SWIFT_VERSION = 3.0;
551+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
552+
SWIFT_VERSION = 4.0;
539553
};
540554
name = Release;
541555
};
@@ -555,7 +569,8 @@
555569
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
556570
PRODUCT_BUNDLE_IDENTIFIER = "com.bornneet.$(PRODUCT_NAME:rfc1034identifier)";
557571
PRODUCT_NAME = "$(TARGET_NAME)";
558-
SWIFT_VERSION = 3.0;
572+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
573+
SWIFT_VERSION = 4.0;
559574
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Edhita.app/Edhita";
560575
};
561576
name = Debug;
@@ -572,7 +587,8 @@
572587
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
573588
PRODUCT_BUNDLE_IDENTIFIER = "com.bornneet.$(PRODUCT_NAME:rfc1034identifier)";
574589
PRODUCT_NAME = "$(TARGET_NAME)";
575-
SWIFT_VERSION = 3.0;
590+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
591+
SWIFT_VERSION = 4.0;
576592
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Edhita.app/Edhita";
577593
};
578594
name = Release;

Diff for: ‎Edhita/AppDelegate.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UISplitViewControllerDele
9999
UINavigationBar.appearance().barTintColor = UIColor.coolGray()
100100
UINavigationBar.appearance().tintColor = UIColor.white
101101
UINavigationBar.appearance().titleTextAttributes = [
102-
NSForegroundColorAttributeName: UINavigationBar.appearance().tintColor
102+
NSAttributedStringKey.foregroundColor: UINavigationBar.appearance().tintColor
103103
]
104104

105105
UIToolbar.appearance().barTintColor = UINavigationBar.appearance().barTintColor

Diff for: ‎Edhita/Controllers/EditorViewController.swift

+7-7
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ class EditorViewController: UIViewController, EDHFinderListViewControllerDelegat
107107

108108
// MARK: - Actions
109109

110-
func fullscreenItemDidTap(_ sender: AnyObject) {
110+
@objc func fullscreenItemDidTap(_ sender: AnyObject) {
111111
if self.splitViewController?.preferredDisplayMode == UISplitViewControllerDisplayMode.automatic {
112112
if self.splitViewController?.displayMode == UISplitViewControllerDisplayMode.allVisible {
113113
self.splitViewController?.preferredDisplayMode = UISplitViewControllerDisplayMode.primaryHidden
@@ -120,11 +120,11 @@ class EditorViewController: UIViewController, EDHFinderListViewControllerDelegat
120120
self.updateFullscreenItem()
121121
}
122122

123-
func reloadItemDidTap(_ sender: AnyObject) {
123+
@objc func reloadItemDidTap(_ sender: AnyObject) {
124124
self.editorView.reload()
125125
}
126126

127-
func shareItemDidTap(_ sender: AnyObject) {
127+
@objc func shareItemDidTap(_ sender: AnyObject) {
128128
let alertController = UIAlertController(
129129
title: NSLocalizedString("Share", comment: ""),
130130
message: "",
@@ -183,14 +183,14 @@ class EditorViewController: UIViewController, EDHFinderListViewControllerDelegat
183183
self.present(alertController, animated: true, completion: nil)
184184
}
185185

186-
func settingsItemDidTap(_ sender: AnyObject) {
186+
@objc func settingsItemDidTap(_ sender: AnyObject) {
187187
let formController = SettingsViewController()
188188
let navController = UINavigationController(rootViewController: formController)
189189
navController.modalPresentationStyle = .formSheet
190190
self.present(navController, animated: true, completion: nil)
191191
}
192192

193-
func modeControlDidChange(_ sender: AnyObject) {
193+
@objc func modeControlDidChange(_ sender: AnyObject) {
194194
switch self.modeControl.selectedSegmentIndex {
195195
case 0:
196196
self.editorView.mode = .edit
@@ -244,11 +244,11 @@ class EditorViewController: UIViewController, EDHFinderListViewControllerDelegat
244244

245245
// MARK: - Keyboard notification
246246

247-
func handleKeyboardWillShowNotification(_ notification: Notification) {
247+
@objc func handleKeyboardWillShowNotification(_ notification: Notification) {
248248
keyboardWillChangeFrameWithNotification(notification, showsKeyboard: true)
249249
}
250250

251-
func handleKeyboardWillHideNotification(_ notification: Notification) {
251+
@objc func handleKeyboardWillHideNotification(_ notification: Notification) {
252252
keyboardWillChangeFrameWithNotification(notification, showsKeyboard: false)
253253
}
254254

Diff for: ‎Edhita/Controllers/SettingsViewController.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,20 @@ class SettingsViewController: FXFormViewController {
3636

3737
// MARK: - Actions
3838

39-
func fontDidTap(_ sender: AnyObject) {
39+
@objc func fontDidTap(_ sender: AnyObject) {
4040
let fontController = EDHFontSelector.shared().settingsViewController()
4141
self.navigationController?.pushViewController(fontController!, animated: true)
4242
}
4343

44-
func acknowledgementsDidTap(_ sender: AnyObject) {
44+
@objc func acknowledgementsDidTap(_ sender: AnyObject) {
4545
let acknowledgementsController = VTAcknowledgementsViewController(
4646
acknowledgementsPlistPath: Bundle.main.path(forResource: "Pods-acknowledgements", ofType: "plist")
4747
)
4848
//let acknowledgementsController = VTAcknowledgementsViewController() // Doesn't work
4949
self.navigationController?.pushViewController(acknowledgementsController!, animated: true)
5050
}
5151

52-
func doneItemDidTap(_ sender: AnyObject) {
52+
@objc func doneItemDidTap(_ sender: AnyObject) {
5353
self.close()
5454
}
5555

Diff for: ‎Edhita/Images.xcassets/AppIcon.appiconset/Contents.json

+6
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,12 @@
8989
"idiom" : "ipad",
9090
"filename" : "icon167.png",
9191
"scale" : "2x"
92+
},
93+
{
94+
"size" : "1024x1024",
95+
"idiom" : "ios-marketing",
96+
"filename" : "icon1024.png",
97+
"scale" : "1x"
9298
}
9399
],
94100
"info" : {

Diff for: ‎Edhita/Images.xcassets/AppIcon.appiconset/icon1024.png

25.3 KB
Loading

Diff for: ‎Edhita/Info.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
<key>CFBundlePackageType</key>
1616
<string>APPL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>2.0.9</string>
18+
<string>2.1.0</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
22-
<string>10</string>
22+
<string>12</string>
2323
<key>LSRequiresIPhoneOS</key>
2424
<true/>
2525
<key>NSAppTransportSecurity</key>

Diff for: ‎Edhita/Models/SettingsForm.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ open class SettingsForm: NSObject, FXForm {
3131
self.accessoryView = UserDefaults.standard.bool(forKey: Defaults.accessoryViewKey)
3232
}
3333

34-
var accessoryView: Bool = true {
34+
@objc var accessoryView: Bool = true {
3535
didSet {
3636
UserDefaults.standard.set(self.accessoryView, forKey: Defaults.accessoryViewKey)
3737
UserDefaults.standard.synchronize()
3838
}
3939
}
4040

41-
@nonobjc open func extraFields() -> [Any]! {
41+
public func extraFields() -> [Any]! {
4242
return [
4343
[
4444
FXFormFieldHeader: "",

0 commit comments

Comments
 (0)