From 7be35ce98b3b0ffe94b13401db2dcd7676d28a25 Mon Sep 17 00:00:00 2001
From: Nathan Kellert <nathankellert@gmail.com>
Date: Mon, 13 Apr 2020 10:03:05 -0500
Subject: [PATCH 01/14] Updating all Swift versions to say 5.0. Updating all
 Builds to say 1.18.0.

---
 CHANGELOG.md                                  | 15 ++++++++
 .../ParseUnitTests-iOS.xcconfig               |  2 +-
 .../ParseUnitTests-macOS.xcconfig             |  2 +-
 Parse/Parse.xcodeproj/project.pbxproj         | 38 +++++++++++++++++--
 Parse/Parse/PFConstants.h                     |  2 +-
 Parse/Parse/Resources/Parse-OSX.Info.plist    |  4 +-
 Parse/Parse/Resources/Parse-iOS.Info.plist    |  4 +-
 Parse/Parse/Resources/Parse-tvOS.Info.plist   |  4 +-
 .../Parse/Resources/Parse-watchOS.Info.plist  |  4 +-
 .../project.pbxproj                           |  6 +++
 ParseFacebookUtils/Resources/Info-iOS.plist   |  4 +-
 ParseFacebookUtils/Resources/Info-tvOS.plist  |  4 +-
 .../project.pbxproj                           |  4 +-
 .../Resources/Info.plist                      |  4 +-
 .../Resources/Info.plist                      |  4 +-
 .../project.pbxproj                           |  8 ++--
 .../Resources/Info.plist                      |  4 +-
 .../project.pbxproj                           |  4 +-
 .../ParseStarterProject/Resources/Info.plist  |  4 +-
 .../project.pbxproj                           |  4 +-
 .../ParseStarter/Info.plist                   |  4 +-
 .../ParseStarter Extension/Info.plist         |  4 +-
 .../project.pbxproj                           | 12 +++---
 .../ParseStarter/Info.plist                   |  4 +-
 .../Resources/Info.plist                      |  4 +-
 .../ParseTwitterTestApplication.entitlements  | 10 +++++
 .../project.pbxproj                           | 16 ++++++++
 ParseTwitterUtils/Resources/Info.plist        |  4 +-
 ParseUI/ParseUI.xcodeproj/project.pbxproj     | 28 +++++++++-----
 ParseUI/Resources/Info.plist                  |  6 +--
 30 files changed, 151 insertions(+), 66 deletions(-)
 create mode 100644 ParseTwitterUtils/ParseTwitterTestApplication.entitlements

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0931fc327..55a50c3c7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,21 @@
 [Full Changelog](https://github.com/parse-community/Parse-SDK-iOS-OSX/compare/1.17.3...master)
 * _Contributing to this repo? Add info about your change here to be included in next release_
 
+### 1.18.0
+[Full Changelog](https://github.com/parse-community/Parse-SDK-iOS-OSX/compare/1.17.2...1.17.3)
+
+- FIX: Removed using NSURLCache in Catalyst. @toto @mman 
+- NEW: Add get and set server functions. @mtrezza 
+- NEW: Parse is now compatible with Swift 5. @noobs2ninjas 
+- NEW: Updated project build targets to work with Catalyst. @noobs2ninjas 
+- NEW: Parse as well as its dependencies are now compatible with macOS 10.15. @mman 
+- FIX: Unit testing and nightly builds.
+- FIX: ParseUI minimum api version should be iOS 8.0. Project settings and info.plist updated to reflect to fix Carthage builds. 
+@noobs2ninjas, @drdaz, and @acinader did some hard work to not only update build environments to use Xcode 11 but also made necessary changes to get nightly builds to work on both Travis and CircleCI. This will allow us to resume more consistent updates again. 
+ 
+NEWS: After getting on contact with BoltsFramework maintainers at Facebook they have allowed us to get changes in to fix app store declines due to  
+
+
 ### 1.17.3
 [Full Changelog](https://github.com/parse-community/Parse-SDK-iOS-OSX/compare/1.17.2...1.17.3)
 
diff --git a/Parse/Configurations/ParseUnitTests-iOS.xcconfig b/Parse/Configurations/ParseUnitTests-iOS.xcconfig
index 2578bfac2..cb31d01d2 100644
--- a/Parse/Configurations/ParseUnitTests-iOS.xcconfig
+++ b/Parse/Configurations/ParseUnitTests-iOS.xcconfig
@@ -14,7 +14,7 @@ PRODUCT_NAME = ParseUnitTests-iOS
 PRODUCT_MODULE_NAME = ParseUnitTests
 PRODUCT_BUNDLE_IDENTIFIER = com.parse.unit.ios
 
-SWIFT_VERSION = 3.0
+SWIFT_VERSION = 5.0
 
 IPHONEOS_DEPLOYMENT_TARGET = 8.0
 
diff --git a/Parse/Configurations/ParseUnitTests-macOS.xcconfig b/Parse/Configurations/ParseUnitTests-macOS.xcconfig
index a79886a59..b697b1027 100644
--- a/Parse/Configurations/ParseUnitTests-macOS.xcconfig
+++ b/Parse/Configurations/ParseUnitTests-macOS.xcconfig
@@ -14,7 +14,7 @@ PRODUCT_NAME = ParseUnitTests-macOS
 PRODUCT_MODULE_NAME = ParseUnitTests
 PRODUCT_BUNDLE_IDENTIFIER = com.parse.unit.macOS
 
-SWIFT_VERSION = 3.0
+SWIFT_VERSION = 5.0
 
 INFOPLIST_FILE = $(SRCROOT)/Tests/Resources/ParseUnitTests-OSX-Info.plist
 
diff --git a/Parse/Parse.xcodeproj/project.pbxproj b/Parse/Parse.xcodeproj/project.pbxproj
index e535cea28..d41caf51d 100644
--- a/Parse/Parse.xcodeproj/project.pbxproj
+++ b/Parse/Parse.xcodeproj/project.pbxproj
@@ -8830,7 +8830,8 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 810154FE1BB382F800D7C7BD /* Parse-watchOS.xcconfig */;
 			buildSettings = {
-				SWIFT_VERSION = 3.0;
+				CURRENT_PROJECT_VERSION = 1.18.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -8838,7 +8839,8 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 810154FE1BB382F800D7C7BD /* Parse-watchOS.xcconfig */;
 			buildSettings = {
-				SWIFT_VERSION = 3.0;
+				CURRENT_PROJECT_VERSION = 1.18.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -8846,6 +8848,8 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 815F24171BD04D310054659F /* Parse-tvOS.xcconfig */;
 			buildSettings = {
+				CURRENT_PROJECT_VERSION = 1.18.0;
+				MARKETING_VERSION = 1.18.0;
 			};
 			name = Debug;
 		};
@@ -8853,6 +8857,8 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 815F24171BD04D310054659F /* Parse-tvOS.xcconfig */;
 			buildSettings = {
+				CURRENT_PROJECT_VERSION = 1.18.0;
+				MARKETING_VERSION = 1.18.0;
 			};
 			name = Release;
 		};
@@ -8903,6 +8909,7 @@
 			baseConfigurationReference = F55ABB531B4F39DA00A0ECD5 /* Parse-iOS.xcconfig */;
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
+				CURRENT_PROJECT_VERSION = 1.18.0;
 				DEFINES_MODULE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -8910,8 +8917,10 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
+				MARKETING_VERSION = 1.18.0;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
 		};
@@ -8920,6 +8929,7 @@
 			baseConfigurationReference = F55ABB531B4F39DA00A0ECD5 /* Parse-iOS.xcconfig */;
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
+				CURRENT_PROJECT_VERSION = 1.18.0;
 				DEFINES_MODULE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -8927,7 +8937,9 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				SWIFT_VERSION = 3.0;
+				MARKETING_VERSION = 1.18.0;
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
 		};
@@ -8936,6 +8948,10 @@
 			baseConfigurationReference = 81C582DE1C3B0A40000063C6 /* Parse-iOS-Dynamic.xcconfig */;
 			buildSettings = {
 				CLANG_MODULES_AUTOLINK = YES;
+				CURRENT_PROJECT_VERSION = 1.18.0;
+				MARKETING_VERSION = 1.18.0;
+				SUPPORTS_MACCATALYST = NO;
+				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Debug;
 		};
@@ -8944,6 +8960,10 @@
 			baseConfigurationReference = 81C582DE1C3B0A40000063C6 /* Parse-iOS-Dynamic.xcconfig */;
 			buildSettings = {
 				CLANG_MODULES_AUTOLINK = YES;
+				CURRENT_PROJECT_VERSION = 1.18.0;
+				MARKETING_VERSION = 1.18.0;
+				SUPPORTS_MACCATALYST = NO;
+				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Release;
 		};
@@ -8952,6 +8972,8 @@
 			baseConfigurationReference = 81C582DF1C3B0A40000063C6 /* Parse-tvOS-Dynamic.xcconfig */;
 			buildSettings = {
 				CLANG_MODULES_AUTOLINK = YES;
+				CURRENT_PROJECT_VERSION = 1.18.0;
+				MARKETING_VERSION = 1.18.0;
 			};
 			name = Debug;
 		};
