#50: [config] Removed all Carthage and git submodule stuff.

jrtibbetts · Feb 28, 2021 · 8d0edc0 · 8d0edc0
1 parent c0da2b6
commit 8d0edc0
Show file tree

Hide file tree

Showing 9 changed files with 277 additions and 287 deletions.
diff --git a/.gitmodules b/.gitmodules
diff --git a/Cartfile b/Cartfile
diff --git a/Cartfile.resolved b/Cartfile.resolved
diff --git a/Source/SwiftDiscogs.h b/Source/SwiftDiscogs.h
diff --git a/SwiftDiscogs.xcodeproj/project.pbxproj b/SwiftDiscogs.xcodeproj/project.pbxproj
diff --git a/SwiftDiscogs.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/SwiftDiscogs.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -28,6 +28,15 @@
           "version": "6.0.0"
         }
       },
+      {
+        "package": "JSONClient",
+        "repositoryURL": "https://github.com/jrtibbetts/JSONClient",
+        "state": {
+          "branch": "main",
+          "revision": "d51d5f3e172b56004fdae1b17ad612fbad193e92",
+          "version": null
+        }
+      },
       {
         "package": "Kanna",
         "repositoryURL": "https://github.com/tid-kijyun/Kanna.git",
@@ -38,17 +47,17 @@
         }
       },
       {
-        "package": "Kingfisher",
-        "repositoryURL": "https://github.com/onevcat/Kingfisher",
+        "package": "Medi8",
+        "repositoryURL": "https://github.com/jrtibbetts/Medi8",
         "state": {
-          "branch": null,
-          "revision": "81dd1ce8401137637663046c7314e7c885bcc56d",
-          "version": "6.1.1"
+          "branch": "main",
+          "revision": "3f42fb801a4a7da4bcbb55032d0ef59e20379c57",
+          "version": null
         }
       },
       {
         "package": "OAuthSwift",
-        "repositoryURL": "https://github.com/OAuthSwift/OAuthSwift",
+        "repositoryURL": "https://github.com/OAuthSwift/OAuthSwift.git",
         "state": {
           "branch": null,
           "revision": "fde77955e6983fbfaabd491709d52b8a82fda4d0",
@@ -57,20 +66,20 @@
       },
       {
         "package": "PromiseKit",
-        "repositoryURL": "https://github.com/mxcl/PromiseKit",
+        "repositoryURL": "https://github.com/mxcl/PromiseKit.git",
         "state": {
           "branch": null,
-          "revision": "f6b15b7626a4399864ffa1d5ec2ed9cf0cea5556",
-          "version": "6.13.2"
+          "revision": "aea48ea1855f5d82e2dffa6027afce3aab8f3dd7",
+          "version": "6.13.3"
         }
       },
       {
         "package": "Stylobate",
         "repositoryURL": "https://github.com/jrtibbetts/Stylobate.git",
         "state": {
-          "branch": null,
-          "revision": "5bca445ae807b2028aa99bbf536a70f52027f454",
-          "version": "0.33.1"
+          "branch": "main",
+          "revision": "1102510b399a9662045d73a367b6419676ec9f75",
+          "version": null
         }
       },
       {

diff --git a/SwiftDiscogs.xcodeproj/xcshareddata/xcschemes/SwiftDiscogs.xcscheme b/SwiftDiscogs.xcodeproj/xcshareddata/xcschemes/SwiftDiscogs.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1240"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,8 +26,17 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      codeCoverageEnabled = "YES"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "968983A7203D427A00DE77BC"
+            BuildableName = "SwiftDiscogs.framework"
+            BlueprintName = "SwiftDiscogs"
+            ReferencedContainer = "container:SwiftDiscogs.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -40,17 +49,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "968983A7203D427A00DE77BC"
-            BuildableName = "SwiftDiscogs.framework"
-            BlueprintName = "SwiftDiscogs"
-            ReferencedContainer = "container:SwiftDiscogs.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -72,8 +70,6 @@
             ReferencedContainer = "container:SwiftDiscogs.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/SwiftDiscogs.xcodeproj/xcshareddata/xcschemes/SwiftDiscogsApp.xcscheme b/SwiftDiscogs.xcodeproj/xcshareddata/xcschemes/SwiftDiscogsApp.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1240"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,9 +26,18 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
       codeCoverageEnabled = "YES"
-      onlyGenerateCoverageForSpecifiedTargets = "YES"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      onlyGenerateCoverageForSpecifiedTargets = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "960368D9205A012B00D24CE7"
+            BuildableName = "SwiftDiscogsApp.app"
+            BlueprintName = "SwiftDiscogsApp"
+            ReferencedContainer = "container:SwiftDiscogs.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <CodeCoverageTargets>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -70,17 +79,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "960368D9205A012B00D24CE7"
-            BuildableName = "SwiftDiscogsApp.app"
-            BlueprintName = "SwiftDiscogsApp"
-            ReferencedContainer = "container:SwiftDiscogs.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -119,8 +117,6 @@
             isEnabled = "YES">
          </EnvironmentVariable>
       </EnvironmentVariables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"