diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index dd6abd6fe..8f2d8d30d 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -1,6 +1,8 @@ name: Deploy on TestFlight on: + schedule: + - cron: "0 6 1 * *" workflow_dispatch: inputs: bump_type: diff --git a/CHANGELOG.md b/CHANGELOG.md index 28ed7ec96..71fd96974 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ This project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased] +## [Version 2.4.59, Build 1580410537] - 2023-08-19Z + +- Implement iconify icons +- Update Kingfisher to fix build issue + ## [Version 2.4.58, Build 1580410536] - 2023-05-31Z - Implement forceAsItem support for Charts in Sitemaps diff --git a/OpenHABCore/Sources/OpenHABCore/Util/Endpoint.swift b/OpenHABCore/Sources/OpenHABCore/Util/Endpoint.swift index 29fb5fe39..b00ebedb6 100644 --- a/OpenHABCore/Sources/OpenHABCore/Util/Endpoint.swift +++ b/OpenHABCore/Sources/OpenHABCore/Util/Endpoint.swift @@ -148,7 +148,7 @@ public extension Endpoint { } static func icon(rootUrl: String, version: Int, icon: String?, state: String, iconType: IconType) -> Endpoint { - guard let icon, !icon.isEmpty else { + guard var icon, !icon.isEmpty else { return Endpoint(baseURL: "", path: "", queryItems: []) } @@ -157,6 +157,27 @@ public extension Endpoint { var queryItems = [ URLQueryItem(name: "state", value: state) ] + if version >= 4 { + let components = icon.components(separatedBy: ":") + var source = "" + var set = "" + if components.count == 3 { + source = components[0] + set = components[1] + icon = components[2] + } else if components.count == 2 { + source = components[0] + set = "classic" + icon = components[2] + } + if source == "if" || source == "iconify" { + return Endpoint( + baseURL: "https://api.iconify.design/", + path: "/\(set)/\(icon).svg", + queryItems: [URLQueryItem(name: "height", value: "64")] + ) + } + } if version >= 3 { queryItems.append(contentsOf: [ URLQueryItem(name: "format", value: (iconType == .png) ? "PNG" : "SVG"), diff --git a/fastlane/Fastfile b/fastlane/Fastfile index d44df67b3..e5d21fa7b 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -71,9 +71,8 @@ platform :ios do end desc 'Build beta' - lane :beta do |options| - # check the semantic parameter entered - raise 'No bump type defined! Use one of: patch | minor | major'.red unless options[:bump] + lane :beta do |options| + options[:bump] = options[:bump] != nil ? options[:bump] : "patch" if is_ci? current_branch = ENV["BRANCH_NAME"] diff --git a/openHAB.xcodeproj/project.pbxproj b/openHAB.xcodeproj/project.pbxproj index 3fe6531cd..fefcaaaad 100644 --- a/openHAB.xcodeproj/project.pbxproj +++ b/openHAB.xcodeproj/project.pbxproj @@ -1517,7 +1517,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1580410536; + CURRENT_PROJECT_VERSION = 1580410537; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = PBAPXHRAM9; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -1531,7 +1531,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 2.4.58; + MARKETING_VERSION = 2.4.59; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = es.spaphone.openhab.openHABIntents; @@ -1560,7 +1560,7 @@ CODE_SIGN_IDENTITY = "iPhone Distribution"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1580410536; + CURRENT_PROJECT_VERSION = 1580410537; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = PBAPXHRAM9; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -1573,7 +1573,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 2.4.58; + MARKETING_VERSION = 2.4.59; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = es.spaphone.openhab.openHABIntents; @@ -1619,6 +1619,7 @@ CURRENT_PROJECT_VERSION = 1580410531; CURRENT_PROJECT_VERSION = 1580410532; CURRENT_PROJECT_VERSION = 1580410536; + CURRENT_PROJECT_VERSION = 1580410537; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = PBAPXHRAM9; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -1648,6 +1649,7 @@ MARKETING_VERSION = 2.4.56; MARKETING_VERSION = 2.4.57; MARKETING_VERSION = 2.4.58; + MARKETING_VERSION = 2.4.59; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = es.spaphone.openHABUITests; @@ -1697,6 +1699,7 @@ CURRENT_PROJECT_VERSION = 1580410531; CURRENT_PROJECT_VERSION = 1580410532; CURRENT_PROJECT_VERSION = 1580410536; + CURRENT_PROJECT_VERSION = 1580410537; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = PBAPXHRAM9; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -1726,6 +1729,7 @@ MARKETING_VERSION = 2.4.56; MARKETING_VERSION = 2.4.57; MARKETING_VERSION = 2.4.58; + MARKETING_VERSION = 2.4.59; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = es.spaphone.openHABUITests; @@ -1992,7 +1996,7 @@ CURRENT_PROJECT_VERSION = 1580410446; CURRENT_PROJECT_VERSION = 1580410455; "CODE_SIGN_STYLE[sdk=*]" = Automatic; - CURRENT_PROJECT_VERSION = 1580410536; + CURRENT_PROJECT_VERSION = 1580410537; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = PBAPXHRAM9; GCC_C_LANGUAGE_STANDARD = "compiler-default"; @@ -2005,7 +2009,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 2.4.58; + MARKETING_VERSION = 2.4.59; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = es.spaphone.openhab.watchkitapp; @@ -2058,6 +2062,7 @@ CURRENT_PROJECT_VERSION = 1580410531; CURRENT_PROJECT_VERSION = 1580410532; CURRENT_PROJECT_VERSION = 1580410536; + CURRENT_PROJECT_VERSION = 1580410537; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = PBAPXHRAM9; GCC_C_LANGUAGE_STANDARD = "compiler-default"; @@ -2070,7 +2075,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 2.4.58; + MARKETING_VERSION = 2.4.59; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = es.spaphone.openhab.watchkitapp; @@ -2263,6 +2268,7 @@ CURRENT_PROJECT_VERSION = 1580410531; CURRENT_PROJECT_VERSION = 1580410532; CURRENT_PROJECT_VERSION = 1580410536; + CURRENT_PROJECT_VERSION = 1580410537; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = PBAPXHRAM9; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -2292,6 +2298,7 @@ MARKETING_VERSION = 2.4.56; MARKETING_VERSION = 2.4.57; MARKETING_VERSION = 2.4.58; + MARKETING_VERSION = 2.4.59; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.reg-labs.openHABTestsSwift"; @@ -2342,6 +2349,7 @@ CURRENT_PROJECT_VERSION = 1580410531; CURRENT_PROJECT_VERSION = 1580410532; CURRENT_PROJECT_VERSION = 1580410536; + CURRENT_PROJECT_VERSION = 1580410537; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = PBAPXHRAM9; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -2371,6 +2379,7 @@ MARKETING_VERSION = 2.4.56; MARKETING_VERSION = 2.4.57; MARKETING_VERSION = 2.4.58; + MARKETING_VERSION = 2.4.59; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.reg-labs.openHABTestsSwift"; @@ -2532,6 +2541,7 @@ CURRENT_PROJECT_VERSION = 1580410531; CURRENT_PROJECT_VERSION = 1580410532; CURRENT_PROJECT_VERSION = 1580410536; + CURRENT_PROJECT_VERSION = 1580410537; DEAD_CODE_STRIPPING = NO; DEVELOPMENT_TEAM = PBAPXHRAM9; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -2566,6 +2576,7 @@ MARKETING_VERSION = 2.4.56; MARKETING_VERSION = 2.4.57; MARKETING_VERSION = 2.4.58; + MARKETING_VERSION = 2.4.59; OTHER_SWIFT_FLAGS = "$(inherited) -DDEBUG -Xfrontend -warn-long-expression-type-checking=200 -Xfrontend -warn-long-function-bodies=200"; PRODUCT_BUNDLE_IDENTIFIER = es.spaphone.openhab; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -2599,7 +2610,7 @@ CODE_SIGN_IDENTITY = "Apple Distribution"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1580410536; + CURRENT_PROJECT_VERSION = 1580410537; DEAD_CODE_STRIPPING = NO; DEVELOPMENT_TEAM = PBAPXHRAM9; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -2634,6 +2645,7 @@ MARKETING_VERSION = 2.4.56; MARKETING_VERSION = 2.4.57; MARKETING_VERSION = 2.4.58; + MARKETING_VERSION = 2.4.59; PRODUCT_BUNDLE_IDENTIFIER = es.spaphone.openhab; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; diff --git a/openHAB.xcworkspace/xcshareddata/swiftpm/Package.resolved b/openHAB.xcworkspace/xcshareddata/swiftpm/Package.resolved index d6c4f01a7..210d96852 100644 --- a/openHAB.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/openHAB.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -141,8 +141,8 @@ "repositoryURL": "https://github.com/onevcat/Kingfisher.git", "state": { "branch": null, - "revision": "318e319998bf555c3e914d5c3adb6da05af86a32", - "version": "7.1.1" + "revision": "c1f60c63f356d364f4284ba82961acbe7de79bcc", + "version": "7.8.1" } }, {