From 98ae6d937f37766187f97cd066076fa7127cff01 Mon Sep 17 00:00:00 2001
From: David Harris <daharr@umich.edu>
Date: Thu, 7 Jan 2021 14:03:05 -0500
Subject: [PATCH] chore: fix Carthage submodule structure and SPM xcodeproj
 structure

---
 .gitignore                                       |  1 +
 .gitmodules                                      |  2 +-
 Cartfile.resolved                                |  1 +
 Carthage/Checkouts/RxSwift                       |  1 +
 Package.resolved                                 | 16 ++++++++++++++++
 Package.swift                                    |  2 +-
 RxDataSources.xcodeproj/project.pbxproj          |  4 ++--
 .../xcshareddata/swiftpm/Package.resolved        |  6 +++---
 8 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 Cartfile.resolved
 create mode 160000 Carthage/Checkouts/RxSwift
 create mode 100644 Package.resolved

diff --git a/.gitignore b/.gitignore
index 080b743f..94b84e3a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,3 +49,4 @@ Carthage/Build
 
 .build/
 Packages/
+.swiftpm/
diff --git a/.gitmodules b/.gitmodules
index 293c9c47..b672b015 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "Carthage/Checkouts/RxSwift"]
-	path = Carthage/Checkouts/RxSwift
 	url = https://github.com/ReactiveX/RxSwift.git
+	path = Carthage/Checkouts/RxSwift
diff --git a/Cartfile.resolved b/Cartfile.resolved
new file mode 100644
index 00000000..c07923a0
--- /dev/null
+++ b/Cartfile.resolved
@@ -0,0 +1 @@
+github "ReactiveX/RxSwift" "6.0.0"
diff --git a/Carthage/Checkouts/RxSwift b/Carthage/Checkouts/RxSwift
new file mode 160000
index 00000000..c8742ed9
--- /dev/null
+++ b/Carthage/Checkouts/RxSwift
@@ -0,0 +1 @@
+Subproject commit c8742ed97fc2f0c015a5ea5eddefb064cd7532d2
diff --git a/Package.resolved b/Package.resolved
new file mode 100644
index 00000000..c6207994
--- /dev/null
+++ b/Package.resolved
@@ -0,0 +1,16 @@
+{
+  "object": {
+    "pins": [
+      {
+        "package": "RxSwift",
+        "repositoryURL": "https://github.com/ReactiveX/RxSwift.git",
+        "state": {
+          "branch": null,
+          "revision": "c8742ed97fc2f0c015a5ea5eddefb064cd7532d2",
+          "version": "6.0.0"
+        }
+      }
+    ]
+  },
+  "version": 1
+}
diff --git a/Package.swift b/Package.swift
index ba7f6849..eba9c8bb 100644
--- a/Package.swift
+++ b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.0
+// swift-tools-version:5.1
 
 import PackageDescription
 
diff --git a/RxDataSources.xcodeproj/project.pbxproj b/RxDataSources.xcodeproj/project.pbxproj
index ee015f9c..bbcb4831 100644
--- a/RxDataSources.xcodeproj/project.pbxproj
+++ b/RxDataSources.xcodeproj/project.pbxproj
@@ -1010,8 +1010,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/ReactiveX/RxSwift";
 			requirement = {
-				branch = rxswift6;
-				kind = branch;
+				kind = upToNextMajorVersion;
+				minimumVersion = 6.0.0;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
diff --git a/RxDataSources.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/RxDataSources.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 77794656..6451daaf 100644
--- a/RxDataSources.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/RxDataSources.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -5,9 +5,9 @@
         "package": "RxSwift",
         "repositoryURL": "https://github.com/ReactiveX/RxSwift",
         "state": {
-          "branch": "rxswift6",
-          "revision": "4e5f359d1313fa6fac816ab309431c214d706faa",
-          "version": null
+          "branch": null,
+          "revision": "c8742ed97fc2f0c015a5ea5eddefb064cd7532d2",
+          "version": "6.0.0"
         }
       }
     ]