Merge develop into master

simonmitchell · Aug 15, 2020 · 50a1a3b · 50a1a3b
2 parents 0eeab9f + 8c576f2
commit 50a1a3b
Show file tree

Hide file tree

Showing 3 changed files with 100 additions and 8 deletions.
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/ReviewKit.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/ReviewKit.xcscheme
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1150"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "ReviewKit"
+               BuildableName = "ReviewKit"
+               BlueprintName = "ReviewKit"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "ReviewKitTests"
+               BuildableName = "ReviewKitTests"
+               BlueprintName = "ReviewKitTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "ReviewKitTests"
+               BuildableName = "ReviewKitTests"
+               BlueprintName = "ReviewKitTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "ReviewKit"
+            BuildableName = "ReviewKit"
+            BlueprintName = "ReviewKit"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/ReviewKit.xcodeproj/project.pbxproj b/ReviewKit.xcodeproj/project.pbxproj
@@ -449,7 +449,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2.2;
+				MARKETING_VERSION = 1.2.3;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.yellowbrickbear.ReviewKit-iOS";
 				PRODUCT_NAME = ReviewKit;
 				SKIP_INSTALL = YES;
@@ -478,7 +478,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2.2;
+				MARKETING_VERSION = 1.2.3;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.yellowbrickbear.ReviewKit-iOS";
 				PRODUCT_NAME = ReviewKit;
 				SKIP_INSTALL = YES;
@@ -506,7 +506,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2.2;
+				MARKETING_VERSION = 1.2.3;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.yellowbrickbear.ReviewKit-watchOS";
 				PRODUCT_NAME = ReviewKit;
 				SDKROOT = watchos;
@@ -537,7 +537,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2.2;
+				MARKETING_VERSION = 1.2.3;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.yellowbrickbear.ReviewKit-watchOS";
 				PRODUCT_NAME = ReviewKit;
 				SDKROOT = watchos;
@@ -566,7 +566,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2.2;
+				MARKETING_VERSION = 1.2.3;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.yellowbrickbear.ReviewKit-tvOS";
 				PRODUCT_NAME = ReviewKit;
 				SDKROOT = appletvos;
@@ -596,7 +596,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2.2;
+				MARKETING_VERSION = 1.2.3;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.yellowbrickbear.ReviewKit-tvOS";
 				PRODUCT_NAME = ReviewKit;
 				SDKROOT = appletvos;
@@ -627,7 +627,7 @@
 					"@loader_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
-				MARKETING_VERSION = 1.2.2;
+				MARKETING_VERSION = 1.2.3;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.yellowbrickbear.ReviewKit-macOS";
 				PRODUCT_NAME = ReviewKit;
 				SDKROOT = macosx;
@@ -657,7 +657,7 @@
 					"@loader_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
-				MARKETING_VERSION = 1.2.2;
+				MARKETING_VERSION = 1.2.3;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.yellowbrickbear.ReviewKit-macOS";
 				PRODUCT_NAME = ReviewKit;
 				SDKROOT = macosx;

diff --git a/Tests/ReviewKitTests/VersionTests.swift b/Tests/ReviewKitTests/VersionTests.swift
@@ -63,6 +63,7 @@ final class VersionTests: XCTestCase {
         XCTAssertLessThan(ReviewRequestController.Version(major: 0, minor: 2, patch: 3), ReviewRequestController.Version(major: 1, minor: 2, patch: 3))
         XCTAssertLessThan(ReviewRequestController.Version(major: 1, minor: 1, patch: 3), ReviewRequestController.Version(major: 1, minor: 2, patch: 3))
         XCTAssertLessThan(ReviewRequestController.Version(major: 1, minor: 2, patch: 2), ReviewRequestController.Version(major: 1, minor: 2, patch: 3))
+        XCTAssertGreaterThanOrEqual(ReviewRequestController.Version(major: 1, minor: 4, patch: 0), ReviewRequestController.Version(major: 1, minor: 4, patch: 0))
     }
 
     static var allTests = [