From cd4fd815cd821d00e5ecc98fd7afa69df2ab1358 Mon Sep 17 00:00:00 2001 From: Nikita Konopelko Date: Wed, 20 Mar 2024 13:24:36 +0100 Subject: [PATCH] PrivacyInfo.xcprivacy, LICENSE added --- .github/workflows/Build_Test.yml | 28 ------------------- .swift-version | 1 - LICENSE | 2 +- Package.resolved | 8 +++--- Package.swift | 20 ++++++++++---- Package@swift-5.5.swift | 46 ++++++++++++++++++++++++++++++++ Package@swift-5.6.swift | 46 ++++++++++++++++++++++++++++++++ Package@swift-5.7.swift | 46 ++++++++++++++++++++++++++++++++ Package@swift-5.8.swift | 46 ++++++++++++++++++++++++++++++++ PrivacyInfo.xcprivacy | 8 ++++++ Source/Atomic.swift | 2 +- TestHelpers/FakeMutexing.swift | 4 +-- TestHelpers/FakeQueue.swift | 4 +-- 13 files changed, 217 insertions(+), 44 deletions(-) delete mode 100644 .github/workflows/Build_Test.yml delete mode 100644 .swift-version create mode 100644 Package@swift-5.5.swift create mode 100644 Package@swift-5.6.swift create mode 100644 Package@swift-5.7.swift create mode 100644 Package@swift-5.8.swift create mode 100644 PrivacyInfo.xcprivacy diff --git a/.github/workflows/Build_Test.yml b/.github/workflows/Build_Test.yml deleted file mode 100644 index d511113..0000000 --- a/.github/workflows/Build_Test.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: Build-Test - -on: - push: -# branches: -# - main - tags: - - '**' - -jobs: - build: - name: Swift ${{ matrix.swift }} on ${{ matrix.os }} - strategy: - matrix: - os: [macos-latest] - swift: ["5.7"] - runs-on: ${{ matrix.os }} - steps: - - uses: fwal/setup-swift@v1 - with: - swift-version: ${{ matrix.swift }} - - name: Get swift version - run: swift --version - - uses: actions/checkout@v3 - - name: Build - run: swift build - - name: Run tests - run: swift test diff --git a/.swift-version b/.swift-version deleted file mode 100644 index 3659ea2..0000000 --- a/.swift-version +++ /dev/null @@ -1 +0,0 @@ -5.8 diff --git a/LICENSE b/LICENSE index 4b25097..0ff1110 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2021 Nikita Konopelko +Copyright (c) 2021 Mykyta Konopelko Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Package.resolved b/Package.resolved index f8735c0..d7d573c 100644 --- a/Package.resolved +++ b/Package.resolved @@ -14,8 +14,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/mattgallagher/CwlPreconditionTesting.git", "state" : { - "revision" : "a23ded2c91df9156628a6996ab4f347526f17b6b", - "version" : "2.1.2" + "revision" : "2ef56b2caf25f55fa7eef8784c30d5a767550f54", + "version" : "2.2.1" } }, { @@ -23,8 +23,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/NikSativa/NSpry.git", "state" : { - "revision" : "cee2487470f8d660f8cb961f5c6de04ac3ddec3d", - "version" : "2.1.0" + "revision" : "2bd07efd49af15a1afd1e44ea9212383c55d3a31", + "version" : "2.1.4" } } ], diff --git a/Package.swift b/Package.swift index e214f0a..641a8e2 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.6 +// swift-tools-version:5.9 // swiftformat:disable all import PackageDescription @@ -6,26 +6,36 @@ let package = Package( name: "NQueue", platforms: [ .iOS(.v13), - .macOS(.v11) + .macOS(.v11), + .macCatalyst(.v13), + .visionOS(.v1), + .tvOS(.v13), + .watchOS(.v6) ], products: [ .library(name: "NQueue", targets: ["NQueue"]), .library(name: "NQueueTestHelpers", targets: ["NQueueTestHelpers"]) ], dependencies: [ - .package(url: "https://github.com/NikSativa/NSpry.git", .upToNextMajor(from: "2.1.0")) + .package(url: "https://github.com/NikSativa/NSpry.git", .upToNextMajor(from: "2.1.4")) ], targets: [ .target(name: "NQueue", dependencies: [ ], - path: "Source"), + path: "Source", + resources: [ + .copy("../PrivacyInfo.xcprivacy") + ]), .target(name: "NQueueTestHelpers", dependencies: [ "NQueue", "NSpry" ], - path: "TestHelpers"), + path: "TestHelpers", + resources: [ + .copy("../PrivacyInfo.xcprivacy") + ]), .testTarget(name: "NQueueTests", dependencies: [ "NQueue", diff --git a/Package@swift-5.5.swift b/Package@swift-5.5.swift new file mode 100644 index 0000000..07985da --- /dev/null +++ b/Package@swift-5.5.swift @@ -0,0 +1,46 @@ +// swift-tools-version:5.5 +// swiftformat:disable all +import PackageDescription + +let package = Package( + name: "NQueue", + platforms: [ + .iOS(.v13), + .macOS(.v11), + .macCatalyst(.v13), + .tvOS(.v13), + .watchOS(.v6) + ], + products: [ + .library(name: "NQueue", targets: ["NQueue"]), + .library(name: "NQueueTestHelpers", targets: ["NQueueTestHelpers"]) + ], + dependencies: [ + .package(url: "https://github.com/NikSativa/NSpry.git", .upToNextMajor(from: "2.1.4")) + ], + targets: [ + .target(name: "NQueue", + dependencies: [ + ], + path: "Source", + resources: [ + .copy("../PrivacyInfo.xcprivacy") + ]), + .target(name: "NQueueTestHelpers", + dependencies: [ + "NQueue", + "NSpry" + ], + path: "TestHelpers", + resources: [ + .copy("../PrivacyInfo.xcprivacy") + ]), + .testTarget(name: "NQueueTests", + dependencies: [ + "NQueue", + "NQueueTestHelpers", + "NSpry" + ], + path: "Tests") + ] +) diff --git a/Package@swift-5.6.swift b/Package@swift-5.6.swift new file mode 100644 index 0000000..a45a4ef --- /dev/null +++ b/Package@swift-5.6.swift @@ -0,0 +1,46 @@ +// swift-tools-version:5.6 +// swiftformat:disable all +import PackageDescription + +let package = Package( + name: "NQueue", + platforms: [ + .iOS(.v13), + .macOS(.v11), + .macCatalyst(.v13), + .tvOS(.v13), + .watchOS(.v6) + ], + products: [ + .library(name: "NQueue", targets: ["NQueue"]), + .library(name: "NQueueTestHelpers", targets: ["NQueueTestHelpers"]) + ], + dependencies: [ + .package(url: "https://github.com/NikSativa/NSpry.git", .upToNextMajor(from: "2.1.4")) + ], + targets: [ + .target(name: "NQueue", + dependencies: [ + ], + path: "Source", + resources: [ + .copy("../PrivacyInfo.xcprivacy") + ]), + .target(name: "NQueueTestHelpers", + dependencies: [ + "NQueue", + "NSpry" + ], + path: "TestHelpers", + resources: [ + .copy("../PrivacyInfo.xcprivacy") + ]), + .testTarget(name: "NQueueTests", + dependencies: [ + "NQueue", + "NQueueTestHelpers", + "NSpry" + ], + path: "Tests") + ] +) diff --git a/Package@swift-5.7.swift b/Package@swift-5.7.swift new file mode 100644 index 0000000..9f38882 --- /dev/null +++ b/Package@swift-5.7.swift @@ -0,0 +1,46 @@ +// swift-tools-version:5.7 +// swiftformat:disable all +import PackageDescription + +let package = Package( + name: "NQueue", + platforms: [ + .iOS(.v13), + .macOS(.v11), + .macCatalyst(.v13), + .tvOS(.v13), + .watchOS(.v6) + ], + products: [ + .library(name: "NQueue", targets: ["NQueue"]), + .library(name: "NQueueTestHelpers", targets: ["NQueueTestHelpers"]) + ], + dependencies: [ + .package(url: "https://github.com/NikSativa/NSpry.git", .upToNextMajor(from: "2.1.4")) + ], + targets: [ + .target(name: "NQueue", + dependencies: [ + ], + path: "Source", + resources: [ + .copy("../PrivacyInfo.xcprivacy") + ]), + .target(name: "NQueueTestHelpers", + dependencies: [ + "NQueue", + "NSpry" + ], + path: "TestHelpers", + resources: [ + .copy("../PrivacyInfo.xcprivacy") + ]), + .testTarget(name: "NQueueTests", + dependencies: [ + "NQueue", + "NQueueTestHelpers", + "NSpry" + ], + path: "Tests") + ] +) diff --git a/Package@swift-5.8.swift b/Package@swift-5.8.swift new file mode 100644 index 0000000..14ab857 --- /dev/null +++ b/Package@swift-5.8.swift @@ -0,0 +1,46 @@ +// swift-tools-version:5.8 +// swiftformat:disable all +import PackageDescription + +let package = Package( + name: "NQueue", + platforms: [ + .iOS(.v13), + .macOS(.v11), + .macCatalyst(.v13), + .tvOS(.v13), + .watchOS(.v6) + ], + products: [ + .library(name: "NQueue", targets: ["NQueue"]), + .library(name: "NQueueTestHelpers", targets: ["NQueueTestHelpers"]) + ], + dependencies: [ + .package(url: "https://github.com/NikSativa/NSpry.git", .upToNextMajor(from: "2.1.4")) + ], + targets: [ + .target(name: "NQueue", + dependencies: [ + ], + path: "Source", + resources: [ + .copy("../PrivacyInfo.xcprivacy") + ]), + .target(name: "NQueueTestHelpers", + dependencies: [ + "NQueue", + "NSpry" + ], + path: "TestHelpers", + resources: [ + .copy("../PrivacyInfo.xcprivacy") + ]), + .testTarget(name: "NQueueTests", + dependencies: [ + "NQueue", + "NQueueTestHelpers", + "NSpry" + ], + path: "Tests") + ] +) diff --git a/PrivacyInfo.xcprivacy b/PrivacyInfo.xcprivacy new file mode 100644 index 0000000..cfbe279 --- /dev/null +++ b/PrivacyInfo.xcprivacy @@ -0,0 +1,8 @@ + + + + + NSPrivacyTracking + + + diff --git a/Source/Atomic.swift b/Source/Atomic.swift index 0f4a561..31cda35 100644 --- a/Source/Atomic.swift +++ b/Source/Atomic.swift @@ -37,7 +37,7 @@ public enum Mutex { } public static var `default`: Mutexing { - return Self.pthread(.recursive) + return pthread(.recursive) } } diff --git a/TestHelpers/FakeMutexing.swift b/TestHelpers/FakeMutexing.swift index 9ac2596..e40badf 100644 --- a/TestHelpers/FakeMutexing.swift +++ b/TestHelpers/FakeMutexing.swift @@ -16,14 +16,14 @@ final class FakeMutexing: Mutexing, Spryable { func sync(execute work: () throws -> R) rethrows -> R { if shouldFireClosures { - return spryify(fallbackValue: try work()) + return try spryify(fallbackValue: work()) } return spryify() } func trySync(execute work: () throws -> R) rethrows -> R { if shouldFireClosures { - return spryify(fallbackValue: try work()) + return try spryify(fallbackValue: work()) } return spryify() } diff --git a/TestHelpers/FakeQueue.swift b/TestHelpers/FakeQueue.swift index a5eaeff..6474f6b 100644 --- a/TestHelpers/FakeQueue.swift +++ b/TestHelpers/FakeQueue.swift @@ -52,7 +52,7 @@ final class FakeQueueable: Queueable, Spryable { func sync(flags: Queue.Flags, execute work: () throws -> T) rethrows -> T { if shouldFireSyncClosures { - return spryify(arguments: flags, fallbackValue: try work()) + return try spryify(arguments: flags, fallbackValue: work()) } return spryify(arguments: flags) @@ -60,7 +60,7 @@ final class FakeQueueable: Queueable, Spryable { func sync(execute work: () throws -> T) rethrows -> T { if shouldFireSyncClosures { - return spryify(fallbackValue: try work()) + return try spryify(fallbackValue: work()) } return spryify()