Merge pull request #12 from noblakit01/swift_4

Swift 4
noblakit01 · Dec 19, 2017 · b1a12ea · b1a12ea
2 parents e84e9b6 + 98f8ef7
commit b1a12ea
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 5 deletions.
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-3.2
+4.0
diff --git 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

diff --git a/PhotoCollectionView.xcodeproj/project.pbxproj b/PhotoCollectionView.xcodeproj/project.pbxproj
@@ -222,6 +222,7 @@
 						ProvisioningStyle = Automatic;
 					};
 					OBJ_16 = {
+						LastSwiftMigration = 0900;
 						ProvisioningStyle = Manual;
 					};
 				};
@@ -443,7 +444,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -490,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;
@@ -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/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" : {

diff --git 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)
         }