From ff807dfc844112e1162848b32a5a0258a597544e Mon Sep 17 00:00:00 2001 From: Enes Karaosman Date: Wed, 10 Apr 2024 14:41:42 +0300 Subject: [PATCH 1/3] feat: add macOS-12+ support --- Example/Example.xcodeproj/project.pbxproj | 4 ++-- .../xcshareddata/swiftpm/Package.resolved | 4 ++-- Package.swift | 10 ++++------ Sources/JSONDrivenUI/ViewProperties.swift | 1 - 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/Example/Example.xcodeproj/project.pbxproj b/Example/Example.xcodeproj/project.pbxproj index a675a6d..363b7b6 100644 --- a/Example/Example.xcodeproj/project.pbxproj +++ b/Example/Example.xcodeproj/project.pbxproj @@ -292,7 +292,7 @@ CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_ASSET_PATHS = "\"Example/Preview Content\""; - DEVELOPMENT_TEAM = 7S68257G8H; + DEVELOPMENT_TEAM = L9DND36YTU; ENABLE_HARDENED_RUNTIME = YES; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; @@ -331,7 +331,7 @@ CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_ASSET_PATHS = "\"Example/Preview Content\""; - DEVELOPMENT_TEAM = 7S68257G8H; + DEVELOPMENT_TEAM = L9DND36YTU; ENABLE_HARDENED_RUNTIME = YES; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; diff --git a/Example/Example.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Example/Example.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index b44ac6d..349b976 100644 --- a/Example/Example.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Example/Example.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -5,8 +5,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/onevcat/Kingfisher.git", "state" : { - "revision" : "add0a87ec4e31e2ca2a0b2085f0559201e4f5918", - "version" : "7.10.1" + "revision" : "5b92f029fab2cce44386d28588098b5be0824ef5", + "version" : "7.11.0" } } ], diff --git a/Package.swift b/Package.swift index 3056996..ec6dfa4 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.3 +// swift-tools-version:5.8 // The swift-tools-version declares the minimum version of Swift required to build this package. import PackageDescription @@ -6,20 +6,18 @@ import PackageDescription let package = Package( name: "JSONDrivenUI", platforms: [ - .iOS(.v14) + .iOS(.v14), + .macOS(.v12) ], products: [ - // Products define the executables and libraries a package produces, and make them visible to other packages. .library( name: "JSONDrivenUI", targets: ["JSONDrivenUI"]), ], dependencies: [ - .package(url: "https://github.com/onevcat/Kingfisher.git", from: "7.10.1"), + .package(url: "https://github.com/onevcat/Kingfisher.git", from: "7.11.0"), ], targets: [ - // Targets are the basic building blocks of a package. A target can define a module or a test suite. - // Targets can depend on other targets in this package, and on products in packages this package depends on. .target( name: "JSONDrivenUI", dependencies: [ diff --git a/Sources/JSONDrivenUI/ViewProperties.swift b/Sources/JSONDrivenUI/ViewProperties.swift index ea27fdf..5c2265d 100644 --- a/Sources/JSONDrivenUI/ViewProperties.swift +++ b/Sources/JSONDrivenUI/ViewProperties.swift @@ -5,7 +5,6 @@ // Created by Enes Karaosman on 27.11.2020. // -import UIKit import SwiftUI internal class ViewProperties: Codable { From c74bacad8f061863909115cad78631e55646f073 Mon Sep 17 00:00:00 2001 From: Enes Karaosman Date: Wed, 10 Apr 2024 14:43:29 +0300 Subject: [PATCH 2/3] Create swift.yml --- .github/workflows/swift.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .github/workflows/swift.yml diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml new file mode 100644 index 0000000..878da47 --- /dev/null +++ b/.github/workflows/swift.yml @@ -0,0 +1,24 @@ +name: Swift + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build: + + runs-on: macos-14 + + steps: + - uses: actions/checkout@v4 + + - name: List Xcode installations + run: sudo ls -1 /Applications | grep "Xcode" + + - name: Select Xcode 15.2 + run: sudo xcode-select -s /Applications/Xcode_15.2.app/Contents/Developer + + - name: Build + run: swift build -v From 24dcafdafc446d04294ff2e16fb9f2769f5680c2 Mon Sep 17 00:00:00 2001 From: Enes Karaosman Date: Wed, 10 Apr 2024 14:44:17 +0300 Subject: [PATCH 3/3] Update swift.yml --- .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 878da47..8287937 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -2,9 +2,9 @@ name: Swift on: push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] jobs: build: