From 67c567faf21f578149c030bb8e740ab87d11c508 Mon Sep 17 00:00:00 2001
From: gtrop1 <50150156+gtrop1@users.noreply.github.com>
Date: Thu, 2 May 2019 13:40:22 -0700
Subject: [PATCH] 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.
---
CHANGELOG.md | 12 +++++++++++-
.../Frameworks/Database.xcodeproj/project.pbxproj | 6 ++----
.../Frameworks/WebServices.xcodeproj/project.pbxproj | 2 --
Example/iOS Example.xcodeproj/project.pbxproj | 6 ++----
Source/Info.plist | 2 +-
Willow.podspec | 2 +-
Willow.xcodeproj/project.pbxproj | 4 ++--
7 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f1a596e..2d14752 100644
--- 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
index 456144f..5a68d4b 100644
--- 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
index 2c02913..705cfa7 100644
--- 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
index 167559f..ee10ae4 100644
--- 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
index 8d3c0ff..f2af0f8 100644
--- a/Source/Info.plist
+++ b/Source/Info.plist
@@ -15,7 +15,7 @@
CFBundlePackageType
FMWK
CFBundleShortVersionString
- 5.2.0
+ 5.2.1
CFBundleSignature
????
CFBundleVersion
diff --git a/Willow.podspec b/Willow.podspec
index d433e13..0bbede5 100644
--- 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
index 1a0b599..d28459d 100644
--- 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;