Merge branch 'release/2.1.0' into develop

Author: bbriatte

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 
 ---
 
+## [2.1.0](https://github.com/Digipolitan/collection-view-grid-layout/releases/tag/v2.1.0)
+
+swift 5 support
+
+---
+
 ## [2.0.0](https://github.com/Digipolitan/collection-view-grid-layout/releases/tag/v2.0.0)
 
 Major update, layout horizontal & vertical

CollectionViewGridLayout.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
 s.name = "CollectionViewGridLayout"
-s.version = "2.0.0"
+s.version = "2.1.0"
 s.summary = "Layout that allows you to display collection of data in grid with only very few lines of codes."
 s.homepage = "https://github.com/Digipolitan/collection-view-grid-layout"
 s.authors = "Digipolitan"

CollectionViewGridLayout.xcodeproj/project.pbxproj

@@ -597,7 +597,7 @@
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = 3;
+				TARGETED_DEVICE_FAMILY = "1,2,3";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -652,7 +652,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = 3;
+				TARGETED_DEVICE_FAMILY = "1,2,3";
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -677,6 +677,7 @@
 				PRODUCT_NAME = CollectionViewGridLayout;
 				SKIP_INSTALL = YES;
 				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
 		};
@@ -698,6 +699,7 @@
 				PRODUCT_NAME = CollectionViewGridLayout;
 				SKIP_INSTALL = YES;
 				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
 		};

Podfile.lock

@@ -1,3 +1,3 @@
-PODFILE CHECKSUM: 2c8f28632ba1a9ba4ee116c4361b50cce368e661
+PODFILE CHECKSUM: a3bc7ae8695b8dfd272449f8118b00172a8773e6
 
-COCOAPODS: 1.7.0.rc.1
+COCOAPODS: 1.6.1

Pods/Manifest.lock

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.0</string>
+	<string>2.1.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>NSPrincipalClass</key>

Pods/Pods.xcodeproj/project.pbxproj

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.0</string>
+	<string>2.1.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 </dict>

Sources/Info.plist

@@ -8,27 +8,38 @@ Make sure you have the latest version of the Xcode command line tools installed:
 xcode-select --install
 ```
 
-## Choose your installation method:
-
-<table width="100%" >
-<tr>
-<th width="33%"><a href="http://brew.sh">Homebrew</a></th>
-<th width="33%">Installer Script</th>
-<th width="33%">RubyGems</th>
-</tr>
-<tr>
-<td width="33%" align="center">macOS</td>
-<td width="33%" align="center">macOS</td>
-<td width="33%" align="center">macOS or Linux with Ruby 2.0.0 or above</td>
-</tr>
-<tr>
-<td width="33%"><code>brew cask install fastlane</code></td>
-<td width="33%"><a href="https://download.fastlane.tools">Download the zip file</a>. Then double click on the <code>install</code> script (or run it in a terminal window).</td>
-<td width="33%"><code>sudo gem install fastlane -NV</code></td>
-</tr>
-</table>
+Install _fastlane_ using
+```
+[sudo] gem install fastlane -NV
+```
+or alternatively using `brew cask install fastlane`
 
 # Available Actions
+### multi_environment
+```
+fastlane multi_environment
+```
+Execute a lane using different environment variables
+
+#### Options
+
+* __**target_lane**__: The target lane to execute with different environment
+
+  * **environment_variable**: TARGET_LANE
+
+  * **type**: string
+
+  * **optional**: false
+
+#### Environment variables
+
+* __**ENVIRONMENT_DIRECTORY_PATH**__: The directory path of the environment info
+
+  * **type**: string
+
+  * **optional**: true
+
+
 ### appfile_init
 ```
 fastlane appfile_init
@@ -86,9 +97,9 @@ fastlane appfile_init fetch_app_identifier:false
   * **default_value**: true
 
 
-### run_tests
+### tests
 ```
-fastlane run_tests
+fastlane tests
 ```
 Build and run all Xcode tests
 
@@ -110,9 +121,9 @@ import_from_git(
 
 #### Options
 
-* __**test_scheme**__: The scheme into the Xcode project to execute, the scheme is required on the CI environement
+* __**target_scheme**__: The scheme into the Xcode project to execute, the scheme is required on the CI environement
 
-  * **environment_variable**: TEST_SCHEME
+  * **environment_variable**: TARGET_SCHEME
 
   * **type**: string
 
@@ -192,7 +203,7 @@ import_from_git(
 
   * **environment_variable**: SKIP_COCOAPODS
 
-  * **type**: string
+  * **type**: boolean
 
   * **default_value**: false
 
@@ -253,7 +264,7 @@ fastlane start_framework_release target_version:4.0.9
 
   * **environment_variable**: SKIP_COCOAPODS
 
-  * **type**: string
+  * **type**: boolean
 
   * **default_value**: false
 
@@ -330,9 +341,9 @@ import_from_git(
 
   * **optional**: true
 
-* __**test_scheme**__: The scheme into the Xcode project to execute
+* __**target_scheme**__: The scheme into the Xcode project to execute
 
-  * **environment_variable**: TEST_SCHEME
+  * **environment_variable**: TARGET_SCHEME
 
   * **type**: string
 
@@ -350,7 +361,7 @@ import_from_git(
 
   * **environment_variable**: SKIP_COCOAPODS
 
-  * **type**: string
+  * **type**: boolean
 
   * **default_value**: false
 
@@ -454,6 +465,14 @@ import_from_git(
 
   * **optional**: false
 
+* __**target_scheme**__: The scheme into the Xcode project get version number
+
+  * **environment_variable**: TARGET_SCHEME
+
+  * **type**: string
+
+  * **optional**: false on CI
+
 * __**xcodeproj**__: Your xcodeproj path
 
   * **environment_variable**: XCODEPROJ
@@ -509,6 +528,14 @@ import_from_git(
 
 #### Options
 
+* __**target_scheme**__: The scheme into the Xcode project to execute, the scheme is required on the CI environement
+
+  * **environment_variable**: TARGET_SCHEME
+
+  * **type**: string
+
+  * **optional**: false on CI
+
 * __**xcodeproj**__: The Xcode project to select.
 
   * **environment_variable**: XCODEPROJ