Merge pull request #7 from JNDisrupter/development

Upgrade to swift 5.0

Author: mohammadnabulsi

.swift-version

@@ -188,13 +188,13 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0830;
-				LastUpgradeCheck = 0930;
+				LastUpgradeCheck = 1020;
 				ORGANIZATIONNAME = CocoaPods;
 				TargetAttributes = {
 					607FACCF1AFB9204008FA782 = {
 						CreatedOnToolsVersion = 6.3.1;
-						DevelopmentTeam = 57M378XZD9;
-						LastSwiftMigration = 1000;
+						DevelopmentTeam = 9SJR5T495P;
+						LastSwiftMigration = 1020;
 					};
 					607FACE41AFB9204008FA782 = {
 						CreatedOnToolsVersion = 6.3.1;
@@ -208,6 +208,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 			);
@@ -267,7 +268,7 @@
 			files = (
 			);
 			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-JNHorizontalGroupAvatarCollectionView_Example/Pods-JNHorizontalGroupAvatarCollectionView_Example-frameworks.sh",
+				"${PODS_ROOT}/Target Support Files/Pods-JNHorizontalGroupAvatarCollectionView_Example/Pods-JNHorizontalGroupAvatarCollectionView_Example-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/JNAvatarWithInitials/JNAvatarWithInitials.framework",
 				"${BUILT_PRODUCTS_DIR}/JNGroupAvatarImageView/JNGroupAvatarImageView.framework",
 				"${BUILT_PRODUCTS_DIR}/JNHorizontalGroupAvatarCollectionView/JNHorizontalGroupAvatarCollectionView.framework",
@@ -282,7 +283,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-JNHorizontalGroupAvatarCollectionView_Example/Pods-JNHorizontalGroupAvatarCollectionView_Example-frameworks.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-JNHorizontalGroupAvatarCollectionView_Example/Pods-JNHorizontalGroupAvatarCollectionView_Example-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
@@ -341,6 +342,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -396,6 +398,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -445,13 +448,13 @@
 			baseConfigurationReference = 83B4449AFF358D96768506A0 /* Pods-JNHorizontalGroupAvatarCollectionView_Example.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				DEVELOPMENT_TEAM = 57M378XZD9;
+				DEVELOPMENT_TEAM = 9SJR5T495P;
 				INFOPLIST_FILE = JNHorizontalGroupAvatarCollectionView/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -460,13 +463,13 @@
 			baseConfigurationReference = A213FD985EE96B333871F9A4 /* Pods-JNHorizontalGroupAvatarCollectionView_Example.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				DEVELOPMENT_TEAM = 57M378XZD9;
+				DEVELOPMENT_TEAM = 9SJR5T495P;
 				INFOPLIST_FILE = JNHorizontalGroupAvatarCollectionView/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

Example/JNHorizontalGroupAvatarCollectionView.xcodeproj/project.pbxproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Example/JNHorizontalGroupAvatarCollectionView.xcodeproj/xcshareddata/xcschemes/JNHorizontalGroupAvatarCollectionView-Example.xcscheme

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.2</string>
+	<string>1.0.4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Example/JNHorizontalGroupAvatarCollectionView/Info.plist

@@ -138,7 +138,7 @@ extension ViewController: UITableViewDataSource, UITableViewDelegate {
         let user = self.dataSource[indexPath.row]
 
         // Update selected users
-        if let userIndex = self.selectedUsers.index(where: {$0.getGroupName() == user.getGroupName()}) {
+        if let userIndex = self.selectedUsers.firstIndex(where: {$0.getGroupName() == user.getGroupName()}) {
             self.selectedUsers.remove(at: userIndex)
         } else {
             self.selectedUsers.append(user)

Example/JNHorizontalGroupAvatarCollectionView/ViewController.swift

@@ -1,13 +1,13 @@
 PODS:
-  - JNAvatarWithInitials (1.1.2):
-    - SDWebImage (~> 4.4.2)
-  - JNGroupAvatarImageView (1.2.3):
-    - JNAvatarWithInitials (~> 1.1.2)
-  - JNHorizontalGroupAvatarCollectionView (1.0.3):
-    - JNGroupAvatarImageView (~> 1.2.3)
-  - SDWebImage (4.4.2):
-    - SDWebImage/Core (= 4.4.2)
-  - SDWebImage/Core (4.4.2)
+  - JNAvatarWithInitials (1.1.4):
+    - SDWebImage (~> 5.0.2)
+  - JNGroupAvatarImageView (1.2.4):
+    - JNAvatarWithInitials (~> 1.1.4)
+  - JNHorizontalGroupAvatarCollectionView (1.0.4):
+    - JNGroupAvatarImageView (~> 1.2.4)
+  - SDWebImage (5.0.2):
+    - SDWebImage/Core (= 5.0.2)
+  - SDWebImage/Core (5.0.2)
 
 DEPENDENCIES:
   - JNHorizontalGroupAvatarCollectionView (from `../`)
@@ -23,11 +23,11 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  JNAvatarWithInitials: 806ccb76bd4d3c43c7498b2346eab57a6045ea4e
-  JNGroupAvatarImageView: 0b69f44b4ed378dbd17bf80055abdcc921e64fd4
-  JNHorizontalGroupAvatarCollectionView: d0efec39ae81b984c9d01628f4c18a39f55b43f2
-  SDWebImage: 624d6e296c69b244bcede364c72ae0430ac14681
+  JNAvatarWithInitials: 818527c031182b6ff28afd87518b8dd705ceb473
+  JNGroupAvatarImageView: 44c681b92719cd5667b2cffe23719f4a5a23b719
+  JNHorizontalGroupAvatarCollectionView: 716128bdecfc08f740589af006acfff6f49c5676
+  SDWebImage: 6764b5fa0f73c203728052955dbefa2bf1f33282
 
 PODFILE CHECKSUM: 3a4af99e4873fae71fccdaf30b1804a95aac3f8e
 
-COCOAPODS: 1.5.3
+COCOAPODS: 1.6.1