From 10892105690e3315694ddca50d66dfbc8bfdefa9 Mon Sep 17 00:00:00 2001 From: Luan Tran Date: Mon, 18 Dec 2017 20:49:06 +0700 Subject: [PATCH 1/4] Convert to swift 4 --- PhotoCollectionView.xcodeproj/project.pbxproj | 5 +++++ Sources/PhotoCollectionView.swift | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/PhotoCollectionView.xcodeproj/project.pbxproj b/PhotoCollectionView.xcodeproj/project.pbxproj index 3f12b93..c4bd79e 100644 --- a/PhotoCollectionView.xcodeproj/project.pbxproj +++ b/PhotoCollectionView.xcodeproj/project.pbxproj @@ -222,6 +222,7 @@ ProvisioningStyle = Automatic; }; OBJ_16 = { + LastSwiftMigration = 0900; ProvisioningStyle = Manual; }; }; @@ -518,6 +519,8 @@ PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; + SWIFT_SWIFT3_OBJC_INFERENCE = On; + SWIFT_VERSION = 4.0; TARGET_NAME = PhotoCollectionView; }; name = Debug; @@ -545,6 +548,8 @@ PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; + SWIFT_SWIFT3_OBJC_INFERENCE = On; + SWIFT_VERSION = 4.0; TARGET_NAME = PhotoCollectionView; }; name = Release; diff --git a/Sources/PhotoCollectionView.swift b/Sources/PhotoCollectionView.swift index cd913e5..feb5166 100644 --- a/Sources/PhotoCollectionView.swift +++ b/Sources/PhotoCollectionView.swift @@ -143,7 +143,7 @@ open class PhotoCollectionView: UIView { return images[index] } - func tapPhotoView(sender: UITapGestureRecognizer) { + @objc func tapPhotoView(sender: UITapGestureRecognizer) { if let tag = sender.view?.tag { delegate?.photoCollectionView?(self, didSelectImageAt: tag) } From fd8304f03f5697fe68c6cdda1c6b3c5b39a48b39 Mon Sep 17 00:00:00 2001 From: Luan Tran Date: Mon, 18 Dec 2017 20:57:30 +0700 Subject: [PATCH 2/4] Convert to swift 4 in demo project --- PhotoCollectionView.xcodeproj/project.pbxproj | 4 ++-- .../Assets.xcassets/AppIcon.appiconset/Contents.json | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/PhotoCollectionView.xcodeproj/project.pbxproj b/PhotoCollectionView.xcodeproj/project.pbxproj index c4bd79e..0909a30 100644 --- a/PhotoCollectionView.xcodeproj/project.pbxproj +++ b/PhotoCollectionView.xcodeproj/project.pbxproj @@ -444,7 +444,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.0; }; name = Debug; }; @@ -491,7 +491,7 @@ PRODUCT_BUNDLE_IDENTIFIER = luantran.PhotoCollectionViewDemo; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.0; VALIDATE_PRODUCT = YES; }; name = Release; diff --git a/PhotoCollectionViewDemo/Assets.xcassets/AppIcon.appiconset/Contents.json b/PhotoCollectionViewDemo/Assets.xcassets/AppIcon.appiconset/Contents.json index 1d060ed..d8db8d6 100644 --- a/PhotoCollectionViewDemo/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/PhotoCollectionViewDemo/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -84,6 +84,11 @@ "idiom" : "ipad", "size" : "83.5x83.5", "scale" : "2x" + }, + { + "idiom" : "ios-marketing", + "size" : "1024x1024", + "scale" : "1x" } ], "info" : { From eaba2b43de5ada172eb539c0c630c808bbf7443b Mon Sep 17 00:00:00 2001 From: Luan Tran Date: Tue, 19 Dec 2017 20:11:44 +0700 Subject: [PATCH 3/4] update swift version to 4.0 --- .swift-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.swift-version b/.swift-version index a3ec5a4..389f774 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -3.2 +4.0 \ No newline at end of file From 98f8ef735690f36a641bc8616459ff1dd9a1a79f Mon Sep 17 00:00:00 2001 From: Luan Tran Date: Tue, 19 Dec 2017 20:30:00 +0700 Subject: [PATCH 4/4] Update travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cbf5a27..e82b86d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: objective-c -osx_image: xcode8.3 +osx_image: xcode9 before_install: - pod repo update