Default Swift version now correctly set to 4.2 (#56)

Addressed issue where Swift version was incorrectly set to 5.0 when it should have been 4.2.
Nike-Inc · May 2, 2019 · 67c567f · 67c567f
1 parent 901867b
commit 67c567f
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
 
 #### 5.x Releases
 
-- `5.2.x` Releases - [5.2.0](#520)
+- `5.2.x` Releases - [5.2.0](#520) | [5.2.1](#521)
 - `5.1.x` Releases - [5.1.0](#510)
 - `5.0.x` Releases - [5.0.0](#500) | [5.0.1](#501) | [5.0.2](#502)
 
@@ -43,6 +43,16 @@ All notable changes to this project will be documented in this file.
 
 ---
 
+## [5.2.1](https://github.com/Nike-Inc/Willow/releases/tag/5.2.1)
+Released on 2019-05-02. All issues associated with this milestone can be found using this
+[filter](https://github.com/Nike-Inc/Willow/milestone/14?closed=1).
+
+#### Fixed
+- Issue where Swift version was incorrectly set to 5.0 when it should have been 4.2.
+  - Fixed by [Greg Tropino](https://github.com/gtrop1) in Pull Request [#55](https://github.com/Nike-Inc/Willow/pull/55).
+
+---
+
 ## [5.2.0](https://github.com/Nike-Inc/Willow/releases/tag/5.2.0)
 
 #### Updated

diff --git a/Example/Frameworks/Database.xcodeproj/project.pbxproj b/Example/Frameworks/Database.xcodeproj/project.pbxproj
@@ -355,7 +355,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -412,7 +412,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VALIDATE_PRODUCT = YES;
@@ -438,7 +438,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.nike.Database;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -458,7 +457,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.nike.Database;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

diff --git a/Example/Frameworks/WebServices.xcodeproj/project.pbxproj b/Example/Frameworks/WebServices.xcodeproj/project.pbxproj
@@ -438,7 +438,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.nike.WebServices;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -458,7 +457,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.nike.WebServices;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

diff --git a/Example/iOS Example.xcodeproj/project.pbxproj b/Example/iOS Example.xcodeproj/project.pbxproj
@@ -361,7 +361,7 @@
 				PRODUCT_NAME = "";
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				WATCHOS_DEPLOYMENT_TARGET = 2.0;
@@ -414,7 +414,7 @@
 				PRODUCT_NAME = "";
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VALIDATE_PRODUCT = YES;
@@ -438,7 +438,6 @@
 				PRODUCT_NAME = "iOS Example";
 				PROVISIONING_PROFILE = "";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -456,7 +455,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.nike.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "iOS Example";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

diff --git a/Source/Info.plist b/Source/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.2.0</string>
+	<string>5.2.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/Willow.podspec b/Willow.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = "Willow"
-  s.version = "5.2.0"
+  s.version = "5.2.1"
   s.license = "MIT"
   s.summary = "A powerful, yet lightweight logging library written in Swift."
   s.homepage = "https://github.com/Nike-Inc/Willow"

diff --git a/Willow.xcodeproj/project.pbxproj b/Willow.xcodeproj/project.pbxproj
@@ -913,7 +913,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -970,7 +970,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				VALIDATE_PRODUCT = YES;