Resolved merge conflicts using local versions

AudioKit · Oct 18, 2024 · 5f84fa4 · 5f84fa4
2 parents 41c0ea2 + cc8c546
commit 5f84fa4
Show file tree

Hide file tree

Showing 12 changed files with 523 additions and 80 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -10,11 +10,12 @@ on:
 jobs:
   swift_test:
     name: Test
-    uses: AudioKit/ci/.github/workflows/swift_test.yml@main
-    with:
-      scheme: Tonic
-      platforms: iOS macOS tvOS watchOS Linux
-      swift-versions: 5.6
+    runs-on: macos-latest
+    steps:
+      - name: Check out Tonic
+        uses: actions/checkout@v4
+      - name: Build Tonic
+        run: swift test -c release
 
   build_demo:
     name: Build ${{ matrix.scheme }} (Xcode ${{ matrix.xcode_version }})
@@ -29,16 +30,12 @@ jobs:
         scheme:
           - TonicDemo (iOS)
           - TonicDemo (macOS)
-        xcode_version:
-          - '13.2' # swift 5.5
-          - '13.4' # swift 5.6
     steps:
       - name: Build Demo
         uses: AudioKit/ci/.github/actions/build-demo@main
         with:
           project: Demo/TonicDemo.xcodeproj
           scheme: ${{ matrix.scheme }}
-          xcode_version: ${{ matrix.xcode_version }}
 
   # Send notification to Discord on failure.
   send_notification:

diff --git a/Demo/TonicDemo.xcodeproj/project.pbxproj b/Demo/TonicDemo.xcodeproj/project.pbxproj
@@ -532,8 +532,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/audiokit/Keyboard";
 			requirement = {
-				branch = main;
-				kind = branch;
+				kind = exactVersion;
+				version = 1.3.6;
 			};
 		};
 		F1201BEE2849F4DC0050DD22 /* XCRemoteSwiftPackageReference "MIDIKit" */ = {

diff --git a/Demo/TonicDemo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Demo/TonicDemo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,34 +1,32 @@
 {
-  "object": {
-    "pins": [
-      {
-        "package": "Keyboard",
-        "repositoryURL": "https://github.com/audiokit/Keyboard",
-        "state": {
-          "branch": "main",
-          "revision": "a19fd275871cbaa4f80b87e5566c1c1fc0560d7b",
-          "version": null
-        }
-      },
-      {
-        "package": "MIDIKit",
-        "repositoryURL": "https://github.com/orchetect/MIDIKit",
-        "state": {
-          "branch": null,
-          "revision": "80baa7a57debd6982389f03bb7c8634c291df7ef",
-          "version": "0.6.1"
-        }
-      },
-      {
-        "package": "TimecodeKit",
-        "repositoryURL": "https://github.com/orchetect/TimecodeKit",
-        "state": {
-          "branch": null,
-          "revision": "4159255c40aca9b99b327a1cf6a0ae75d4487e3c",
-          "version": "1.3.1"
-        }
+  "pins" : [
+    {
+      "identity" : "keyboard",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/audiokit/Keyboard",
+      "state" : {
+        "revision" : "fb589acbbb0854da0fa571ad83c4f1230c2cd280",
+        "version" : "1.3.6"
       }
-    ]
-  },
-  "version": 1
+    },
+    {
+      "identity" : "midikit",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/orchetect/MIDIKit",
+      "state" : {
+        "revision" : "b4947edd4c96760dbf1e9c7a686a69b5a30d44bf",
+        "version" : "0.9.5"
+      }
+    },
+    {
+      "identity" : "timecodekit",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/orchetect/TimecodeKit",
+      "state" : {
+        "revision" : "63ba241b35675a23802f0937c5b938e74e4f9aea",
+        "version" : "2.0.10"
+      }
+    }
+  ],
+  "version" : 2
 }
diff --git a/Sources/Tonic/Chord.swift b/Sources/Tonic/Chord.swift
@@ -284,7 +284,6 @@ extension Chord {
         return returnArray
     }
 
-
     /// Get chords from actual notes (spelling matters, C# F G# will not return a C# major)
     /// Use pitch set version of this function for all enharmonic chords
     /// The ranking is based on how low the root note of the chord appears, for example we