@@ -8960,6 +8982,8 @@
 			baseConfigurationReference = 81C582DF1C3B0A40000063C6 /* Parse-tvOS-Dynamic.xcconfig */;
 			buildSettings = {
 				CLANG_MODULES_AUTOLINK = YES;
+				CURRENT_PROJECT_VERSION = 1.18.0;
+				MARKETING_VERSION = 1.18.0;
 			};
 			name = Release;
 		};
@@ -8968,6 +8992,7 @@
 			baseConfigurationReference = 81C582E01C3B0A40000063C6 /* Parse-watchOS-Dynamic.xcconfig */;
 			buildSettings = {
 				CLANG_MODULES_AUTOLINK = YES;
+				CURRENT_PROJECT_VERSION = 1.18.0;
 			};
 			name = Debug;
 		};
@@ -8976,6 +9001,7 @@
 			baseConfigurationReference = 81C582E01C3B0A40000063C6 /* Parse-watchOS-Dynamic.xcconfig */;
 			buildSettings = {
 				CLANG_MODULES_AUTOLINK = YES;
+				CURRENT_PROJECT_VERSION = 1.18.0;
 			};
 			name = Release;
 		};
@@ -8983,7 +9009,9 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = F55ABB541B4F39DA00A0ECD5 /* Parse-macOS.xcconfig */;
 			buildSettings = {
+				CURRENT_PROJECT_VERSION = 1.18.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
+				MARKETING_VERSION = 1.18.0;
 			};
 			name = Debug;
 		};
@@ -8991,7 +9019,9 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = F55ABB541B4F39DA00A0ECD5 /* Parse-macOS.xcconfig */;
 			buildSettings = {
+				CURRENT_PROJECT_VERSION = 1.18.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
+				MARKETING_VERSION = 1.18.0;
 			};
 			name = Release;
 		};
diff --git a/Parse/Parse/PFConstants.h b/Parse/Parse/PFConstants.h
index d6b4b8964..428cf39c5 100644
--- a/Parse/Parse/PFConstants.h
+++ b/Parse/Parse/PFConstants.h
@@ -13,7 +13,7 @@
 #pragma mark - SDK Version
 ///--------------------------------------
 
-#define PARSE_VERSION @"1.17.3"
+#define PARSE_VERSION @"1.18.0"
 
 ///--------------------------------------
 #pragma mark - Platform
diff --git a/Parse/Parse/Resources/Parse-OSX.Info.plist b/Parse/Parse/Resources/Parse-OSX.Info.plist
index 5ee87e26b..3aa1e4c57 100644
--- a/Parse/Parse/Resources/Parse-OSX.Info.plist
+++ b/Parse/Parse/Resources/Parse-OSX.Info.plist
@@ -13,10 +13,10 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.17.3</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.17.3</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 </dict>
 </plist>
diff --git a/Parse/Parse/Resources/Parse-iOS.Info.plist b/Parse/Parse/Resources/Parse-iOS.Info.plist
index cb32a8f56..3e302423b 100644
--- a/Parse/Parse/Resources/Parse-iOS.Info.plist
+++ b/Parse/Parse/Resources/Parse-iOS.Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.17.3</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleSupportedPlatforms</key>
@@ -22,7 +22,7 @@
 		<string>iPhoneOS</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.17.3</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>MinimumOSVersion</key>
 	<string>8.0</string>
 </dict>
diff --git a/Parse/Parse/Resources/Parse-tvOS.Info.plist b/Parse/Parse/Resources/Parse-tvOS.Info.plist
index c90a388f4..ca23c84f4 100644
--- a/Parse/Parse/Resources/Parse-tvOS.Info.plist
+++ b/Parse/Parse/Resources/Parse-tvOS.Info.plist
@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.17.3</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.17.3</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>
diff --git a/Parse/Parse/Resources/Parse-watchOS.Info.plist b/Parse/Parse/Resources/Parse-watchOS.Info.plist
index c90a388f4..45ff487c9 100644
--- a/Parse/Parse/Resources/Parse-watchOS.Info.plist
+++ b/Parse/Parse/Resources/Parse-watchOS.Info.plist
@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.17.3</string>
+	<string>1.18.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.17.3</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>
diff --git a/ParseFacebookUtils/ParseFacebookUtils.xcodeproj/project.pbxproj b/ParseFacebookUtils/ParseFacebookUtils.xcodeproj/project.pbxproj
index bc30d8605..c5b89d97b 100644
--- a/ParseFacebookUtils/ParseFacebookUtils.xcodeproj/project.pbxproj
+++ b/ParseFacebookUtils/ParseFacebookUtils.xcodeproj/project.pbxproj
@@ -1134,6 +1134,7 @@
 					"$(PROJECT_DIR)/Vendor",
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
 		};
@@ -1146,6 +1147,7 @@
 					"$(PROJECT_DIR)/Vendor",
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
 		};
@@ -1191,6 +1193,8 @@
 					"$(PROJECT_DIR)/Vendor",
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				SUPPORTS_MACCATALYST = NO;
+				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Debug;
 		};
@@ -1204,6 +1208,8 @@
 					"$(PROJECT_DIR)/Vendor",
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				SUPPORTS_MACCATALYST = NO;
+				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Release;
 		};
diff --git a/ParseFacebookUtils/Resources/Info-iOS.plist b/ParseFacebookUtils/Resources/Info-iOS.plist
index 9b7d7c096..5f98dc57f 100644
--- a/ParseFacebookUtils/Resources/Info-iOS.plist
+++ b/ParseFacebookUtils/Resources/Info-iOS.plist
@@ -13,7 +13,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.17.3</string>
+	<string>1.18.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleSupportedPlatforms</key>
@@ -22,7 +22,7 @@
 		<string>iPhoneOS</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.17.3</string>
+	<string>1.18.0</string>
 	<key>MinimumOSVersion</key>
 	<string>6.0</string>
 </dict>
diff --git a/ParseFacebookUtils/Resources/Info-tvOS.plist b/ParseFacebookUtils/Resources/Info-tvOS.plist
index 887eeb413..a1fa0c4c7 100644
--- a/ParseFacebookUtils/Resources/Info-tvOS.plist
+++ b/ParseFacebookUtils/Resources/Info-tvOS.plist
@@ -13,10 +13,10 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.17.3</string>
+	<string>1.18.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.17.3</string>
+	<string>1.18.0</string>
 </dict>
 </plist>
