Skip to content

Commit 60dd8d0

Browse files
CaioSanchezMaherKSantina
CaioSanchez
authored and
MaherKSantina
committed
Update to swift 5 (#48)
1 parent 5940b23 commit 60dd8d0

File tree

6 files changed

+49
-38
lines changed

6 files changed

+49
-38
lines changed

‎Example/MSPeekCollectionViewDelegateImplementation.xcodeproj/project.pbxproj‎

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -210,23 +210,23 @@
210210
isa = PBXProject;
211211
attributes = {
212212
LastSwiftUpdateCheck = 0830;
213-
LastUpgradeCheck = 0830;
213+
LastUpgradeCheck = 1030;
214214
ORGANIZATIONNAME = CocoaPods;
215215
TargetAttributes = {
216216
607FACCF1AFB9204008FA782 = {
217217
CreatedOnToolsVersion = 6.3.1;
218-
LastSwiftMigration = 0900;
218+
LastSwiftMigration = 1030;
219219
};
220220
607FACE41AFB9204008FA782 = {
221221
CreatedOnToolsVersion = 6.3.1;
222-
LastSwiftMigration = 0900;
222+
LastSwiftMigration = 1030;
223223
TestTargetID = 607FACCF1AFB9204008FA782;
224224
};
225225
};
226226
};
227227
buildConfigurationList = 607FACCB1AFB9204008FA782 /* Build configuration list for PBXProject "MSPeekCollectionViewDelegateImplementation" */;
228228
compatibilityVersion = "Xcode 3.2";
229-
developmentRegion = English;
229+
developmentRegion = en;
230230
hasScannedForEncodings = 0;
231231
knownRegions = (
232232
en,
@@ -373,6 +373,7 @@
373373
isa = XCBuildConfiguration;
374374
buildSettings = {
375375
ALWAYS_SEARCH_USER_PATHS = NO;
376+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
376377
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
377378
CLANG_CXX_LIBRARY = "libc++";
378379
CLANG_ENABLE_MODULES = YES;
@@ -381,12 +382,14 @@
381382
CLANG_WARN_BOOL_CONVERSION = YES;
382383
CLANG_WARN_COMMA = YES;
383384
CLANG_WARN_CONSTANT_CONVERSION = YES;
385+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
384386
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
385387
CLANG_WARN_EMPTY_BODY = YES;
386388
CLANG_WARN_ENUM_CONVERSION = YES;
387389
CLANG_WARN_INFINITE_RECURSION = YES;
388390
CLANG_WARN_INT_CONVERSION = YES;
389391
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
392+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
390393
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
391394
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
392395
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -426,6 +429,7 @@
426429
isa = XCBuildConfiguration;
427430
buildSettings = {
428431
ALWAYS_SEARCH_USER_PATHS = NO;
432+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
429433
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
430434
CLANG_CXX_LIBRARY = "libc++";
431435
CLANG_ENABLE_MODULES = YES;
@@ -434,12 +438,14 @@
434438
CLANG_WARN_BOOL_CONVERSION = YES;
435439
CLANG_WARN_COMMA = YES;
436440
CLANG_WARN_CONSTANT_CONVERSION = YES;
441+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
437442
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
438443
CLANG_WARN_EMPTY_BODY = YES;
439444
CLANG_WARN_ENUM_CONVERSION = YES;
440445
CLANG_WARN_INFINITE_RECURSION = YES;
441446
CLANG_WARN_INT_CONVERSION = YES;
442447
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
448+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
443449
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
444450
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
445451
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -479,8 +485,7 @@
479485
MODULE_NAME = ExampleApp;
480486
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
481487
PRODUCT_NAME = "$(TARGET_NAME)";
482-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
483-
SWIFT_VERSION = 4.0;
488+
SWIFT_VERSION = 5.0;
484489
};
485490
name = Debug;
486491
};
@@ -495,8 +500,7 @@
495500
MODULE_NAME = ExampleApp;
496501
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
497502
PRODUCT_NAME = "$(TARGET_NAME)";
498-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
499-
SWIFT_VERSION = 4.0;
503+
SWIFT_VERSION = 5.0;
500504
};
501505
name = Release;
502506
};
@@ -505,20 +509,14 @@
505509
baseConfigurationReference = DF7372422D5B44BC145D286F /* Pods-MSPeekCollectionViewDelegateImplementation_Tests.debug.xcconfig */;
506510
buildSettings = {
507511
BUNDLE_LOADER = "$(TEST_HOST)";
508-
FRAMEWORK_SEARCH_PATHS = (
509-
"$(SDKROOT)/Developer/Library/Frameworks",
510-
"$(inherited)",
511-
);
512512
GCC_PREPROCESSOR_DEFINITIONS = (
513513
"DEBUG=1",
514514
"$(inherited)",
515515
);
516516
INFOPLIST_FILE = Tests/Info.plist;
517-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
518517
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
519518
PRODUCT_NAME = "$(TARGET_NAME)";
520-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
521-
SWIFT_VERSION = 4.0;
519+
SWIFT_VERSION = 5.0;
522520
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MSPeekCollectionViewDelegateImplementation_Example.app/MSPeekCollectionViewDelegateImplementation_Example";
523521
};
524522
name = Debug;
@@ -528,16 +526,10 @@
528526
baseConfigurationReference = A72FA0AC4731049825DB8C50 /* Pods-MSPeekCollectionViewDelegateImplementation_Tests.release.xcconfig */;
529527
buildSettings = {
530528
BUNDLE_LOADER = "$(TEST_HOST)";
531-
FRAMEWORK_SEARCH_PATHS = (
532-
"$(SDKROOT)/Developer/Library/Frameworks",
533-
"$(inherited)",
534-
);
535529
INFOPLIST_FILE = Tests/Info.plist;
536-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
537530
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
538531
PRODUCT_NAME = "$(TARGET_NAME)";
539-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
540-
SWIFT_VERSION = 4.0;
532+
SWIFT_VERSION = 5.0;
541533
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MSPeekCollectionViewDelegateImplementation_Example.app/MSPeekCollectionViewDelegateImplementation_Example";
542534
};
543535
name = Release;

