From 469764940e14ae33406a9c37197e349f53e33d5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Helge=20He=C3=9F?= Date: Wed, 1 Nov 2023 14:33:21 +0100 Subject: [PATCH 1/5] Proper quoting for xcconfig opts ... --- xcconfig/Base.xcconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xcconfig/Base.xcconfig b/xcconfig/Base.xcconfig index 0e58a0c..0a8d5c3 100644 --- a/xcconfig/Base.xcconfig +++ b/xcconfig/Base.xcconfig @@ -65,5 +65,5 @@ ENABLE_USER_SCRIPT_SANDBOXING = YES // New in Xcode 15? ENABLE_MODULE_VERIFIER = YES -MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++" -MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++14" +MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c" "objective-c++" +MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99" "gnu++14" From ace0adfa5db7927948924ab8143c64c6de442c5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Helge=20He=C3=9F?= Date: Mon, 6 Nov 2023 12:44:07 +0100 Subject: [PATCH 2/5] GHA: Use Xcode 15.0.1 ... --- .github/workflows/swift.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index bc54182..9bee337 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -26,7 +26,7 @@ jobs: - name: Select latest available Xcode uses: maxim-lobanov/setup-xcode@v1.2.1 with: - xcode-version: '15.0.0' + xcode-version: '15.0.1' - name: Checkout Repository uses: actions/checkout@v2 - name: Prerequisites @@ -56,7 +56,7 @@ jobs: - name: Select latest available Xcode uses: maxim-lobanov/setup-xcode@v1.2.1 with: - xcode-version: '15.0.0' + xcode-version: '15.0.1' - name: Checkout Repository uses: actions/checkout@v2 - name: Prerequisites From 7bd19dec1b6cc5d358b1f1a76c916df3bdf32e73 Mon Sep 17 00:00:00 2001 From: Martin Dufort Date: Thu, 14 Dec 2023 18:14:52 -0500 Subject: [PATCH 3/5] Properly define the package description Add .text variable to UXLabel --- Package.swift | 20 ++++++++++++-------- Package@swift-5.1.swift | 17 ----------------- Package@swift-5.swift | 14 -------------- Sources/UXKit/AppKit/UXView-AppKit.swift | 7 +++++++ 4 files changed, 19 insertions(+), 39 deletions(-) delete mode 100644 Package@swift-5.1.swift delete mode 100644 Package@swift-5.swift diff --git a/Package.swift b/Package.swift index eb1eb6a..2a2e82a 100644 --- a/Package.swift +++ b/Package.swift @@ -1,13 +1,17 @@ +// swift-tools-version:5.1 + import PackageDescription let package = Package( name: "UXKit", - - exclude: [ - "UXKit.xcodeproj", - "GNUmakefile", - "LICENSE", - "README.md", - "xcconfig" - ] + platforms: [ + .macOS(.v10_12), .iOS(.v10) + ], + products: [ + .library(name: "UXKit", targets: ["UXKit"]), + ], + dependencies: [], + targets: [ + .target(name:"UXKit") + ] ) diff --git a/Package@swift-5.1.swift b/Package@swift-5.1.swift deleted file mode 100644 index 2a2e82a..0000000 --- a/Package@swift-5.1.swift +++ /dev/null @@ -1,17 +0,0 @@ -// swift-tools-version:5.1 - -import PackageDescription - -let package = Package( - name: "UXKit", - platforms: [ - .macOS(.v10_12), .iOS(.v10) - ], - products: [ - .library(name: "UXKit", targets: ["UXKit"]), - ], - dependencies: [], - targets: [ - .target(name:"UXKit") - ] -) diff --git a/Package@swift-5.swift b/Package@swift-5.swift deleted file mode 100644 index 679dc5d..0000000 --- a/Package@swift-5.swift +++ /dev/null @@ -1,14 +0,0 @@ -// swift-tools-version:5.0 - -import PackageDescription - -let package = Package( - name: "UXKit", - products: [ - .library(name: "UXKit", targets: ["UXKit"]), - ], - dependencies: [], - targets: [ - .target(name:"UXKit") - ] -) diff --git a/Sources/UXKit/AppKit/UXView-AppKit.swift b/Sources/UXKit/AppKit/UXView-AppKit.swift index deee3a7..0acbf86 100644 --- a/Sources/UXKit/AppKit/UXView-AppKit.swift +++ b/Sources/UXKit/AppKit/UXView-AppKit.swift @@ -115,6 +115,13 @@ } + public extension UXLabel { + var text: String { + set { stringValue = newValue } + get { return stringValue } + } + } + public extension UXSpinner { /// Use this instead of `isDisplayedWhenStopped` for UIKit compatibility. var hidesWhenStopped : Bool { From 60f46b252a95f7f954813f2f60b62dbd1103a987 Mon Sep 17 00:00:00 2001 From: Martin Dufort Date: Fri, 15 Dec 2023 09:24:54 -0500 Subject: [PATCH 4/5] Add back files deleted by error --- Package@swift-5.1.swift | 17 +++++++++++++++++ Package@swift-5.swift | 14 ++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 Package@swift-5.1.swift create mode 100644 Package@swift-5.swift diff --git a/Package@swift-5.1.swift b/Package@swift-5.1.swift new file mode 100644 index 0000000..2a2e82a --- /dev/null +++ b/Package@swift-5.1.swift @@ -0,0 +1,17 @@ +// swift-tools-version:5.1 + +import PackageDescription + +let package = Package( + name: "UXKit", + platforms: [ + .macOS(.v10_12), .iOS(.v10) + ], + products: [ + .library(name: "UXKit", targets: ["UXKit"]), + ], + dependencies: [], + targets: [ + .target(name:"UXKit") + ] +) diff --git a/Package@swift-5.swift b/Package@swift-5.swift new file mode 100644 index 0000000..679dc5d --- /dev/null +++ b/Package@swift-5.swift @@ -0,0 +1,14 @@ +// swift-tools-version:5.0 + +import PackageDescription + +let package = Package( + name: "UXKit", + products: [ + .library(name: "UXKit", targets: ["UXKit"]), + ], + dependencies: [], + targets: [ + .target(name:"UXKit") + ] +) From e99ad62a01125ac57b0d8d2d1da5162cf3001c9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Helge=20He=C3=9F?= Date: Sat, 23 Dec 2023 17:02:56 +0100 Subject: [PATCH 5/5] Drop 5.1 tools version There is a specific 5.1 Package.swift. --- Package.swift | 3 --- 1 file changed, 3 deletions(-) diff --git a/Package.swift b/Package.swift index 2a2e82a..a9efeb2 100644 --- a/Package.swift +++ b/Package.swift @@ -1,5 +1,3 @@ -// swift-tools-version:5.1 - import PackageDescription let package = Package( @@ -10,7 +8,6 @@ let package = Package( products: [ .library(name: "UXKit", targets: ["UXKit"]), ], - dependencies: [], targets: [ .target(name:"UXKit") ]