Update SDL references to fix compilation order (#27)

fireblade-engine · Oct 20, 2024 · 9046b98 · 9046b98
1 parent dfe5be7
commit 9046b98
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml
@@ -11,10 +11,10 @@ jobs:
     runs-on: macOS-latest
     strategy:
       matrix:
-        xcode: ["14.2"]
+        xcode: ["14.3"]
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v4
 
       - name: Select Xcode ${{ matrix.xcode }}
         run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app

diff --git a/Package.resolved b/Package.resolved
@@ -15,17 +15,17 @@
         "repositoryURL": "https://github.com/fireblade-engine/math.git",
         "state": {
           "branch": null,
-          "revision": "65aa6b5045d8dd59bc8512b87ab4ec25a18dd82d",
-          "version": "0.11.0"
+          "revision": "d42d22cb727931cc17c15ba424b1eae5fde4dd96",
+          "version": "0.13.0"
         }
       },
       {
-        "package": "SDL2",
+        "package": "SDL",
         "repositoryURL": "https://github.com/ctreffs/SwiftSDL2.git",
         "state": {
           "branch": null,
-          "revision": "dc30ee99e4fb5bb4272bfed2e6336d6bc48d8aba",
-          "version": "1.3.1"
+          "revision": "30a2886bd68e43fc19ba29b63ffe230ac0e4db7a",
+          "version": "1.4.1"
         }
       }
     ]

diff --git a/Package.swift b/Package.swift
@@ -4,25 +4,25 @@ import PackageDescription
 let package = Package(
     name: "FirebladeECSDemo",
     platforms: [
-        .macOS(.v10_14),
+        .macOS(.v11),
         .iOS(.v11),
         .tvOS(.v11)
     ],
     dependencies: [
-        .package(name: "SDL2", url: "https://github.com/ctreffs/SwiftSDL2.git", from: "1.3.2"),
+        .package(name: "SDL", url: "https://github.com/ctreffs/SwiftSDL2.git", from: "1.4.1"),
         .package(name: "FirebladeECS", url: "https://github.com/fireblade-engine/ecs.git", from: "0.17.5"),
         .package(name: "FirebladeMath", url: "https://github.com/fireblade-engine/math.git", from: "0.13.0")
     ],
     targets: [
         .target(
             name: "SDLKit",
-            dependencies: ["SDL2"]),
+            dependencies: ["SDL"]),
         .target(
             name: "Particles",
-            dependencies: ["FirebladeECS", "SDL2", "SDLKit"]),
+            dependencies: ["FirebladeECS", "SDL", "SDLKit"]),
         .target(
             name: "Asteroids",
-            dependencies: ["FirebladeECS", "SDL2", "SDLKit", "FirebladeMath", "AsteroidsGameLibrary"],
+            dependencies: ["FirebladeECS", "SDL", "SDLKit", "FirebladeMath", "AsteroidsGameLibrary"],
             exclude: ["Resources/source.txt"],
             resources: [.copy("Resources/asteroid.wav"), .copy("Resources/ship.wav"), .copy("Resources/shoot.wav")]),
         .target(name: "AsteroidsGameLibrary",

diff --git a/Sources/Asteroids/EntityCreator.swift b/Sources/Asteroids/EntityCreator.swift
@@ -7,7 +7,7 @@
 
 import FirebladeECS
 import AsteroidsGameLibrary
-import SDL2
+import SDL
 
 final class EntityCreator {
     private let nexus: Nexus

diff --git a/Sources/Asteroids/Systems/AudioSystem.swift b/Sources/Asteroids/Systems/AudioSystem.swift
@@ -8,7 +8,7 @@
 
 import Dispatch
 import FirebladeECS
-import SDL2
+import SDL
 
 /// In-memory copy of a sound file. Currently these remain loaded forever to avoid audio dropouts.
 struct AudioData {

diff --git a/Sources/Asteroids/Timer.swift b/Sources/Asteroids/Timer.swift
@@ -5,7 +5,7 @@
 //  Created by Christian Treffs on 28.10.17.
 //
 
-import SDL2
+import SDL
 
 public struct Timer {
     private let countPerSecond: UInt64

diff --git a/Sources/Particles/Timer.swift b/Sources/Particles/Timer.swift
@@ -5,7 +5,7 @@
 //  Created by Christian Treffs on 28.10.17.
 //
 
-import SDL2
+import SDL
 
 public struct Timer {
     private let countPerSecond: UInt64

diff --git a/Sources/SDLKit/SDLKit.swift b/Sources/SDLKit/SDLKit.swift
@@ -3,7 +3,7 @@
 //
 
 import Foundation
-@_exported import SDL2
+@_exported import SDL
 
 protocol FlagsValue: RawRepresentable {
 }