diff --git a/ParseStarterProject/OSX/ParseOSXStarterProject-Swift/ParseOSXStarterProject-Swift.xcodeproj/project.pbxproj b/ParseStarterProject/OSX/ParseOSXStarterProject-Swift/ParseOSXStarterProject-Swift.xcodeproj/project.pbxproj
index c99e16c67..bdfc8b4a7 100644
--- a/ParseStarterProject/OSX/ParseOSXStarterProject-Swift/ParseOSXStarterProject-Swift.xcodeproj/project.pbxproj
+++ b/ParseStarterProject/OSX/ParseOSXStarterProject-Swift/ParseOSXStarterProject-Swift.xcodeproj/project.pbxproj
@@ -369,7 +369,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.parse.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "ParseOSXStarterProject-Swift";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -387,7 +387,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.parse.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "ParseOSXStarterProject-Swift";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
diff --git a/ParseStarterProject/OSX/ParseOSXStarterProject-Swift/Resources/Info.plist b/ParseStarterProject/OSX/ParseOSXStarterProject-Swift/Resources/Info.plist
index 9e974c032..545990df0 100644
--- a/ParseStarterProject/OSX/ParseOSXStarterProject-Swift/Resources/Info.plist
+++ b/ParseStarterProject/OSX/ParseOSXStarterProject-Swift/Resources/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.17.3</string>
+	<string>1.18.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.17.3</string>
+	<string>1.18.0</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSMainNibFile</key>
diff --git a/ParseStarterProject/OSX/ParseOSXStarterProject/Resources/Info.plist b/ParseStarterProject/OSX/ParseOSXStarterProject/Resources/Info.plist
index 7964628ec..6e1b6f712 100644
--- a/ParseStarterProject/OSX/ParseOSXStarterProject/Resources/Info.plist
+++ b/ParseStarterProject/OSX/ParseOSXStarterProject/Resources/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.17.3</string>
+	<string>1.18.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.17.3</string>
+	<string>1.18.0</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>NSMainNibFile</key>
diff --git a/ParseStarterProject/iOS/ParseStarterProject-Swift/ParseStarterProject-Swift.xcodeproj/project.pbxproj b/ParseStarterProject/iOS/ParseStarterProject-Swift/ParseStarterProject-Swift.xcodeproj/project.pbxproj
index 82cc87374..fb549d1a4 100644
--- a/ParseStarterProject/iOS/ParseStarterProject-Swift/ParseStarterProject-Swift.xcodeproj/project.pbxproj
+++ b/ParseStarterProject/iOS/ParseStarterProject-Swift/ParseStarterProject-Swift.xcodeproj/project.pbxproj
@@ -262,7 +262,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -270,7 +270,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -390,7 +390,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.parse.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "ParseStarterProject-Swift";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -407,7 +407,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.parse.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "ParseStarterProject-Swift";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
diff --git a/ParseStarterProject/iOS/ParseStarterProject-Swift/Resources/Info.plist b/ParseStarterProject/iOS/ParseStarterProject-Swift/Resources/Info.plist
index 1db1737c3..1b3808ff0 100644
--- a/ParseStarterProject/iOS/ParseStarterProject-Swift/Resources/Info.plist
+++ b/ParseStarterProject/iOS/ParseStarterProject-Swift/Resources/Info.plist
@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.17.3</string>
+	<string>1.18.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.17.3</string>
+	<string>1.18.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>
diff --git a/ParseStarterProject/iOS/ParseStarterProject/ParseStarterProject.xcodeproj/project.pbxproj b/ParseStarterProject/iOS/ParseStarterProject/ParseStarterProject.xcodeproj/project.pbxproj
index cabe9e593..b8cbd1420 100644
--- a/ParseStarterProject/iOS/ParseStarterProject/ParseStarterProject.xcodeproj/project.pbxproj
+++ b/ParseStarterProject/iOS/ParseStarterProject/ParseStarterProject.xcodeproj/project.pbxproj
@@ -428,7 +428,7 @@
 				INFOPLIST_FILE = Resources/Info.plist;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.parse.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 				WRAPPER_EXTENSION = app;
 			};
 			name = Debug;
@@ -447,7 +447,7 @@
 				INFOPLIST_FILE = Resources/Info.plist;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.parse.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 				VALIDATE_PRODUCT = YES;
 				WRAPPER_EXTENSION = app;
 			};
diff --git a/ParseStarterProject/iOS/ParseStarterProject/Resources/Info.plist b/ParseStarterProject/iOS/ParseStarterProject/Resources/Info.plist
index 7fd5ac127..23e1fd17e 100644
--- a/ParseStarterProject/iOS/ParseStarterProject/Resources/Info.plist
+++ b/ParseStarterProject/iOS/ParseStarterProject/Resources/Info.plist
@@ -19,11 +19,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.17.3</string>
+	<string>1.18.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.17.3</string>
+	<string>1.18.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSMainNibFile</key>
diff --git a/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.pbxproj b/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.pbxproj
index 7622f4c6a..182f5d5fa 100644
--- a/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.pbxproj
+++ b/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.pbxproj
@@ -364,7 +364,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.parse.starter;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
@@ -385,7 +385,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.parse.starter;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
diff --git a/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter/Info.plist b/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter/Info.plist
index a516fa9dd..7d2a8e852 100644
--- a/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter/Info.plist
+++ b/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter/Info.plist
@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.17.3</string>
+	<string>1.18.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.17.3</string>
+	<string>1.18.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIMainStoryboardFile</key>
diff --git a/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter Extension/Info.plist b/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter Extension/Info.plist
index 08cd56987..6700f65ea 100644
--- a/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter Extension/Info.plist	
+++ b/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter Extension/Info.plist	
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.17.3</string>
+	<string>1.18.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.17.3</string>
+	<string>1.18.0</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>
diff --git a/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.pbxproj b/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.pbxproj
index 6041abeb6..fb09f4480 100644
--- a/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.pbxproj
+++ b/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter-Swift.xcodeproj/project.pbxproj
@@ -473,7 +473,7 @@
 				PRODUCT_NAME = "${TARGET_NAME}";
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 4;
 				WATCHOS_DEPLOYMENT_TARGET = 2.0;
 			};
@@ -496,7 +496,7 @@
 				PRODUCT_NAME = "${TARGET_NAME}";
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 4;
 				WATCHOS_DEPLOYMENT_TARGET = 2.0;
 			};
@@ -516,7 +516,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 4;
 				WATCHOS_DEPLOYMENT_TARGET = 2.0;
 			};
@@ -536,7 +536,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 4;
 				WATCHOS_DEPLOYMENT_TARGET = 2.0;
 			};
