Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
helje5 committed Dec 23, 2023
2 parents d7c4fd1 + e99ad62 commit 5c2e881
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/swift.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Select latest available Xcode
uses: maxim-lobanov/[email protected]
with:
xcode-version: '15.0.0'
xcode-version: '15.0.1'
- name: Checkout Repository
uses: actions/checkout@v2
- name: Prerequisites
Expand Down Expand Up @@ -56,7 +56,7 @@ jobs:
- name: Select latest available Xcode
uses: maxim-lobanov/[email protected]
with:
xcode-version: '15.0.0'
xcode-version: '15.0.1'
- name: Checkout Repository
uses: actions/checkout@v2
- name: Prerequisites
Expand Down
17 changes: 9 additions & 8 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@ 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"]),
],
targets: [
.target(name:"UXKit")
]
)
7 changes: 7 additions & 0 deletions Sources/UXKit/AppKit/UXView-AppKit.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions xcconfig/Base.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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"

0 comments on commit 5c2e881

Please sign in to comment.