From ef718ef5260918596c328e6bfb0a48f0a37aca23 Mon Sep 17 00:00:00 2001 From: Dan Cunningham Date: Tue, 9 Jul 2024 16:27:29 -0700 Subject: [PATCH] remove Fuzi library Signed-off-by: Dan Cunningham --- OpenHABCore/Package.swift | 2 -- .../OpenHABCore/Model/OpenHABItem.swift | 1 - .../OpenHABCore/Model/OpenHABSitemap.swift | 1 - .../Model/OpenHABSitemapPage.swift | 1 - .../OpenHABCore/Model/OpenHABWidget.swift | 1 - .../Model/OpenHABWidgetMapping.swift | 1 - openHAB.xcodeproj/project.pbxproj | 25 ------------------- .../xcshareddata/swiftpm/Package.resolved | 9 ------- .../OpenHABDrawerTableViewController.swift | 1 - openHAB/OpenHABSitemapViewController.swift | 1 - openHAB/legal.rtf | 9 ++----- .../Model/ObservableOpenHABSitemapPage.swift | 1 - .../Model/ObservableOpenHABWidget.swift | 1 - 13 files changed, 2 insertions(+), 52 deletions(-) diff --git a/OpenHABCore/Package.swift b/OpenHABCore/Package.swift index 76824e4af..8363eda5b 100644 --- a/OpenHABCore/Package.swift +++ b/OpenHABCore/Package.swift @@ -16,7 +16,6 @@ let package = Package( dependencies: [ // Dependencies declare other packages that this package depends on. .package(name: "Alamofire", url: "https://github.com/Alamofire/Alamofire.git", from: "5.0.0"), - .package(name: "Fuzi", url: "https://github.com/cezheng/Fuzi.git", from: "3.0.0"), .package(name: "Kingfisher", url: "https://github.com/onevcat/Kingfisher.git", from: "7.0.0") ], targets: [ @@ -26,7 +25,6 @@ let package = Package( name: "OpenHABCore", dependencies: [ .product(name: "Alamofire", package: "Alamofire", condition: .when(platforms: [.iOS, .watchOS])), - .product(name: "Fuzi", package: "Fuzi", condition: .when(platforms: [.iOS, .watchOS])), .product(name: "Kingfisher", package: "Kingfisher", condition: .when(platforms: [.iOS, .watchOS])) ] ), diff --git a/OpenHABCore/Sources/OpenHABCore/Model/OpenHABItem.swift b/OpenHABCore/Sources/OpenHABCore/Model/OpenHABItem.swift index 864a11874..f759251bb 100644 --- a/OpenHABCore/Sources/OpenHABCore/Model/OpenHABItem.swift +++ b/OpenHABCore/Sources/OpenHABCore/Model/OpenHABItem.swift @@ -10,7 +10,6 @@ // SPDX-License-Identifier: EPL-2.0 import CoreLocation -import Fuzi import os.log import UIKit diff --git a/OpenHABCore/Sources/OpenHABCore/Model/OpenHABSitemap.swift b/OpenHABCore/Sources/OpenHABCore/Model/OpenHABSitemap.swift index 03b7390a1..1eaeda6b6 100644 --- a/OpenHABCore/Sources/OpenHABCore/Model/OpenHABSitemap.swift +++ b/OpenHABCore/Sources/OpenHABCore/Model/OpenHABSitemap.swift @@ -10,7 +10,6 @@ // SPDX-License-Identifier: EPL-2.0 import Foundation -import Fuzi // The OpenHAB REST API returns either a value (eg. String, Int, Double...) or false (not null). // Inspired by https://stackoverflow.com/questions/52836448/decodable-value-string-or-bool diff --git a/OpenHABCore/Sources/OpenHABCore/Model/OpenHABSitemapPage.swift b/OpenHABCore/Sources/OpenHABCore/Model/OpenHABSitemapPage.swift index 8013f06bb..bc16248ad 100644 --- a/OpenHABCore/Sources/OpenHABCore/Model/OpenHABSitemapPage.swift +++ b/OpenHABCore/Sources/OpenHABCore/Model/OpenHABSitemapPage.swift @@ -10,7 +10,6 @@ // SPDX-License-Identifier: EPL-2.0 import Foundation -import Fuzi import os.log public class OpenHABSitemapPage: NSObject { diff --git a/OpenHABCore/Sources/OpenHABCore/Model/OpenHABWidget.swift b/OpenHABCore/Sources/OpenHABCore/Model/OpenHABWidget.swift index 1b8847144..44773b735 100644 --- a/OpenHABCore/Sources/OpenHABCore/Model/OpenHABWidget.swift +++ b/OpenHABCore/Sources/OpenHABCore/Model/OpenHABWidget.swift @@ -11,7 +11,6 @@ import Alamofire import Foundation -import Fuzi import MapKit import os.log diff --git a/OpenHABCore/Sources/OpenHABCore/Model/OpenHABWidgetMapping.swift b/OpenHABCore/Sources/OpenHABCore/Model/OpenHABWidgetMapping.swift index 784107f77..a899bc90a 100644 --- a/OpenHABCore/Sources/OpenHABCore/Model/OpenHABWidgetMapping.swift +++ b/OpenHABCore/Sources/OpenHABCore/Model/OpenHABWidgetMapping.swift @@ -10,7 +10,6 @@ // SPDX-License-Identifier: EPL-2.0 import Foundation -import Fuzi public class OpenHABWidgetMapping: NSObject, Decodable { public var command = "" diff --git a/openHAB.xcodeproj/project.pbxproj b/openHAB.xcodeproj/project.pbxproj index 1809a6104..fd6457494 100644 --- a/openHAB.xcodeproj/project.pbxproj +++ b/openHAB.xcodeproj/project.pbxproj @@ -36,13 +36,11 @@ 937C8B0C2800A738009C055E /* Intents.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = 935D340A257B7DC00020A404 /* Intents.intentdefinition */; }; 937E4471270B36D000A98C26 /* OpenHABCore in Frameworks */ = {isa = PBXBuildFile; productRef = 937E4470270B36D000A98C26 /* OpenHABCore */; }; 937E4473270B36DD00A98C26 /* OpenHABCore in Frameworks */ = {isa = PBXBuildFile; productRef = 937E4472270B36DD00A98C26 /* OpenHABCore */; }; - 937E4482270B378F00A98C26 /* Fuzi in Frameworks */ = {isa = PBXBuildFile; productRef = 937E4481270B378F00A98C26 /* Fuzi */; }; 937E4485270B379900A98C26 /* DeviceKit in Frameworks */ = {isa = PBXBuildFile; productRef = 937E4484270B379900A98C26 /* DeviceKit */; }; 937E4488270B37A600A98C26 /* Kingfisher in Frameworks */ = {isa = PBXBuildFile; productRef = 937E4487270B37A600A98C26 /* Kingfisher */; }; 937E448C270B37CA00A98C26 /* Kingfisher in Frameworks */ = {isa = PBXBuildFile; productRef = 937E448B270B37CA00A98C26 /* Kingfisher */; }; 937E448E270B37D200A98C26 /* DeviceKit in Frameworks */ = {isa = PBXBuildFile; productRef = 937E448D270B37D200A98C26 /* DeviceKit */; }; 937E4492270B37FE00A98C26 /* Kingfisher in Frameworks */ = {isa = PBXBuildFile; productRef = 937E4491270B37FE00A98C26 /* Kingfisher */; }; - 937E4494270B380500A98C26 /* Fuzi in Frameworks */ = {isa = PBXBuildFile; productRef = 937E4493270B380500A98C26 /* Fuzi */; }; 937E44E2270B393C00A98C26 /* OpenHABCore in Frameworks */ = {isa = PBXBuildFile; productRef = 937E44E1270B393C00A98C26 /* OpenHABCore */; }; 938620C0257E223C00A63200 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 938BF9C824EFCCC000E6B52F /* Localizable.strings */; }; 938BF89624EFBC5400E6B52F /* LocalizationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 938BF89524EFBC5400E6B52F /* LocalizationTests.swift */; }; @@ -493,7 +491,6 @@ buildActionMask = 2147483647; files = ( 937E4492270B37FE00A98C26 /* Kingfisher in Frameworks */, - 937E4494270B380500A98C26 /* Fuzi in Frameworks */, 937E44E2270B393C00A98C26 /* OpenHABCore in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -530,7 +527,6 @@ DFB2622F18830A3600D3244D /* UIKit.framework in Frameworks */, 93F8064A27AE7A2E0035A6B0 /* FlexColorPicker in Frameworks */, 93F8063227AE6B940035A6B0 /* AlamofireNetworkActivityIndicator in Frameworks */, - 937E4482270B378F00A98C26 /* Fuzi in Frameworks */, 93F8065327AE7B580035A6B0 /* SVGKit in Frameworks */, DA28C362225241DE00AB409C /* WebKit.framework in Frameworks */, 93F8061B27AE615D0035A6B0 /* Alamofire in Frameworks */, @@ -1034,7 +1030,6 @@ name = openHABIntents; packageProductDependencies = ( 937E4491270B37FE00A98C26 /* Kingfisher */, - 937E4493270B380500A98C26 /* Fuzi */, 937E44E1270B393C00A98C26 /* OpenHABCore */, ); productName = openHABIntents; @@ -1144,7 +1139,6 @@ name = openHAB; packageProductDependencies = ( 937E4470270B36D000A98C26 /* OpenHABCore */, - 937E4481270B378F00A98C26 /* Fuzi */, 937E4484270B379900A98C26 /* DeviceKit */, 937E4487270B37A600A98C26 /* Kingfisher */, 93F8061A27AE615D0035A6B0 /* Alamofire */, @@ -1232,7 +1226,6 @@ ); mainGroup = DFB2621E18830A3600D3244D; packageReferences = ( - 937E4480270B378F00A98C26 /* XCRemoteSwiftPackageReference "Fuzi" */, 937E4483270B379900A98C26 /* XCRemoteSwiftPackageReference "DeviceKit" */, 937E4486270B37A600A98C26 /* XCRemoteSwiftPackageReference "Kingfisher" */, 93F8061927AE615D0035A6B0 /* XCRemoteSwiftPackageReference "Alamofire" */, @@ -2331,14 +2324,6 @@ /* End XCConfigurationList section */ /* Begin XCRemoteSwiftPackageReference section */ - 937E4480270B378F00A98C26 /* XCRemoteSwiftPackageReference "Fuzi" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/cezheng/Fuzi.git"; - requirement = { - kind = upToNextMajorVersion; - minimumVersion = 3.0.0; - }; - }; 937E4483270B379900A98C26 /* XCRemoteSwiftPackageReference "DeviceKit" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/devicekit/DeviceKit.git"; @@ -2458,11 +2443,6 @@ isa = XCSwiftPackageProductDependency; productName = OpenHABCore; }; - 937E4481270B378F00A98C26 /* Fuzi */ = { - isa = XCSwiftPackageProductDependency; - package = 937E4480270B378F00A98C26 /* XCRemoteSwiftPackageReference "Fuzi" */; - productName = Fuzi; - }; 937E4484270B379900A98C26 /* DeviceKit */ = { isa = XCSwiftPackageProductDependency; package = 937E4483270B379900A98C26 /* XCRemoteSwiftPackageReference "DeviceKit" */; @@ -2488,11 +2468,6 @@ package = 937E4486270B37A600A98C26 /* XCRemoteSwiftPackageReference "Kingfisher" */; productName = Kingfisher; }; - 937E4493270B380500A98C26 /* Fuzi */ = { - isa = XCSwiftPackageProductDependency; - package = 937E4480270B378F00A98C26 /* XCRemoteSwiftPackageReference "Fuzi" */; - productName = Fuzi; - }; 937E44E1270B393C00A98C26 /* OpenHABCore */ = { isa = XCSwiftPackageProductDependency; productName = OpenHABCore; diff --git a/openHAB.xcworkspace/xcshareddata/swiftpm/Package.resolved b/openHAB.xcworkspace/xcshareddata/swiftpm/Package.resolved index 77ed7711d..08b6dad7d 100644 --- a/openHAB.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/openHAB.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -82,15 +82,6 @@ "version": "1.4.4" } }, - { - "package": "Fuzi", - "repositoryURL": "https://github.com/cezheng/Fuzi.git", - "state": { - "branch": null, - "revision": "f08c8323da21e985f3772610753bcfc652c2103f", - "version": "3.1.3" - } - }, { "package": "GoogleAppMeasurement", "repositoryURL": "https://github.com/google/GoogleAppMeasurement.git", diff --git a/openHAB/OpenHABDrawerTableViewController.swift b/openHAB/OpenHABDrawerTableViewController.swift index c0ad356b0..9449d28cf 100644 --- a/openHAB/OpenHABDrawerTableViewController.swift +++ b/openHAB/OpenHABDrawerTableViewController.swift @@ -10,7 +10,6 @@ // SPDX-License-Identifier: EPL-2.0 import DynamicButton -import Fuzi import OpenHABCore import os.log import SafariServices diff --git a/openHAB/OpenHABSitemapViewController.swift b/openHAB/OpenHABSitemapViewController.swift index f765d7f32..53e7cf0c6 100644 --- a/openHAB/OpenHABSitemapViewController.swift +++ b/openHAB/OpenHABSitemapViewController.swift @@ -12,7 +12,6 @@ import Alamofire import AVFoundation import AVKit -import Fuzi import Kingfisher import OpenHABCore import os.log diff --git a/openHAB/legal.rtf b/openHAB/legal.rtf index a0415cf59..7127a83bf 100644 --- a/openHAB/legal.rtf +++ b/openHAB/legal.rtf @@ -1,4 +1,4 @@ -{\rtf1\ansi\ansicpg1252\cocoartf2513 +{\rtf1\ansi\ansicpg1252\cocoartf2761 \cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fnil\fcharset0 Menlo-Regular;} {\colortbl;\red255\green255\blue255;} {\*\expandedcolortbl;;} @@ -509,11 +509,6 @@ Copyright (c) 2018 Rastislav Mirek\ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \'93Software\'94), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\ The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\ THE SOFTWARE IS PROVIDED \'93AS IS\'94, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\ -Fuzi\ -Copyright (c) 2015 Ce Zheng\ -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \'93Software\'94), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\ -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\ -THE SOFTWARE IS PROVIDED \'93AS IS\'94, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\ GoogleAppMeasurement\ Copyright 2019 Google\ GoogleDataTransport\ @@ -630,4 +625,4 @@ Permission is granted to anyone to use this software for any purpose, including 2 Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.\ 3 This notice may not be removed or altered from any source distribution.\ Generated by CocoaPods - https://cocoapods.org\ -} +} \ No newline at end of file diff --git a/openHABWatch Extension/openHABWatch Extension/Model/ObservableOpenHABSitemapPage.swift b/openHABWatch Extension/openHABWatch Extension/Model/ObservableOpenHABSitemapPage.swift index 077c5a8a3..3d94657be 100644 --- a/openHABWatch Extension/openHABWatch Extension/Model/ObservableOpenHABSitemapPage.swift +++ b/openHABWatch Extension/openHABWatch Extension/Model/ObservableOpenHABSitemapPage.swift @@ -10,7 +10,6 @@ // SPDX-License-Identifier: EPL-2.0 import Foundation -import Fuzi import OpenHABCore import os.log diff --git a/openHABWatch Extension/openHABWatch Extension/Model/ObservableOpenHABWidget.swift b/openHABWatch Extension/openHABWatch Extension/Model/ObservableOpenHABWidget.swift index 35bfe2bd1..9241caa94 100644 --- a/openHABWatch Extension/openHABWatch Extension/Model/ObservableOpenHABWidget.swift +++ b/openHABWatch Extension/openHABWatch Extension/Model/ObservableOpenHABWidget.swift @@ -14,7 +14,6 @@ import Alamofire import Combine #endif import Foundation -import Fuzi import MapKit import OpenHABCore import os.log