Merge pull request #77 from layoutBox/update_license_and_cocoapod

Update Cocoapod to 1.5 and change the license to MIT

Author: lucdion

.gitignore

@@ -21,4 +21,7 @@ Carthage/Checkouts
 /.buckconfig.local
 /.buckd
 /gentest/test.html
-.buckversion
+.buckversion
+
+fastlane/report.xml
+fastlane/test_output

Example/FlexLayoutSample.xcodeproj/project.pbxproj

@@ -351,7 +351,6 @@
 				DF1F2A181F17D11700BA1B97 /* Resources */,
 				DF1F2A1B1F17D11700BA1B97 /* Embed Frameworks */,
 				DF1F2A1C1F17D11700BA1B97 /* [CP] Embed Pods Frameworks */,
-				DF1F2A1D1F17D11700BA1B97 /* [CP] Copy Pods Resources */,
 				DF1F2A1E1F17D11700BA1B97 /* Run Swiftlint */,
 			);
 			buildRules = (
@@ -445,21 +444,6 @@
 			shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-FlexLayoutSample/Pods-FlexLayoutSample-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		DF1F2A1D1F17D11700BA1B97 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-FlexLayoutSample/Pods-FlexLayoutSample-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		DF1F2A1E1F17D11700BA1B97 /* Run Swiftlint */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;

Example/FlexLayoutSample/UI/Examples/Example1/Example1View.swift

@@ -21,6 +21,7 @@ class Example1View: UIView {
 
     init() {
         super.init(frame: .zero)
+        backgroundColor = .white
 
         let view1 = BasicView(text: "View 1")
         let view2 = BasicView(text: "View 2")

Example/FlexLayoutSample/UI/Examples/Intro/IntroView.swift

@@ -21,6 +21,7 @@ class IntroView: UIView {
 
     init() {
         super.init(frame: .zero)
+        backgroundColor = .white
 
         let imageView = UIImageView(image: UIImage(named: "flexlayout-logo"))
 

Example/FlexLayoutSample/UI/Examples/YogaExampleA/YogaExampleAView.swift

@@ -21,6 +21,7 @@ class YogaExampleAView: UIView {
 
     init() {
         super.init(frame: .zero)
+        backgroundColor = .white
 
         // Yoga's C Example
         rootFlexContainer.flex.direction(.row).padding(20).define { (flex) in

Example/FlexLayoutSample/UI/Examples/YogaExampleB/YogaExampleBView.swift

@@ -21,6 +21,7 @@ class YogaExampleBView: UIView {
 
     init() {
         super.init(frame: .zero)
+        backgroundColor = .white
 
         let imageView = UIView()
         imageView.backgroundColor = .flexLayoutColor

Example/FlexLayoutSample/UI/Examples/YogaExampleC/YogaExampleCView.swift

@@ -21,6 +21,7 @@ class YogaExampleCView: UIView {
 
     init() {
         super.init(frame: .zero)
+        backgroundColor = .white
 
         let label = UIView()
         label.backgroundColor = .black

Example/FlexLayoutSample/UI/Examples/YogaExampleD/YogaExampleDView.swift

@@ -21,6 +21,7 @@ class YogaExampleDView: UIView {
 
     init() {
         super.init(frame: .zero)
+        backgroundColor = .white
 
         let imageView = UIView()
         imageView.backgroundColor = .flexLayoutColor

Example/FlexLayoutSample/UI/Examples/YogaExampleE/YogaExampleEView.swift

@@ -21,6 +21,7 @@ class YogaExampleEView: UIView {
 
     init() {
         super.init(frame: .zero)
+        backgroundColor = .white
 
         let imageView = UIView()
         imageView.backgroundColor = .flexLayoutColor

FlexLayout.xcodeproj/project.pbxproj

@@ -306,7 +306,6 @@
 				6AA61EBD9B5B3C3BFCBC353F /* [CP] Check Pods Manifest.lock */,
 				24DA375F1EF843C500D1AB2F /* Sources */,
 				24DA37601EF843C500D1AB2F /* Frameworks */,
-				6CAD7AF75EFAC45BB7600E90 /* [CP] Copy Pods Resources */,
 				AE3D984F700B529A3E1CA66E /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
@@ -388,21 +387,6 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		6CAD7AF75EFAC45BB7600E90 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-FlexLayoutTests/Pods-FlexLayoutTests-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		AE3D984F700B529A3E1CA66E /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;

Gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 gem 'synx'
-gem 'cocoapods', '~> 1.3.1'
+gem 'cocoapods', '~> 1.5.0'
 gem 'jazzy'
 gem 'fastlane'

Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (2.3.6)
+    CFPropertyList (3.0.0)
     activesupport (4.2.10)
       i18n (~> 0.7)
       minitest (~> 5.1)
@@ -13,31 +13,31 @@ GEM
     babosa (1.0.2)
     claide (1.0.2)
     clamp (0.6.5)
-    cocoapods (1.3.1)
+    cocoapods (1.5.0)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.3.1)
-      cocoapods-deintegrate (>= 1.0.1, < 2.0)
-      cocoapods-downloader (>= 1.1.3, < 2.0)
+      cocoapods-core (= 1.5.0)
+      cocoapods-deintegrate (>= 1.0.2, < 2.0)
+      cocoapods-downloader (>= 1.2.0, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
       cocoapods-stats (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.2.0, < 2.0)
+      cocoapods-trunk (>= 1.3.0, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
       colored2 (~> 3.1)
       escape (~> 0.0.4)
       fourflusher (~> 2.0.1)
       gh_inspector (~> 1.0)
-      molinillo (~> 0.5.7)
+      molinillo (~> 0.6.5)
       nap (~> 1.0)
       ruby-macho (~> 1.1)
-      xcodeproj (>= 1.5.1, < 2.0)
-    cocoapods-core (1.3.1)
+      xcodeproj (>= 1.5.7, < 2.0)
+    cocoapods-core (1.5.0)
       activesupport (>= 4.0.2, < 6)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
-    cocoapods-deintegrate (1.0.1)
-    cocoapods-downloader (1.1.3)
+    cocoapods-deintegrate (1.0.2)
+    cocoapods-downloader (1.2.0)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
@@ -51,6 +51,7 @@ GEM
     colorize (0.8.1)
     commander-fastlane (4.4.6)
       highline (~> 1.7.2)
+    concurrent-ruby (1.0.5)
     declarative (0.0.10)
     declarative-option (0.1.0)
     domain_name (0.5.20170404)
@@ -103,7 +104,7 @@ GEM
     ffi (1.9.18)
     fourflusher (2.0.1)
     fuzzy_match (2.0.4)
-    gh_inspector (1.1.2)
+    gh_inspector (1.1.3)
     google-api-client (0.13.6)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (~> 0.5)
@@ -123,7 +124,8 @@ GEM
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (0.8.6)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
     jazzy (0.8.3)
       cocoapods (~> 1.0)
       mustache (~> 0.99)
@@ -145,13 +147,13 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_magick (4.5.1)
-    minitest (5.10.3)
-    molinillo (0.5.7)
+    minitest (5.11.3)
+    molinillo (0.6.5)
     multi_json (1.13.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
     mustache (0.99.8)
-    nanaimo (0.2.3)
+    nanaimo (0.2.5)
     nap (1.1.0)
     netrc (0.11.0)
     open4 (1.3.4)
@@ -195,7 +197,7 @@ GEM
     tty-screen (0.6.4)
     tty-spinner (0.8.0)
       tty-cursor (>= 0.5.0)
-    tzinfo (1.2.3)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
     uber (0.1.0)
     unf (0.1.4)
@@ -205,12 +207,12 @@ GEM
     word_wrap (1.0.0)
     xcinvoke (0.3.0)
       liferaft (~> 0.0.6)
-    xcodeproj (1.5.6)
-      CFPropertyList (~> 2.3.3)
+    xcodeproj (1.5.7)
+      CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.2)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.2.3)
+      nanaimo (~> 0.2.4)
     xcpretty (0.2.6)
       rouge (~> 1.8)
     xcpretty-travis-formatter (1.0.0)
@@ -220,7 +222,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods (~> 1.3.1)
+  cocoapods (~> 1.5.0)
   fastlane
   jazzy
   synx

LICENSE

@@ -1,29 +1,21 @@
-BSD 3-Clause License
+MIT License
 
-Copyright (c) 2017, Luc Dion
-All rights reserved.
+Copyright (c) 2017 Luc Dion
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of the copyright holder nor the names of its
-  contributors may be used to endorse or promote products derived from
-  this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

Podfile.lock

@@ -14,9 +14,17 @@ DEPENDENCIES:
   - Reveal-SDK (~> 10)
   - SwiftLint
 
+SPEC REPOS:
+  https://github.com/CocoaPods/Specs.git:
+    - Nimble
+    - PinLayout
+    - Quick
+    - Reveal-SDK
+    - SwiftLint
+
 EXTERNAL SOURCES:
   FlexLayout:
-    :path: ./
+    :path: "./"
 
 SPEC CHECKSUMS:
   FlexLayout: f201d829cc720412fa7bbb0e548d239b01b24724
@@ -28,4 +36,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 17e434c5ea0e4a80a0221e86e99c1962e47f6a3d
 
-COCOAPODS: 1.4.0
+COCOAPODS: 1.5.0

README.md

@@ -1052,6 +1052,7 @@ The FlexLayout's Example App exposes some usage example of FlexLayout.
 <br/>
 
 ## Flexbox interesting external links
+* [Introduction to Flexbox using Yoga](https://yogalayout.com/)
 * [THE flexbox CSS reference: A Complete Guide to Flexbox](https://css-tricks.com/snippets/css/a-guide-to-flexbox/)
 * [Raywenderlich interesting Yoga tutorial](https://www.raywenderlich.com/161413/yoga-tutorial-using-cross-platform-layout-engine)
 * [An Introduction to Flexbox CSS](https://slicejack.com/introduction-to-flexbox/)