diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index f4d4152272..7ddd4be256 100644 --- 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 index 7b1ca7ef2a..2f9c4a1f4d 100644 --- 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: "." )