Merge pull request #28 from AdaEngine/feature/tilemaps

Remove AdaBox2D
AdaEngine · Jun 4, 2024 · 2e149fd · 2e149fd
2 parents f5338a3 + 1e76d6d
commit 2e149fd
Show file tree

Hide file tree

Showing 14 changed files with 188 additions and 860 deletions.
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -115,7 +115,7 @@ ada_engine_deps = [
     "@libpng",
     "@SPIRV-Cross",
     ":SPIRVCompiler",
-    ":AdaBox2d",
+    "@swiftpkg_box2d_swift//:box2d",
     ":MiniAudioBindings"
 ]
 
@@ -135,13 +135,6 @@ cc_ada_library(
     ],
 )
 
-cc_ada_library(
-    name = "AdaBox2d",
-    deps = [
-        "@swiftpkg_box2d_swift//:box2d",
-    ],
-)
-
 # Swift Libraries
 
 swift_ada_library(
@@ -229,7 +222,7 @@ macos_application(
     name = "AdaEditor-macos",
     bundle_id = "org.adaengine.AdaEditor-macos",
     infoplists = ["Sources/AdaEditor/Platforms/macOS/Info.plist"],
-    minimum_os_version = "13.0",
+    minimum_os_version = "14.0",
     deps = [
         ":AdaEditor",
     ]
@@ -242,7 +235,7 @@ ios_application(
        "iphone", "ipad",
     ],
     infoplists = ["Sources/AdaEditor/Platforms/iOS/Info.plist"],
-    minimum_os_version = "14.0",
+    minimum_os_version = "16.0",
     deps = [
         ":AdaEditor",
     ]

diff --git a/Package.resolved b/Package.resolved
@@ -6,7 +6,7 @@
       "location" : "https://github.com/AdaEngine/box2d-swift",
       "state" : {
         "branch" : "main",
-        "revision" : "38c5c68cc7073638cce540599f79ebb257d0bd02"
+        "revision" : "6992c1b4269b52cf4cc3cd86ae16af471970c768"
       }
     },
     {

diff --git a/Package.swift b/Package.swift
@@ -154,7 +154,7 @@ var adaEngineDependencies: [Target.Dependency] = [
     "libpng",
     "SPIRV-Cross",
     "SPIRVCompiler",
-    "AdaBox2d",
+    .product(name: "box2d", package: "box2d-swift"),
     "AdaEngineMacros"
 //    "Vulkan"
 ]
@@ -236,13 +236,6 @@ targets += [
             "glslang"
         ],
         publicHeadersPath: "."
-    ),
-    .target(
-        name: "AdaBox2d",
-        dependencies: [
-            .product(name: "box2d", package: "box2d-swift")
-        ],
-        publicHeadersPath: "."
     )
 ]
 
@@ -269,8 +262,8 @@ let package = Package(
     name: "AdaEngine",
     defaultLocalization: "en",
     platforms: [
-        .iOS(.v14),
-        .macOS(.v13),
+        .iOS(.v16),
+        .macOS(.v14),
     ],
     products: products,
     dependencies: [],