Skip to content

Commit de16031

Browse files
author
Martin Barreto
authored
Merge pull request #696 from ynstek/version/8.1.2
Upgrade project to Xcode 10.2 and Swift 5
2 parents a21a554 + be44891 commit de16031

File tree

5 files changed

+20
-17
lines changed

5 files changed

+20
-17
lines changed

Example.xcodeproj/project.pbxproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@
314314
isa = PBXProject;
315315
attributes = {
316316
LastSwiftUpdateCheck = 0720;
317-
LastUpgradeCheck = 1000;
317+
LastUpgradeCheck = 1020;
318318
TargetAttributes = {
319319
28F828CB1C4B714D00330CF4 = {
320320
CreatedOnToolsVersion = 7.2;
@@ -329,7 +329,7 @@
329329
};
330330
buildConfigurationList = 28F828C71C4B714D00330CF4 /* Build configuration list for PBXProject "Example" */;
331331
compatibilityVersion = "Xcode 3.2";
332-
developmentRegion = English;
332+
developmentRegion = en;
333333
hasScannedForEncodings = 0;
334334
knownRegions = (
335335
en,
@@ -456,6 +456,7 @@
456456
isa = XCBuildConfiguration;
457457
buildSettings = {
458458
ALWAYS_SEARCH_USER_PATHS = NO;
459+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
459460
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
460461
CLANG_CXX_LIBRARY = "libc++";
461462
CLANG_ENABLE_MODULES = YES;
@@ -510,6 +511,7 @@
510511
isa = XCBuildConfiguration;
511512
buildSettings = {
512513
ALWAYS_SEARCH_USER_PATHS = NO;
514+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
513515
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
514516
CLANG_CXX_LIBRARY = "libc++";
515517
CLANG_ENABLE_MODULES = YES;

Sources/ButtonBarPagerTabStripViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public struct ButtonBarPagerTabStripSettings {
5656
public var buttonBarItemFont = UIFont.systemFont(ofSize: 18)
5757
public var buttonBarItemLeftRightMargin: CGFloat = 8
5858
public var buttonBarItemTitleColor: UIColor?
59-
@available(*, deprecated: 7.0.0) public var buttonBarItemsShouldFillAvailiableWidth: Bool {
59+
@available(*, deprecated) public var buttonBarItemsShouldFillAvailiableWidth: Bool {
6060
set {
6161
buttonBarItemsShouldFillAvailableWidth = newValue
6262
}

Sources/PagerTabStripViewController.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ open class PagerTabStripViewController: UIViewController, UIScrollViewDelegate {
172172
}
173173

174174
open func moveTo(viewController: UIViewController, animated: Bool = true) {
175-
moveToViewController(at: viewControllers.index(of: viewController)!, animated: animated)
175+
moveToViewController(at: viewControllers.firstIndex(of: viewController)!, animated: animated)
176176
}
177177

178178
// MARK: - PagerTabStripDataSource
@@ -203,7 +203,7 @@ open class PagerTabStripViewController: UIViewController, UIScrollViewDelegate {
203203
}
204204

205205
open func offsetForChild(viewController: UIViewController) throws -> CGFloat {
206-
guard let index = viewControllers.index(of: viewController) else {
206+
guard let index = viewControllers.firstIndex(of: viewController) else {
207207
throw PagerTabStripError.viewControllerOutOfBounds
208208
}
209209
return offsetForChild(at: index)

XLPagerTabStrip.xcodeproj/project.pbxproj

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -227,16 +227,16 @@
227227
isa = PBXProject;
228228
attributes = {
229229
LastSwiftUpdateCheck = 0720;
230-
LastUpgradeCheck = 1000;
230+
LastUpgradeCheck = 1020;
231231
TargetAttributes = {
232232
28F8287C1C494B2C00330CF4 = {
233233
CreatedOnToolsVersion = 7.2;
234-
LastSwiftMigration = 0900;
234+
LastSwiftMigration = 1020;
235235
ProvisioningStyle = Manual;
236236
};
237237
28F828861C494B2C00330CF4 = {
238238
CreatedOnToolsVersion = 7.2;
239-
LastSwiftMigration = 0800;
239+
LastSwiftMigration = 1020;
240240
};
241241
};
242242
};
@@ -245,6 +245,7 @@
245245
developmentRegion = English;
246246
hasScannedForEncodings = 0;
247247
knownRegions = (
248+
English,
248249
en,
249250
);
250251
mainGroup = 28F828731C494B2C00330CF4;
@@ -338,6 +339,7 @@
338339
isa = XCBuildConfiguration;
339340
buildSettings = {
340341
ALWAYS_SEARCH_USER_PATHS = NO;
342+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
341343
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
342344
CLANG_CXX_LIBRARY = "libc++";
343345
CLANG_ENABLE_MODULES = YES;
@@ -381,7 +383,7 @@
381383
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
382384
GCC_WARN_UNUSED_FUNCTION = YES;
383385
GCC_WARN_UNUSED_VARIABLE = YES;
384-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
386+
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
385387
MTL_ENABLE_DEBUG_INFO = YES;
386388
ONLY_ACTIVE_ARCH = YES;
387389
SDKROOT = iphoneos;
@@ -397,6 +399,7 @@
397399
isa = XCBuildConfiguration;
398400
buildSettings = {
399401
ALWAYS_SEARCH_USER_PATHS = NO;
402+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
400403
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
401404
CLANG_CXX_LIBRARY = "libc++";
402405
CLANG_ENABLE_MODULES = YES;
@@ -434,7 +437,7 @@
434437
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
435438
GCC_WARN_UNUSED_FUNCTION = YES;
436439
GCC_WARN_UNUSED_VARIABLE = YES;
437-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
440+
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
438441
MTL_ENABLE_DEBUG_INFO = NO;
439442
SDKROOT = iphoneos;
440443
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -466,8 +469,7 @@
466469
PRODUCT_NAME = "$(TARGET_NAME)";
467470
PROVISIONING_PROFILE_SPECIFIER = "";
468471
SKIP_INSTALL = YES;
469-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
470-
SWIFT_VERSION = 4.2;
472+
SWIFT_VERSION = 5.0;
471473
};
472474
name = Debug;
473475
};
@@ -492,8 +494,7 @@
492494
PRODUCT_NAME = "$(TARGET_NAME)";
493495
PROVISIONING_PROFILE_SPECIFIER = "";
494496
SKIP_INSTALL = YES;
495-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
496-
SWIFT_VERSION = 4.2;
497+
SWIFT_VERSION = 5.0;
497498
};
498499
name = Release;
499500
};
@@ -506,7 +507,7 @@
506507
PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.XLPagerTabStripTests;
507508
PRODUCT_NAME = "$(TARGET_NAME)";
508509
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
509-
SWIFT_VERSION = 4.2;
510+
SWIFT_VERSION = 5.0;
510511
};
511512
name = Debug;
512513
};
@@ -518,7 +519,7 @@
518519
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
519520
PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.XLPagerTabStripTests;
520521
PRODUCT_NAME = "$(TARGET_NAME)";
521-
SWIFT_VERSION = 4.2;
522+
SWIFT_VERSION = 5.0;
522523
};
523524
name = Release;
524525
};

XLPagerTabStrip.xcodeproj/xcshareddata/xcschemes/XLPagerTabStrip.xcscheme

Lines changed: 1 addition & 1 deletion
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 = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

0 commit comments

Comments
 (0)