Merge branch 'release/2.1.3'

Author: maximkhatskevich

Info/Fwk.plist

@@ -15,9 +15,9 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.1.2</string>
+	<string>2.1.3</string>
 	<key>CFBundleVersion</key>
-	<string>15</string>
+	<string>16</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2017 Maxim Khatskevich. All rights reserved.</string>
 	<key>NSPrincipalClass</key>

ProjectGenerator.xcodeproj/project.pbxproj

@@ -451,7 +451,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "-";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 15;
+				CURRENT_PROJECT_VERSION = 16;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -503,7 +503,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "-";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 15;
+				CURRENT_PROJECT_VERSION = 16;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;

Src/Spec/Spec.1.2.1.swift

@@ -587,9 +587,23 @@ enum Spec_1_2_1
 
             //===
 
-            result <<< processScripts(&idention, regulars: scripts.regulars)
-            result <<< processScripts(&idention, beforeBuild: scripts.beforeBuilds)
-            result <<< processScripts(&idention, afterBuild: scripts.afterBuilds)
+            if
+                !scripts.regulars.isEmpty
+            {
+                result <<< processScripts(&idention, regulars: scripts.regulars)
+            }
+            
+            if
+                !scripts.beforeBuilds.isEmpty
+            {
+                result <<< processScripts(&idention, beforeBuild: scripts.beforeBuilds)
+            }
+            
+            if
+                !scripts.afterBuilds.isEmpty
+            {
+                result <<< processScripts(&idention, afterBuild: scripts.afterBuilds)
+            }
 
             //===
 

Src/Spec/Spec.1.3.0.swift

@@ -606,9 +606,23 @@ enum Spec_1_3_0
 
             //===
 
-            result <<< processScripts(&idention, regulars: scripts.regulars)
-            result <<< processScripts(&idention, beforeBuild: scripts.beforeBuilds)
-            result <<< processScripts(&idention, afterBuild: scripts.afterBuilds)
+            if
+                !scripts.regulars.isEmpty
+            {
+                result <<< processScripts(&idention, regulars: scripts.regulars)
+            }
+            
+            if
+                !scripts.beforeBuilds.isEmpty
+            {
+                result <<< processScripts(&idention, beforeBuild: scripts.beforeBuilds)
+            }
+            
+            if
+                !scripts.afterBuilds.isEmpty
+            {
+                result <<< processScripts(&idention, afterBuild: scripts.afterBuilds)
+            }
 
             //===
 

Src/Spec/Spec.2.0.0.swift

@@ -600,9 +600,23 @@ enum Spec_2_0_0
 
             //===
 
-            result <<< processScripts(&idention, regulars: scripts.regulars)
-            result <<< processScripts(&idention, beforeBuild: scripts.beforeBuilds)
-            result <<< processScripts(&idention, afterBuild: scripts.afterBuilds)
+            if
+                !scripts.regulars.isEmpty
+            {
+                result <<< processScripts(&idention, regulars: scripts.regulars)
+            }
+            
+            if
+                !scripts.beforeBuilds.isEmpty
+            {
+                result <<< processScripts(&idention, beforeBuild: scripts.beforeBuilds)
+            }
+            
+            if
+                !scripts.afterBuilds.isEmpty
+            {
+                result <<< processScripts(&idention, afterBuild: scripts.afterBuilds)
+            }
 
             //===
 

Src/Spec/Spec.2.1.0.swift

@@ -600,9 +600,23 @@ enum Spec_2_1_0
 
             //===
 
-            result <<< processScripts(&idention, regulars: scripts.regulars)
-            result <<< processScripts(&idention, beforeBuild: scripts.beforeBuilds)
-            result <<< processScripts(&idention, afterBuild: scripts.afterBuilds)
+            if
+                !scripts.regulars.isEmpty
+            {
+                result <<< processScripts(&idention, regulars: scripts.regulars)
+            }
+            
+            if
+                !scripts.beforeBuilds.isEmpty
+            {
+                result <<< processScripts(&idention, beforeBuild: scripts.beforeBuilds)
+            }
+            
+            if
+                !scripts.afterBuilds.isEmpty
+            {
+                result <<< processScripts(&idention, afterBuild: scripts.afterBuilds)
+            }
 
             //===