‎Example/MSPeekCollectionViewDelegateImplementation.xcodeproj/xcshareddata/xcschemes/MSPeekCollectionViewDelegateImplementation-Example.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 = "0900"
3+
LastUpgradeVersion = "1030"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Example/MSPeekCollectionViewDelegateImplementation/AppDelegate.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
2727
var window: UIWindow?
2828

2929

30-
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
30+
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
3131
// Override point for customization after application launch.
3232
return true
3333
}

‎Example/Pods/Pods.xcodeproj/project.pbxproj‎

Lines changed: 20 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎MSPeekCollectionViewDelegateImplementation.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
1010
s.name = 'MSPeekCollectionViewDelegateImplementation'
1111
s.version = '1.3.0'
1212
s.summary = 'A custom paging behavior that peeks the previous and next items in a collection view'
13-
s.swift_version = '4.2'
13+
s.swift_version = '5.0'
1414

1515
# This description is used to generate tags and improve search results.
1616
# * Think: What does it do? Why did you write it? What is the focus?

‎MSPeekCollectionViewDelegateImplementation/Classes/UICollectionViewScrollDirection+PeekDataCovnversion.swift‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ extension UICollectionView.ScrollDirection {
1414
return view.frame.size.width
1515
case .vertical:
1616
return view.frame.size.height
17+
@unknown default:
18+
fatalError()
1719
}
1820
}
1921

@@ -23,6 +25,8 @@ extension UICollectionView.ScrollDirection {
2325
return point.x
2426
case .vertical:
2527
return point.y
28+
@unknown default:
29+
fatalError()
2630
}
2731
}
2832

@@ -32,6 +36,8 @@ extension UICollectionView.ScrollDirection {
3236
return size.width
3337
case .vertical:
3438
return size.height
39+
@unknown default:
40+
fatalError()
3541
}
3642
}
3743

@@ -41,6 +47,8 @@ extension UICollectionView.ScrollDirection {
4147
return CGPoint(x: value, y: defaultPoint.y)
4248
case .vertical:
4349
return CGPoint(x: defaultPoint.x, y: value)
50+
@unknown default:
51+
fatalError()
4452
}
4553
}
4654

@@ -50,6 +58,8 @@ extension UICollectionView.ScrollDirection {
5058
return CGSize(width: value, height: defaultSize.height)
5159
case .vertical:
5260
return CGSize(width: defaultSize.width, height: value)
61+
@unknown default:
62+
fatalError()
5363
}
5464
}
5565

@@ -59,6 +69,8 @@ extension UICollectionView.ScrollDirection {
5969
return UIEdgeInsets(top: 0, left: value, bottom: 0, right: value)
6070
case .vertical:
6171
return UIEdgeInsets(top: value, left: 0, bottom: value, right: 0)
72+
@unknown default:
73+
fatalError()
6274
}
6375
}
6476
}

0 commit comments

Comments
 (0)