Skip to content

Commit 36691ac

Browse files
MortimerGoroMortimerGoro
committed
Update demo project swift version
1 parent b2dee0d commit 36691ac

File tree

5 files changed

+48
-16
lines changed

5 files changed

+48
-16
lines changed

‎demo/MailAppDemoSwift/MailAppDemoSwift.xcodeproj/project.pbxproj

+39-7
Original file line numberDiff line numberDiff line change
@@ -178,17 +178,17 @@
178178
attributes = {
179179
LastSwiftMigration = 0730;
180180
LastSwiftUpdateCheck = 0730;
181-
LastUpgradeCheck = 0610;
181+
LastUpgradeCheck = 1010;
182182
ORGANIZATIONNAME = "Imanol Fernandez";
183183
TargetAttributes = {
184184
11E203631A1A9B440084A446 = {
185185
CreatedOnToolsVersion = 6.1;
186-
LastSwiftMigration = 0810;
186+
LastSwiftMigration = 1010;
187187
};
188188
11E203781A1A9B440084A446 = {
189189
CreatedOnToolsVersion = 6.1;
190190
DevelopmentTeam = 4W4992Q3W8;
191-
LastSwiftMigration = 0810;
191+
LastSwiftMigration = 1010;
192192
TestTargetID = 11E203631A1A9B440084A446;
193193
};
194194
};
@@ -282,20 +282,32 @@
282282
CLANG_CXX_LIBRARY = "libc++";
283283
CLANG_ENABLE_MODULES = YES;
284284
CLANG_ENABLE_OBJC_ARC = YES;
285+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
285286
CLANG_WARN_BOOL_CONVERSION = YES;
287+
CLANG_WARN_COMMA = YES;
286288
CLANG_WARN_CONSTANT_CONVERSION = YES;
289+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
287290
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
288291
CLANG_WARN_EMPTY_BODY = YES;
289292
CLANG_WARN_ENUM_CONVERSION = YES;
293+
CLANG_WARN_INFINITE_RECURSION = YES;
290294
CLANG_WARN_INT_CONVERSION = YES;
295+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
296+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
297+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
291298
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
299+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
300+
CLANG_WARN_STRICT_PROTOTYPES = YES;
301+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
292302
CLANG_WARN_UNREACHABLE_CODE = YES;
293303
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
294304
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
295305
COPY_PHASE_STRIP = NO;
296306
ENABLE_STRICT_OBJC_MSGSEND = YES;
307+
ENABLE_TESTABILITY = YES;
297308
GCC_C_LANGUAGE_STANDARD = gnu99;
298309
GCC_DYNAMIC_NO_PIC = NO;
310+
GCC_NO_COMMON_BLOCKS = YES;
299311
GCC_OPTIMIZATION_LEVEL = 0;
300312
GCC_PREPROCESSOR_DEFINITIONS = (
301313
"DEBUG=1",
@@ -325,20 +337,31 @@
325337
CLANG_CXX_LIBRARY = "libc++";
326338
CLANG_ENABLE_MODULES = YES;
327339
CLANG_ENABLE_OBJC_ARC = YES;
340+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
328341
CLANG_WARN_BOOL_CONVERSION = YES;
342+
CLANG_WARN_COMMA = YES;
329343
CLANG_WARN_CONSTANT_CONVERSION = YES;
344+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
330345
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
331346
CLANG_WARN_EMPTY_BODY = YES;
332347
CLANG_WARN_ENUM_CONVERSION = YES;
348+
CLANG_WARN_INFINITE_RECURSION = YES;
333349
CLANG_WARN_INT_CONVERSION = YES;
350+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
351+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
352+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
334353
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
354+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
355+
CLANG_WARN_STRICT_PROTOTYPES = YES;
356+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
335357
CLANG_WARN_UNREACHABLE_CODE = YES;
336358
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
337359
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
338360
COPY_PHASE_STRIP = YES;
339361
ENABLE_NS_ASSERTIONS = NO;
340362
ENABLE_STRICT_OBJC_MSGSEND = YES;
341363
GCC_C_LANGUAGE_STANDARD = gnu99;
364+
GCC_NO_COMMON_BLOCKS = YES;
342365
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
343366
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
344367
GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -348,6 +371,7 @@
348371
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
349372
MTL_ENABLE_DEBUG_INFO = NO;
350373
SDKROOT = iphoneos;
374+
SWIFT_COMPILATION_MODE = wholemodule;
351375
TARGETED_DEVICE_FAMILY = "1,2";
352376
VALIDATE_PRODUCT = YES;
353377
};
@@ -361,10 +385,12 @@
361385
DEVELOPMENT_TEAM = "";
362386
INFOPLIST_FILE = MailAppDemoSwift/Info.plist;
363387
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
388+
PRODUCT_BUNDLE_IDENTIFIER = "mortimergoro.$(PRODUCT_NAME:rfc1034identifier)";
364389
PRODUCT_NAME = "$(TARGET_NAME)";
365390
PROVISIONING_PROFILE = "";
366391
SWIFT_OBJC_BRIDGING_HEADER = MailAppDemoSwift/ObjCBridgingHeader.h;
367-
SWIFT_VERSION = 4.0;
392+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
393+
SWIFT_VERSION = 4.2;
368394
};
369395
name = Debug;
370396
};
@@ -376,10 +402,12 @@
376402
DEVELOPMENT_TEAM = "";
377403
INFOPLIST_FILE = MailAppDemoSwift/Info.plist;
378404
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
405+
PRODUCT_BUNDLE_IDENTIFIER = "mortimergoro.$(PRODUCT_NAME:rfc1034identifier)";
379406
PRODUCT_NAME = "$(TARGET_NAME)";
380407
PROVISIONING_PROFILE = "";
381408
SWIFT_OBJC_BRIDGING_HEADER = MailAppDemoSwift/ObjCBridgingHeader.h;
382-
SWIFT_VERSION = 4.0;
409+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
410+
SWIFT_VERSION = 4.2;
383411
};
384412
name = Release;
385413
};
@@ -397,8 +425,10 @@
397425
);
398426
INFOPLIST_FILE = MailAppDemoSwiftTests/Info.plist;
399427
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
428+
PRODUCT_BUNDLE_IDENTIFIER = "mortimergoro.$(PRODUCT_NAME:rfc1034identifier)";
400429
PRODUCT_NAME = "$(TARGET_NAME)";
401-
SWIFT_VERSION = 3.0;
430+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
431+
SWIFT_VERSION = 4.2;
402432
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MailAppDemoSwift.app/MailAppDemoSwift";
403433
};
404434
name = Debug;
@@ -413,8 +443,10 @@
413443
);
414444
INFOPLIST_FILE = MailAppDemoSwiftTests/Info.plist;
415445
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
446+
PRODUCT_BUNDLE_IDENTIFIER = "mortimergoro.$(PRODUCT_NAME:rfc1034identifier)";
416447
PRODUCT_NAME = "$(TARGET_NAME)";
417-
SWIFT_VERSION = 3.0;
448+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
449+
SWIFT_VERSION = 4.2;
418450
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MailAppDemoSwift.app/MailAppDemoSwift";
419451
};
420452
name = Release;