@@ -546,7 +546,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -554,7 +554,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
diff --git a/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter/Info.plist b/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter/Info.plist
index d6dddf7b2..60c509479 100644
--- a/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter/Info.plist
+++ b/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.17.3</string>
+	<string>1.18.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.17.3</string>
+	<string>1.18.0</string>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
diff --git a/ParseStarterProject/watchOS/ParseStarterProject-Swift/Resources/Info.plist b/ParseStarterProject/watchOS/ParseStarterProject-Swift/Resources/Info.plist
index e660298a9..5a8698fff 100644
--- a/ParseStarterProject/watchOS/ParseStarterProject-Swift/Resources/Info.plist
+++ b/ParseStarterProject/watchOS/ParseStarterProject-Swift/Resources/Info.plist
@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.17.3</string>
+	<string>1.18.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.17.3</string>
+	<string>1.18.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIMainStoryboardFile</key>
diff --git a/ParseTwitterUtils/ParseTwitterTestApplication.entitlements b/ParseTwitterUtils/ParseTwitterTestApplication.entitlements
new file mode 100644
index 000000000..ee95ab7e5
--- /dev/null
+++ b/ParseTwitterUtils/ParseTwitterTestApplication.entitlements
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.security.app-sandbox</key>
+	<true/>
+	<key>com.apple.security.network.client</key>
+	<true/>
+</dict>
+</plist>
diff --git a/ParseTwitterUtils/ParseTwitterUtils.xcodeproj/project.pbxproj b/ParseTwitterUtils/ParseTwitterUtils.xcodeproj/project.pbxproj
index f3aa71096..5cc5d00fb 100644
--- a/ParseTwitterUtils/ParseTwitterUtils.xcodeproj/project.pbxproj
+++ b/ParseTwitterUtils/ParseTwitterUtils.xcodeproj/project.pbxproj
@@ -226,6 +226,7 @@
 		81ECACD71D1E14E000FA7673 /* ParseTwitterUtils.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ParseTwitterUtils.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		81ECACD91D1E14F300FA7673 /* ParseTwitterUtils-iOS-Dynamic.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "ParseTwitterUtils-iOS-Dynamic.xcconfig"; sourceTree = "<group>"; };
 		B9783172240D14A50049C02B /* OCMock.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = OCMock.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		B99F4FFE2444B5B00061A6F5 /* ParseTwitterTestApplication.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = ParseTwitterTestApplication.entitlements; sourceTree = "<group>"; };
 		B9A7EEC123C49D94003E606E /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
 		D2AAC07E0554694100DB518D /* ParseTwitterUtils.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ParseTwitterUtils.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		F51535531B57453700C49F56 /* ParseTwitterUtils-iOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "ParseTwitterUtils-iOS.xcconfig"; sourceTree = "<group>"; };
@@ -286,6 +287,7 @@
 		0867D691FE84028FC02AAC07 /* Breakpad */ = {
 			isa = PBXGroup;
 			children = (
+				B99F4FFE2444B5B00061A6F5 /* ParseTwitterTestApplication.entitlements */,
 				F51535381B57451200C49F56 /* Configurations */,
 				8135E48C1B4B6A0E0092F452 /* ParseTwitterUtils */,
 				813DFC961AB2524C00F25A08 /* Resources */,
@@ -939,6 +941,8 @@
 			baseConfigurationReference = F51535531B57453700C49F56 /* ParseTwitterUtils-iOS.xcconfig */;
 			buildSettings = {
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				SUPPORTS_MACCATALYST = YES;
+				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
 		};
@@ -947,6 +951,8 @@
 			baseConfigurationReference = F51535531B57453700C49F56 /* ParseTwitterUtils-iOS.xcconfig */;
 			buildSettings = {
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				SUPPORTS_MACCATALYST = YES;
+				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
 		};
@@ -988,6 +994,9 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = F51535551B57455200C49F56 /* ParseTwitterTestApplication.xcconfig */;
 			buildSettings = {
+				CODE_SIGN_ENTITLEMENTS = ParseTwitterTestApplication.entitlements;
+				SUPPORTS_MACCATALYST = NO;
+				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
 		};
@@ -995,6 +1004,9 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = F51535551B57455200C49F56 /* ParseTwitterTestApplication.xcconfig */;
 			buildSettings = {
+				CODE_SIGN_ENTITLEMENTS = ParseTwitterTestApplication.entitlements;
+				SUPPORTS_MACCATALYST = NO;
+				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
 		};
@@ -1019,6 +1031,8 @@
 			baseConfigurationReference = 81ECACD91D1E14F300FA7673 /* ParseTwitterUtils-iOS-Dynamic.xcconfig */;
 			buildSettings = {
 				CLANG_MODULES_AUTOLINK = YES;
+				SUPPORTS_MACCATALYST = NO;
+				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Debug;
 		};
@@ -1027,6 +1041,8 @@
 			baseConfigurationReference = 81ECACD91D1E14F300FA7673 /* ParseTwitterUtils-iOS-Dynamic.xcconfig */;
 			buildSettings = {
 				CLANG_MODULES_AUTOLINK = YES;
+				SUPPORTS_MACCATALYST = NO;
+				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Release;
 		};
diff --git a/ParseTwitterUtils/Resources/Info.plist b/ParseTwitterUtils/Resources/Info.plist
index badd7ea3c..6903de5ad 100644
--- a/ParseTwitterUtils/Resources/Info.plist
+++ b/ParseTwitterUtils/Resources/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.17.3</string>
+	<string>1.18.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleSupportedPlatforms</key>
@@ -22,7 +22,7 @@
 		<string>iPhoneOS</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.17.3</string>
+	<string>1.18.0</string>
 	<key>MinimumOSVersion</key>
 	<string>6.0</string>
 </dict>
diff --git a/ParseUI/ParseUI.xcodeproj/project.pbxproj b/ParseUI/ParseUI.xcodeproj/project.pbxproj
index 6040d1157..5b4522ded 100644
--- a/ParseUI/ParseUI.xcodeproj/project.pbxproj
+++ b/ParseUI/ParseUI.xcodeproj/project.pbxproj
@@ -2011,7 +2011,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 1.18.0;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -2033,9 +2033,11 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MARKETING_VERSION = 1.18.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				SKIP_INSTALL = YES;
-				TARGETED_DEVICE_FAMILY = "1,2";
+				SUPPORTS_MACCATALYST = NO;
+				TARGETED_DEVICE_FAMILY = 1;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -2076,7 +2078,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 1.18.0;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -2093,9 +2095,11 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MARKETING_VERSION = 1.18.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SKIP_INSTALL = YES;
-				TARGETED_DEVICE_FAMILY = "1,2";
+				SUPPORTS_MACCATALYST = NO;
+				TARGETED_DEVICE_FAMILY = 1;
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -2136,7 +2140,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 1.18.0;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -2162,8 +2166,10 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MARKETING_VERSION = 1.18.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				SKIP_INSTALL = YES;
+				SUPPORTS_MACCATALYST = YES;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -2204,7 +2210,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 1.18.0;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -2225,8 +2231,10 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MARKETING_VERSION = 1.18.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SKIP_INSTALL = YES;
+				SUPPORTS_MACCATALYST = YES;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -2269,13 +2277,13 @@
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = ParseUIDemo/Other/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.parse.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = ParseUIDemo;
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -2309,12 +2317,12 @@
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = ParseUIDemo/Other/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.parse.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = ParseUIDemo;
 				SWIFT_INSTALL_OBJC_HEADER = NO;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 			};
diff --git a/ParseUI/Resources/Info.plist b/ParseUI/Resources/Info.plist
index f6245e6c0..3f9b0151f 100644
--- a/ParseUI/Resources/Info.plist
+++ b/ParseUI/Resources/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.17.3</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleSupportedPlatforms</key>
@@ -22,8 +22,8 @@
 		<string>iPhoneOS</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.17.3</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>MinimumOSVersion</key>
-	<string>7.0</string>
+	<string>8.0</string>
 </dict>
 </plist>

From 2274d3ea101ebd2f727c2187cc6f2d9b06da3825 Mon Sep 17 00:00:00 2001
From: Nathan Kellert <nathankellert@gmail.com>
Date: Mon, 13 Apr 2020 10:36:21 -0500
Subject: [PATCH 02/14] Finishing Changelog.

---
 CHANGELOG.md | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 55a50c3c7..8e1e72eb1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,18 +5,24 @@
 * _Contributing to this repo? Add info about your change here to be included in next release_
 
 ### 1.18.0
-[Full Changelog](https://github.com/parse-community/Parse-SDK-iOS-OSX/compare/1.17.2...1.17.3)
+[Full Changelog](https://github.com/parse-community/Parse-SDK-iOS-OSX/compare/1.17.3...1.18.0)
+
+- FIX: Removed using NSURLCache in Catalyst. ([#1469](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1489)),  thanks to [Thomas Kollbach](https://github.com/toto) and [Martin Man](https://github.com/mman)
+- NEW: Add get and set server functions thanks to [Manuel Trezza](https://github.com/mtrezza)
+- NEW: Parse is now compatible with Swift 5 thanks to [Nathan Kellert](https://github.com/noobs2ninjas)
+- FIX: Updated project build targets to work with Catalyst. thanks to [Nathan Kellert](https://github.com/noobs2ninjas)
+- NEW: Parse as well as its dependencies are now compatible with macOS 10.15 thanks to [Martin Man](https://github.com/mman)
+- FIX: ParseUI minimum api version should be iOS 8.0. Project settings and info.plist updated to reflect to fix Carthage builds. Thanks to [Nathan Kellert](https://github.com/noobs2ninjas)
+
+([Nathan Kellert](https://github.com/noobs2ninjas)) and ([Darren Black](https://github.com/drdaz)) did some hard work to not only update build environments to use Xcode 11 but also made necessary changes to get nightly builds to work on both Travis and CircleCI. This will allow us to resume more consistent updates again. ([Arthur Cinader](https://github.com/acinader)) helped with Travis release build fixes.
 
-- FIX: Removed using NSURLCache in Catalyst. @toto @mman 
-- NEW: Add get and set server functions. @mtrezza 
-- NEW: Parse is now compatible with Swift 5. @noobs2ninjas 
-- NEW: Updated project build targets to work with Catalyst. @noobs2ninjas 
-- NEW: Parse as well as its dependencies are now compatible with macOS 10.15. @mman 
-- FIX: Unit testing and nightly builds.
-- FIX: ParseUI minimum api version should be iOS 8.0. Project settings and info.plist updated to reflect to fix Carthage builds. 
-@noobs2ninjas, @drdaz, and @acinader did some hard work to not only update build environments to use Xcode 11 but also made necessary changes to get nightly builds to work on both Travis and CircleCI. This will allow us to resume more consistent updates again. 
+ - Fixing Circle Nightly Build and adding extra PR Testing
+ - Fixed tvOS builds. ([#1489](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1489))
+ - Added OCMock manually to CircleCI Build ([#1490](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1490))
+ - Updated Travis and CircleCI build environments ([#1473](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1473))
  
-NEWS: After getting on contact with BoltsFramework maintainers at Facebook they have allowed us to get changes in to fix app store declines due to  
+ #### Notice
+ After getting in contact with BoltsFramework maintainers from Facebook they have allowed us to get changes in to fix app store declines due to still using UIWebView(iOS only) rather than updating to WKWebView(iOS, macOS, and iPad OS compatible). Those that got declined should be able to re-submit after updating to the latest version of parse as well as its dependencies. 
 
 
 ### 1.17.3

From 1ac845e95d988569504a794cad103b0b59b784b9 Mon Sep 17 00:00:00 2001
From: Tom Fox <13188249+TomWFox@users.noreply.github.com>
Date: Mon, 13 Apr 2020 17:08:04 +0100
Subject: [PATCH 03/14] remove unnecessary brackets

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8e1e72eb1..241c5362c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,7 +14,7 @@
 - NEW: Parse as well as its dependencies are now compatible with macOS 10.15 thanks to [Martin Man](https://github.com/mman)
 - FIX: ParseUI minimum api version should be iOS 8.0. Project settings and info.plist updated to reflect to fix Carthage builds. Thanks to [Nathan Kellert](https://github.com/noobs2ninjas)
 
-([Nathan Kellert](https://github.com/noobs2ninjas)) and ([Darren Black](https://github.com/drdaz)) did some hard work to not only update build environments to use Xcode 11 but also made necessary changes to get nightly builds to work on both Travis and CircleCI. This will allow us to resume more consistent updates again. ([Arthur Cinader](https://github.com/acinader)) helped with Travis release build fixes.
+[Nathan Kellert](https://github.com/noobs2ninjas) and [Darren Black](https://github.com/drdaz) did some hard work to not only update build environments to use Xcode 11 but also made necessary changes to get nightly builds to work on both Travis and CircleCI. This will allow us to resume more consistent updates again. ([Arthur Cinader](https://github.com/acinader)) helped with Travis release build fixes.
 
  - Fixing Circle Nightly Build and adding extra PR Testing
  - Fixed tvOS builds. ([#1489](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1489))

From 4ac7b145c9821c1e039af046bb9ed416a37c3047 Mon Sep 17 00:00:00 2001
From: Tom Fox <13188249+TomWFox@users.noreply.github.com>
Date: Mon, 13 Apr 2020 17:09:00 +0100
Subject: [PATCH 04/14] fix master full changelog diff

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 241c5362c..188462238 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 # Parse-SDK-iOS-OSX Changelog
 
 ### master
-[Full Changelog](https://github.com/parse-community/Parse-SDK-iOS-OSX/compare/1.17.3...master)
+[Full Changelog](https://github.com/parse-community/Parse-SDK-iOS-OSX/compare/1.18.0...master)
 * _Contributing to this repo? Add info about your change here to be included in next release_
 
 ### 1.18.0

From 7caffc52f23f55802b203295eff33bc02fb352f4 Mon Sep 17 00:00:00 2001
From: Tom Fox <13188249+TomWFox@users.noreply.github.com>
Date: Mon, 13 Apr 2020 17:17:22 +0100
Subject: [PATCH 05/14] add links, constant formatting

---
 CHANGELOG.md | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 188462238..840d99704 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,22 +7,22 @@
 ### 1.18.0
 [Full Changelog](https://github.com/parse-community/Parse-SDK-iOS-OSX/compare/1.17.3...1.18.0)
 
-- FIX: Removed using NSURLCache in Catalyst. ([#1469](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1489)),  thanks to [Thomas Kollbach](https://github.com/toto) and [Martin Man](https://github.com/mman)
-- NEW: Add get and set server functions thanks to [Manuel Trezza](https://github.com/mtrezza)
-- NEW: Parse is now compatible with Swift 5 thanks to [Nathan Kellert](https://github.com/noobs2ninjas)
-- FIX: Updated project build targets to work with Catalyst. thanks to [Nathan Kellert](https://github.com/noobs2ninjas)
-- NEW: Parse as well as its dependencies are now compatible with macOS 10.15 thanks to [Martin Man](https://github.com/mman)
-- FIX: ParseUI minimum api version should be iOS 8.0. Project settings and info.plist updated to reflect to fix Carthage builds. Thanks to [Nathan Kellert](https://github.com/noobs2ninjas)
+- FIX: Removed using NSURLCache in Catalyst ([#1469](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1489)),  thanks to [Thomas Kollbach](https://github.com/toto) and [Martin Man](https://github.com/mman).
+- NEW: Add get and set server functions ([#1464](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1464)), thanks to [Manuel Trezza](https://github.com/mtrezza).
+- NEW: Swift 5 compatibility, thanks to [Nathan Kellert](https://github.com/noobs2ninjas).
+- FIX: Updated project build targets to work with Catalyst, thanks to [Nathan Kellert](https://github.com/noobs2ninjas).
+- NEW: Parse as well as its dependencies are now compatible with macOS 10.15 thanks to [Martin Man](https://github.com/mman).
+- FIX: ParseUI minimum api version should be iOS 8.0. Project settings and info.plist updated to reflect to fix Carthage builds. Thanks to [Nathan Kellert](https://github.com/noobs2ninjas).
 
 [Nathan Kellert](https://github.com/noobs2ninjas) and [Darren Black](https://github.com/drdaz) did some hard work to not only update build environments to use Xcode 11 but also made necessary changes to get nightly builds to work on both Travis and CircleCI. This will allow us to resume more consistent updates again. ([Arthur Cinader](https://github.com/acinader)) helped with Travis release build fixes.
 
- - Fixing Circle Nightly Build and adding extra PR Testing
+ - Fixing CircleCI Nightly Build and adding extra PR Testing ([#1490](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1490))
  - Fixed tvOS builds. ([#1489](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1489))
  - Added OCMock manually to CircleCI Build ([#1490](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1490))
  - Updated Travis and CircleCI build environments ([#1473](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1473))
  
  #### Notice
- After getting in contact with BoltsFramework maintainers from Facebook they have allowed us to get changes in to fix app store declines due to still using UIWebView(iOS only) rather than updating to WKWebView(iOS, macOS, and iPad OS compatible). Those that got declined should be able to re-submit after updating to the latest version of parse as well as its dependencies. 
+After getting in contact with BoltsFramework maintainers from Facebook they have allowed us to get changes in to fix app store declines due to still using UIWebView(iOS only) rather than updating to WKWebView(iOS, macOS, and iPad OS compatible). Those that got declined should be able to re-submit after updating to the latest version of parse as well as its dependencies. 
 
 
 ### 1.17.3

From bfc10a72a666913f62479b54cae491e61be5793d Mon Sep 17 00:00:00 2001
From: Tom Fox <13188249+TomWFox@users.noreply.github.com>
Date: Mon, 13 Apr 2020 18:15:05 +0100
Subject: [PATCH 06/14] add new headings

---
 CHANGELOG.md | 48 ++++++++++++++++++++++++++++--------------------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 840d99704..97e8236d7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,29 +7,37 @@
 ### 1.18.0
 [Full Changelog](https://github.com/parse-community/Parse-SDK-iOS-OSX/compare/1.17.3...1.18.0)
 
-- FIX: Removed using NSURLCache in Catalyst ([#1469](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1489)),  thanks to [Thomas Kollbach](https://github.com/toto) and [Martin Man](https://github.com/mman).
-- NEW: Add get and set server functions ([#1464](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1464)), thanks to [Manuel Trezza](https://github.com/mtrezza).
-- NEW: Swift 5 compatibility, thanks to [Nathan Kellert](https://github.com/noobs2ninjas).
-- FIX: Updated project build targets to work with Catalyst, thanks to [Nathan Kellert](https://github.com/noobs2ninjas).
-- NEW: Parse as well as its dependencies are now compatible with macOS 10.15 thanks to [Martin Man](https://github.com/mman).
-- FIX: ParseUI minimum api version should be iOS 8.0. Project settings and info.plist updated to reflect to fix Carthage builds. Thanks to [Nathan Kellert](https://github.com/noobs2ninjas).
-
-[Nathan Kellert](https://github.com/noobs2ninjas) and [Darren Black](https://github.com/drdaz) did some hard work to not only update build environments to use Xcode 11 but also made necessary changes to get nightly builds to work on both Travis and CircleCI. This will allow us to resume more consistent updates again. ([Arthur Cinader](https://github.com/acinader)) helped with Travis release build fixes.
-
- - Fixing CircleCI Nightly Build and adding extra PR Testing ([#1490](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1490))
- - Fixed tvOS builds. ([#1489](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1489))
- - Added OCMock manually to CircleCI Build ([#1490](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1490))
- - Updated Travis and CircleCI build environments ([#1473](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1473))
+__New features__
+- Add get and set server functions ([#1464](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1464)), thanks to [Manuel Trezza](https://github.com/mtrezza).
+
+__Improvements__
+- Swift 5 compatibility, thanks to [Nathan Kellert](https://github.com/noobs2ninjas).
+- macOS 10.15 compatibility thanks to [Martin Man](https://github.com/mman).
+
+__Fixes__
+- Removed using NSURLCache in Catalyst ([#1469](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1489)), thanks to [Thomas Kollbach](https://github.com/toto) and [Martin Man](https://github.com/mman).
+- Updated project build targets to work with Catalyst, thanks to [Nathan Kellert](https://github.com/noobs2ninjas).
+- ParseUI minimum api version should be iOS 8.0. Project settings and info.plist updated to reflect to fix Carthage builds. Thanks to [Nathan Kellert](https://github.com/noobs2ninjas).
+
+[Nathan Kellert](https://github.com/noobs2ninjas) and [Darren Black](https://github.com/drdaz) did some hard work to not only update build environments to use Xcode 11 but also made necessary changes to get nightly builds to work on both Travis and CircleCI. This will allow us to resume more consistent updates again. [Arthur Cinader](https://github.com/acinader) helped with Travis release build fixes.
+
+ - Fixed CircleCI Nightly Build and adding extra PR Testing ([#1490](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1490)).
+ - Fixed tvOS builds ([#1489](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1489)).
+ - Added OCMock manually to CircleCI Build ([#1490](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1490)).
+ - Updated Travis and CircleCI build environments ([#1473](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1473)).
  
- #### Notice
-After getting in contact with BoltsFramework maintainers from Facebook they have allowed us to get changes in to fix app store declines due to still using UIWebView(iOS only) rather than updating to WKWebView(iOS, macOS, and iPad OS compatible). Those that got declined should be able to re-submit after updating to the latest version of parse as well as its dependencies. 
+#### Notice
+After getting in contact with the Bolts Framework maintainers from Facebook they have allowed us to get changes in to fix app store declines due to still using UIWebView(iOS only) rather than updating to WKWebView(iOS, macOS, and iPad OS compatible). Those that got declined should be able to re-submit after updating to the latest version of this SDK as well as its dependencies. 
 
 
 ### 1.17.3
 [Full Changelog](https://github.com/parse-community/Parse-SDK-iOS-OSX/compare/1.17.2...1.17.3)
 
-- FIX: Updates xcbuildtools submodule ([#1365](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1365)), thanks to [Darren Black](https://github.com/drdaz)
-- FIX: Bandaid for Crashlytics [#944](https://github.com/parse-community/Parse-SDK-iOS-OSX/issues/944) ([#1376](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1376)), thanks to [Rogers George](https://github.com/ceramicatheist)
-- NEW: tvOS push support ([#1375](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1375)), thanks to [Thomas Kollbach](https://github.com/toto)
-- FIX: Class properties ([#1400](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1400)), thanks to [Thomas Kollbach](https://github.com/toto)
-- FIX: Upgrade ParseFacebookUtils dependency to Facebook SDK v5.x ([#1424](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1424)) thanks to [Herrick Wolber](https://github.com/rico237) and [Darren Black](https://github.com/drdaz)
+__New Features__
+- tvOS push support ([#1375](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1375)), thanks to [Thomas Kollbach](https://github.com/toto).
+
+__Fixes__
+- Update xcbuildtools submodule ([#1365](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1365)), thanks to [Darren Black](https://github.com/drdaz).
+- Bandaid for Crashlytics [#944](https://github.com/parse-community/Parse-SDK-iOS-OSX/issues/944) ([#1376](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1376)), thanks to [Rogers George](https://github.com/ceramicatheist).
+- Fix Class properties ([#1400](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1400)), thanks to [Thomas Kollbach](https://github.com/toto).
+- Upgrade ParseFacebookUtils dependency to Facebook SDK v5.x ([#1424](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1424)) thanks to [Herrick Wolber](https://github.com/rico237) and [Darren Black](https://github.com/drdaz).

From a89cd15c03558e8cad1dd815b27993c6d6366b97 Mon Sep 17 00:00:00 2001
From: Nathan Kellert <nathankellert@gmail.com>
Date: Mon, 13 Apr 2020 12:31:52 -0500
Subject: [PATCH 07/14] Adding missing pull request links to improvements.

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 97e8236d7..13744064c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,8 +11,8 @@ __New features__
 - Add get and set server functions ([#1464](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1464)), thanks to [Manuel Trezza](https://github.com/mtrezza).
 
 __Improvements__
-- Swift 5 compatibility, thanks to [Nathan Kellert](https://github.com/noobs2ninjas).
-- macOS 10.15 compatibility thanks to [Martin Man](https://github.com/mman).
+- Swift 5 compatibility([#1451](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1451)), thanks to [Nathan Kellert](https://github.com/noobs2ninjas).
+- macOS 10.15 compatibility([#1460](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1460), thanks to [Martin Man](https://github.com/mman).
 
 __Fixes__
 - Removed using NSURLCache in Catalyst ([#1469](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1489)), thanks to [Thomas Kollbach](https://github.com/toto) and [Martin Man](https://github.com/mman).

From 99721c1cb00131f25ab51f76bb135c2f9b378c5e Mon Sep 17 00:00:00 2001
From: Tom Fox <13188249+TomWFox@users.noreply.github.com>
Date: Mon, 13 Apr 2020 19:51:33 +0100
Subject: [PATCH 08/14] fix formatting

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 13744064c..cf8f33cab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,8 +11,8 @@ __New features__
 - Add get and set server functions ([#1464](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1464)), thanks to [Manuel Trezza](https://github.com/mtrezza).
 
 __Improvements__
-- Swift 5 compatibility([#1451](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1451)), thanks to [Nathan Kellert](https://github.com/noobs2ninjas).
-- macOS 10.15 compatibility([#1460](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1460), thanks to [Martin Man](https://github.com/mman).
+- Swift 5 compatibility ([#1451](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1451)), thanks to [Nathan Kellert](https://github.com/noobs2ninjas).
+- macOS 10.15 compatibility ([#1460](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1460)), thanks to [Martin Man](https://github.com/mman).
 
 __Fixes__
 - Removed using NSURLCache in Catalyst ([#1469](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1489)), thanks to [Thomas Kollbach](https://github.com/toto) and [Martin Man](https://github.com/mman).

From 94bfb1d80c5c8914175d6ab5fe7b16b5ff170c25 Mon Sep 17 00:00:00 2001
From: Nathan Kellert <nathankellert@gmail.com>
Date: Mon, 13 Apr 2020 14:57:42 -0500
Subject: [PATCH 09/14] Adding missing pull request links.

---
 CHANGELOG.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 13744064c..f613183fd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,15 +16,15 @@ __Improvements__
 
 __Fixes__
 - Removed using NSURLCache in Catalyst ([#1469](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1489)), thanks to [Thomas Kollbach](https://github.com/toto) and [Martin Man](https://github.com/mman).
-- Updated project build targets to work with Catalyst, thanks to [Nathan Kellert](https://github.com/noobs2ninjas).
-- ParseUI minimum api version should be iOS 8.0. Project settings and info.plist updated to reflect to fix Carthage builds. Thanks to [Nathan Kellert](https://github.com/noobs2ninjas).
+- Updated project build targets to work with Catalyst[#1473](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1473), thanks to [Nathan Kellert](https://github.com/noobs2ninjas).
+- ParseUI minimum api version should be iOS 8.0. Project settings and info.plist updated to reflect to fix Carthage builds[#1494](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1473), thanks to [Nathan Kellert](https://github.com/noobs2ninjas).
 
 [Nathan Kellert](https://github.com/noobs2ninjas) and [Darren Black](https://github.com/drdaz) did some hard work to not only update build environments to use Xcode 11 but also made necessary changes to get nightly builds to work on both Travis and CircleCI. This will allow us to resume more consistent updates again. [Arthur Cinader](https://github.com/acinader) helped with Travis release build fixes.
 
- - Fixed CircleCI Nightly Build and adding extra PR Testing ([#1490](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1490)).
- - Fixed tvOS builds ([#1489](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1489)).
- - Added OCMock manually to CircleCI Build ([#1490](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1490)).
- - Updated Travis and CircleCI build environments ([#1473](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1473)).
+ - Fixed CircleCI Nightly Build and adding extra PR Testing [#1490](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1490).
+ - Fixed tvOS builds [#1489](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1489).
+ - Added OCMock manually to CircleCI Build [#1490](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1490).
+ - Updated Travis and CircleCI build environments [#1473](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1473).
  
 #### Notice
 After getting in contact with the Bolts Framework maintainers from Facebook they have allowed us to get changes in to fix app store declines due to still using UIWebView(iOS only) rather than updating to WKWebView(iOS, macOS, and iPad OS compatible). Those that got declined should be able to re-submit after updating to the latest version of this SDK as well as its dependencies. 

From 16d11524ef5d015aff14cba4320b8d3c8ae2b96c Mon Sep 17 00:00:00 2001
From: Tom Fox <13188249+TomWFox@users.noreply.github.com>
Date: Mon, 13 Apr 2020 21:16:37 +0100
Subject: [PATCH 10/14] Fix formatting

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f837b0766..4a495d4e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,8 +16,8 @@ __Improvements__
 
 __Fixes__
 - Removed using NSURLCache in Catalyst ([#1469](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1489)), thanks to [Thomas Kollbach](https://github.com/toto) and [Martin Man](https://github.com/mman).
-- Updated project build targets to work with Catalyst[#1473](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1473), thanks to [Nathan Kellert](https://github.com/noobs2ninjas).
-- ParseUI minimum api version should be iOS 8.0. Project settings and info.plist updated to reflect to fix Carthage builds[#1494](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1473), thanks to [Nathan Kellert](https://github.com/noobs2ninjas).
+- Updated project build targets to work with Catalyst ([#1473](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1473)), thanks to [Nathan Kellert](https://github.com/noobs2ninjas).
+- ParseUI minimum api version should be iOS 8.0. Project settings and info.plist updated to reflect to fix Carthage builds ([#1494](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1473)), thanks to [Nathan Kellert](https://github.com/noobs2ninjas).
 
 [Nathan Kellert](https://github.com/noobs2ninjas) and [Darren Black](https://github.com/drdaz) did some hard work to not only update build environments to use Xcode 11 but also made necessary changes to get nightly builds to work on both Travis and CircleCI. This will allow us to resume more consistent updates again. [Arthur Cinader](https://github.com/acinader) helped with Travis release build fixes.
 

From 2684d543e3cd9f2c4b2636e3fb4274c5b9383f89 Mon Sep 17 00:00:00 2001
From: Nathan Kellert <nathankellert@gmail.com>
Date: Wed, 15 Apr 2020 22:57:50 -0500
Subject: [PATCH 11/14] Fix tartgeted device family on projects. Removing
 catalyst support marker until we officially add it.

---
 Parse/Parse.xcodeproj/project.pbxproj                     | 6 ++++--
 .../ParseFacebookUtils.xcodeproj/project.pbxproj          | 6 ++++--
 .../ParseTwitterUtils.xcodeproj/project.pbxproj           | 8 ++++----
 ParseUI/ParseUI.xcodeproj/project.pbxproj                 | 8 ++++----
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/Parse/Parse.xcodeproj/project.pbxproj b/Parse/Parse.xcodeproj/project.pbxproj
index d41caf51d..81830522e 100644
--- a/Parse/Parse.xcodeproj/project.pbxproj
+++ b/Parse/Parse.xcodeproj/project.pbxproj
@@ -8918,6 +8918,7 @@
 					"@loader_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.18.0;
+				SUPPORTS_MACCATALYST = NO;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -8938,6 +8939,7 @@
 					"@loader_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.18.0;
+				SUPPORTS_MACCATALYST = NO;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -8951,7 +8953,7 @@
 				CURRENT_PROJECT_VERSION = 1.18.0;
 				MARKETING_VERSION = 1.18.0;
 				SUPPORTS_MACCATALYST = NO;
-				TARGETED_DEVICE_FAMILY = 1;
+				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
 		};
@@ -8963,7 +8965,7 @@
 				CURRENT_PROJECT_VERSION = 1.18.0;
 				MARKETING_VERSION = 1.18.0;
 				SUPPORTS_MACCATALYST = NO;
-				TARGETED_DEVICE_FAMILY = 1;
+				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
 		};
diff --git a/ParseFacebookUtils/ParseFacebookUtils.xcodeproj/project.pbxproj b/ParseFacebookUtils/ParseFacebookUtils.xcodeproj/project.pbxproj
index c5b89d97b..f4ee92472 100644
--- a/ParseFacebookUtils/ParseFacebookUtils.xcodeproj/project.pbxproj
+++ b/ParseFacebookUtils/ParseFacebookUtils.xcodeproj/project.pbxproj
@@ -1134,6 +1134,7 @@
 					"$(PROJECT_DIR)/Vendor",
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				SUPPORTS_MACCATALYST = NO;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -1147,6 +1148,7 @@
 					"$(PROJECT_DIR)/Vendor",
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				SUPPORTS_MACCATALYST = NO;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -1194,7 +1196,7 @@
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				SUPPORTS_MACCATALYST = NO;
-				TARGETED_DEVICE_FAMILY = 1;
+				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
 		};
@@ -1209,7 +1211,7 @@
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				SUPPORTS_MACCATALYST = NO;
-				TARGETED_DEVICE_FAMILY = 1;
+				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
 		};
diff --git a/ParseTwitterUtils/ParseTwitterUtils.xcodeproj/project.pbxproj b/ParseTwitterUtils/ParseTwitterUtils.xcodeproj/project.pbxproj
index 5cc5d00fb..840ae70ac 100644
--- a/ParseTwitterUtils/ParseTwitterUtils.xcodeproj/project.pbxproj
+++ b/ParseTwitterUtils/ParseTwitterUtils.xcodeproj/project.pbxproj
@@ -941,7 +941,7 @@
 			baseConfigurationReference = F51535531B57453700C49F56 /* ParseTwitterUtils-iOS.xcconfig */;
 			buildSettings = {
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				SUPPORTS_MACCATALYST = YES;
+				SUPPORTS_MACCATALYST = NO;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -951,7 +951,7 @@
 			baseConfigurationReference = F51535531B57453700C49F56 /* ParseTwitterUtils-iOS.xcconfig */;
 			buildSettings = {
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				SUPPORTS_MACCATALYST = YES;
+				SUPPORTS_MACCATALYST = NO;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -1032,7 +1032,7 @@
 			buildSettings = {
 				CLANG_MODULES_AUTOLINK = YES;
 				SUPPORTS_MACCATALYST = NO;
-				TARGETED_DEVICE_FAMILY = 1;
+				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
 		};
@@ -1042,7 +1042,7 @@
 			buildSettings = {
 				CLANG_MODULES_AUTOLINK = YES;
 				SUPPORTS_MACCATALYST = NO;
-				TARGETED_DEVICE_FAMILY = 1;
+				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
 		};
diff --git a/ParseUI/ParseUI.xcodeproj/project.pbxproj b/ParseUI/ParseUI.xcodeproj/project.pbxproj
index 5b4522ded..ad37054b3 100644
--- a/ParseUI/ParseUI.xcodeproj/project.pbxproj
+++ b/ParseUI/ParseUI.xcodeproj/project.pbxproj
@@ -2037,7 +2037,7 @@
 				MTL_ENABLE_DEBUG_INFO = YES;
 				SKIP_INSTALL = YES;
 				SUPPORTS_MACCATALYST = NO;
-				TARGETED_DEVICE_FAMILY = 1;
+				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -2099,7 +2099,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SKIP_INSTALL = YES;
 				SUPPORTS_MACCATALYST = NO;
-				TARGETED_DEVICE_FAMILY = 1;
+				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -2169,7 +2169,7 @@
 				MARKETING_VERSION = 1.18.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				SKIP_INSTALL = YES;
-				SUPPORTS_MACCATALYST = YES;
+				SUPPORTS_MACCATALYST = NO;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -2234,7 +2234,7 @@
 				MARKETING_VERSION = 1.18.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SKIP_INSTALL = YES;
-				SUPPORTS_MACCATALYST = YES;
+				SUPPORTS_MACCATALYST = NO;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";

From 03e3b25fedee94bc3073e7408108a437b51e893a Mon Sep 17 00:00:00 2001
From: Nathan Kellert <nathankellert@gmail.com>
Date: Thu, 16 Apr 2020 00:56:25 -0500
Subject: [PATCH 12/14] Bolts 1.9.1 is out. Making updates!

---
 .gitmodules                   | 2 +-
 Cartfile                      | 2 +-
 Cartfile.resolved             | 2 +-
 Carthage/Checkouts/Bolts-ObjC | 2 +-
 Parse.podspec                 | 6 +++---
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index ad4c2af75..52e722d89 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,7 +3,7 @@
 	url = https://github.com/parse-community/xctoolchain.git
 [submodule "Carthage/Checkouts/Bolts-ObjC"]
 	path = Carthage/Checkouts/Bolts-ObjC
-	url = https://github.com/parse-community/Bolts-ObjC.git
+	url = https://github.com/BoltsFramework/Bolts-ObjC.git
 [submodule "Carthage/Checkouts/facebook-objc-sdk"]
 	path = Carthage/Checkouts/facebook-objc-sdk
 	url = https://github.com/facebook/facebook-objc-sdk.git
diff --git a/Cartfile b/Cartfile
index 765c8cc85..584ec2d86 100644
--- a/Cartfile
+++ b/Cartfile
@@ -1,2 +1,2 @@
-github "parse-community/Bolts-ObjC" ~> 1.9.1
+github "BoltsFramework/Bolts-ObjC" ~> 1.9.1
 github "facebook/facebook-objc-sdk" ~> 5.12.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
index c2b29cfdd..4a5de4cd5 100644
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -1,2 +1,2 @@
+github "BoltsFramework/Bolts-ObjC" "1.9.1"
 github "facebook/facebook-objc-sdk" "v5.15.1"
-github "parse-community/Bolts-ObjC" "1.9.1"
diff --git a/Carthage/Checkouts/Bolts-ObjC b/Carthage/Checkouts/Bolts-ObjC
index 50c09111f..74b67b3b8 160000
--- a/Carthage/Checkouts/Bolts-ObjC
+++ b/Carthage/Checkouts/Bolts-ObjC
@@ -1 +1 @@
-Subproject commit 50c09111f72662b586f74ca66d4ad2d2541721ea
+Subproject commit 74b67b3b8be76a570cdbe193771927971f26e304
diff --git a/Parse.podspec b/Parse.podspec
index df79f546e..98aa23ca9 100644
--- a/Parse.podspec
+++ b/Parse.podspec
@@ -80,7 +80,7 @@ Pod::Spec.new do |s|
 
     s.libraries        = 'z', 'sqlite3'
 
-    s.dependency 'Bolts/Tasks', '~> 1.9'
+    s.dependency 'Bolts/Tasks', '~> 1.9.1'
   end
 
   s.subspec 'FacebookUtils' do |s|
@@ -103,7 +103,7 @@ Pod::Spec.new do |s|
     s.libraries        = 'z', 'sqlite3'
 
     s.dependency 'Parse/Core'
-    s.dependency 'Bolts/Tasks', '~> 1.9'
+    s.dependency 'Bolts/Tasks', '~> 1.9.1'
     s.dependency 'FBSDKLoginKit', '~> 5.x'
   end
 
@@ -125,7 +125,7 @@ Pod::Spec.new do |s|
     s.libraries        = 'z', 'sqlite3'
 
     s.dependency 'Parse/Core'
-    s.dependency 'Bolts/Tasks', '~> 1.9'
+    s.dependency 'Bolts/Tasks', '~> 1.9.1'
     s.dependency 'FBSDKTVOSKit', '~> 5.x'
     s.dependency 'FBSDKShareKit', '~> 5.x'
   end

From 715875a562254f2ce33279adcc750d3243d74e0b Mon Sep 17 00:00:00 2001
From: Nathan Kellert <nathankellert@gmail.com>
Date: Thu, 16 Apr 2020 00:58:40 -0500
Subject: [PATCH 13/14] Updating release version

---
 Parse.podspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Parse.podspec b/Parse.podspec
index 98aa23ca9..d3fb6141b 100644
--- a/Parse.podspec
+++ b/Parse.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'Parse'
-  s.version          = '1.17.3'
+  s.version          = '1.18.0'
   s.license          =  { :type => 'BSD', :file => 'LICENSE' }
   s.homepage         = 'http://parseplatform.org/'
   s.summary          = 'A library that gives you access to the powerful Parse cloud platform from your iOS/OS X/watchOS/tvOS app.'

From 1d23095134a4c5a850f7e92f9c18dfb0d15469f7 Mon Sep 17 00:00:00 2001
From: Tom Fox <13188249+TomWFox@users.noreply.github.com>
Date: Thu, 16 Apr 2020 10:37:13 +0100
Subject: [PATCH 14/14] add entry to changelog

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a495d4e3..37ec1941b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,7 +17,8 @@ __Improvements__
 __Fixes__
 - Removed using NSURLCache in Catalyst ([#1469](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1489)), thanks to [Thomas Kollbach](https://github.com/toto) and [Martin Man](https://github.com/mman).
 - Updated project build targets to work with Catalyst ([#1473](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1473)), thanks to [Nathan Kellert](https://github.com/noobs2ninjas).
-- ParseUI minimum api version should be iOS 8.0. Project settings and info.plist updated to reflect to fix Carthage builds ([#1494](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1473)), thanks to [Nathan Kellert](https://github.com/noobs2ninjas).
+- ParseUI minimum api version should be iOS 8.0 ([#1494](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1473)), thanks to [Nathan Kellert](https://github.com/noobs2ninjas).
+- Removed `iPhoneSimulator` from `CFBundleSupportedPlatforms` ([#1496](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1496), [#1497](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1497)), thanks to [Tom Fox](https://github.com/TomWFox).
 
 [Nathan Kellert](https://github.com/noobs2ninjas) and [Darren Black](https://github.com/drdaz) did some hard work to not only update build environments to use Xcode 11 but also made necessary changes to get nightly builds to work on both Travis and CircleCI. This will allow us to resume more consistent updates again. [Arthur Cinader](https://github.com/acinader) helped with Travis release build fixes.