Merge branch 'nlohmann:develop' into feature/sapitskiy/spm-support

nlohmann · Oct 11, 2023 · b87c908 · b87c908
2 parents d2bb17d + edffad0
commit b87c908
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -29,6 +29,7 @@ jobs:
         uses: egor-tensin/setup-mingw@v2
         with:
           platform: ${{ matrix.architecture }}
+          version: 12.2.0 # https://github.com/egor-tensin/setup-mingw/issues/14
       - name: Run CMake
         run: cmake -S . -B build -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=Debug -DJSON_BuildTests=On
       - name: Build

diff --git a/Package.swift b/Package.swift
@@ -6,14 +6,14 @@ import PackageDescription
 let package = Package(
     name: "nlohmann-json",
      platforms: [
-        .iOS(.v11), .macOS(.v10_13), .tvOS(.v11), .watchOS(.v4)
+        .iOS(.v12), .macOS(.v10_13), .tvOS(.v12), .watchOS(.v4)
     ],
     products: [
-        .library(name: "nlohmann-json", targets: ["nlohmann-json"])
+        .library(name: "json", targets: ["json"])
     ],
     targets: [
         .target(
-            name: "nlohmann-json",
+            name: "json",
             path: "single_include/nlohmann",
             publicHeadersPath: "."
         )