‎demo/MailAppDemoSwift/MailAppDemoSwift/AppDelegate.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
1111
var window: UIWindow?
1212

1313

14-
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
14+
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
1515

1616
window = UIWindow(frame: UIScreen.main.bounds);
1717
let controller = MailViewController();

‎demo/MailAppDemoSwift/MailAppDemoSwift/MailTableCell.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class MailTableCell: MGSwipeTableCell {
6868
mailMessage.isScrollEnabled = false;
6969
mailMessage.isEditable = false;
7070
mailMessage.backgroundColor = UIColor.clear;
71-
mailMessage.contentInset = UIEdgeInsetsMake(-5, -5, 0, 0);
71+
mailMessage.contentInset = UIEdgeInsets.init(top: -5, left: -5, bottom: 0, right: 0);
7272
mailMessage.textColor = UIColor.gray;
7373
mailMessage.isUserInteractionEnabled = false;
7474

@@ -83,7 +83,7 @@ class MailTableCell: MGSwipeTableCell {
8383

8484
}
8585

86-
override init(style: UITableViewCellStyle, reuseIdentifier:String?)
86+
override init(style: UITableViewCell.CellStyle, reuseIdentifier:String?)
8787
{
8888
super.init(style:style, reuseIdentifier: reuseIdentifier);
8989
initViews();

‎demo/MailAppDemoSwift/MailAppDemoSwift/MailViewController.swift

+5-5
Original file line numberDiff line numberDiff line change
@@ -140,15 +140,15 @@ class MailViewController: UIViewController, UITableViewDataSource, UITableViewDe
140140
override func viewDidLoad() {
141141
super.viewDidLoad()
142142

143-
tableView = UITableView(frame: view.bounds, style: UITableViewStyle.plain);
143+
tableView = UITableView(frame: view.bounds, style: UITableView.Style.plain);
144144
tableView.delegate = self;
145145
tableView.dataSource = self;
146146
view.addSubview(tableView);
147147

148148
self.title = "MSwipeTableCell MailApp";
149149

150150
refreshControl = UIRefreshControl();
151-
refreshControl.addTarget(self, action: #selector(refreshCallback), for: UIControlEvents.valueChanged);
151+
refreshControl.addTarget(self, action: #selector(refreshCallback), for: UIControl.Event.valueChanged);
152152
tableView.addSubview(refreshControl);
153153
prepareDemoData();
154154
}
@@ -169,7 +169,7 @@ class MailViewController: UIViewController, UITableViewDataSource, UITableViewDe
169169

170170
var cell: MailTableCell! = tableView.dequeueReusableCell(withIdentifier: identifier) as? MailTableCell;
171171
if cell == nil {
172-
cell = MailTableCell(style: UITableViewCellStyle.default, reuseIdentifier: identifier);
172+
cell = MailTableCell(style: UITableViewCell.CellStyle.default, reuseIdentifier: identifier);
173173
}
174174
cell.delegate = self;
175175

@@ -209,7 +209,7 @@ class MailViewController: UIViewController, UITableViewDataSource, UITableViewDe
209209
mail.read = !mail.read;
210210
self.updateCellIndicator(mail, cell: cell as! MailTableCell);
211211
cell.refreshContentView();
212-
(cell.leftButtons[0] as! UIButton).setTitle(self.readButtonText(mail.read), for: UIControlState());
212+
(cell.leftButtons[0] as! UIButton).setTitle(self.readButtonText(mail.read), for: UIControl.State());
213213

214214
return true;
215215
})
@@ -251,7 +251,7 @@ class MailViewController: UIViewController, UITableViewDataSource, UITableViewDe
251251
mail.read = !mail.read;
252252
self.updateCellIndicator(mail, cell: cell as! MailTableCell);
253253
cell.refreshContentView();
254-
(cell.leftButtons[0] as! UIButton).setTitle(self.readButtonText(mail.read), for: UIControlState());
254+
(cell.leftButtons[0] as! UIButton).setTitle(self.readButtonText(mail.read), for: UIControl.State());
255255
cell.hideSwipe(animated: true);
256256
}
257257
else if index == 2 {

‎demo/MailAppDemoSwift/MailAppDemoSwiftTests/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<key>CFBundleExecutable</key>
88
<string>$(EXECUTABLE_NAME)</string>
99
<key>CFBundleIdentifier</key>
10-
<string>mortimergoro.$(PRODUCT_NAME:rfc1034identifier)</string>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1111
<key>CFBundleInfoDictionaryVersion</key>
1212
<string>6.0</string>
1313
<key>CFBundleName</key>

0 commit comments

Comments
 (0)