chore: fix Carthage submodule structure and SPM xcodeproj structure

thedavidharris · freak4pc · commit 98ae6d937f37 · 2021-03-25T13:07:50.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -49,3 +49,4 @@ Carthage/Build
 
 .build/
 Packages/
+.swiftpm/
diff --git 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
@@ -0,0 +1 @@
+github "ReactiveX/RxSwift" "6.0.0"
diff --git a/Carthage/Checkouts/RxSwift b/Carthage/Checkouts/RxSwift
@@ -0,0 +1 @@
+Subproject commit c8742ed97fc2f0c015a5ea5eddefb064cd7532d2
diff --git a/Package.resolved b/Package.resolved
diff --git 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
@@ -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
