From 1e79cf8dc1126b996df321c65a98c6bc4f449b71 Mon Sep 17 00:00:00 2001 From: Arjun Komath Date: Sat, 23 Dec 2023 08:15:04 +1100 Subject: [PATCH 1/2] Apply xcode suggestions --- netdata.xcodeproj/project.pbxproj | 39 +++++++-------------------- netdataTests/Info.plist | 22 --------------- netdataTests/netdataTests.swift | 33 ----------------------- netdataUITests/Info.plist | 22 --------------- netdataUITests/netdataUITests.swift | 42 ----------------------------- 5 files changed, 9 insertions(+), 149 deletions(-) delete mode 100644 netdataTests/Info.plist delete mode 100644 netdataTests/netdataTests.swift delete mode 100644 netdataUITests/Info.plist delete mode 100644 netdataUITests/netdataUITests.swift diff --git a/netdata.xcodeproj/project.pbxproj b/netdata.xcodeproj/project.pbxproj index 3e3e174..d5d3bd7 100644 --- a/netdata.xcodeproj/project.pbxproj +++ b/netdata.xcodeproj/project.pbxproj @@ -13,7 +13,7 @@ 5514041A25C68F4F0081E4A4 /* SwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 552B4E7924CD16C0008B9DA6 /* SwiftUI.framework */; }; 5514041D25C68F4F0081E4A4 /* AlarmWidget.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5514041C25C68F4F0081E4A4 /* AlarmWidget.swift */; }; 5514041F25C68F510081E4A4 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5514041E25C68F510081E4A4 /* Assets.xcassets */; }; - 5514042325C68F510081E4A4 /* AlarmWidgetExtension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 5514041825C68F4F0081E4A4 /* AlarmWidgetExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; + 5514042325C68F510081E4A4 /* AlarmWidgetExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 5514041825C68F4F0081E4A4 /* AlarmWidgetExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; 5514042F25C6904A0081E4A4 /* ServerService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 558CABAE24B999F7002D115B /* ServerService.swift */; }; 5514043725C6905A0081E4A4 /* CloudService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 558CABB024B99B42002D115B /* CloudService.swift */; }; 5514043F25C690620081E4A4 /* NDServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55D1C53324B9636E0087F8A2 /* NDServer.swift */; }; @@ -82,15 +82,15 @@ /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ - 552B4E8424CD16C2008B9DA6 /* Embed App Extensions */ = { + 552B4E8424CD16C2008B9DA6 /* Embed Foundation Extensions */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; dstPath = ""; dstSubfolderSpec = 13; files = ( - 5514042325C68F510081E4A4 /* AlarmWidgetExtension.appex in Embed App Extensions */, + 5514042325C68F510081E4A4 /* AlarmWidgetExtension.appex in Embed Foundation Extensions */, ); - name = "Embed App Extensions"; + name = "Embed Foundation Extensions"; runOnlyForDeploymentPostprocessing = 0; }; 5538039C254510DF003A9BFE /* Embed App Clips */ = { @@ -149,10 +149,6 @@ 55D1C50524B95E6F0087F8A2 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 55D1C50824B95E6F0087F8A2 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = ""; }; 55D1C50A24B95E6F0087F8A2 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 55D1C51324B95E6F0087F8A2 /* netdataTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = netdataTests.swift; sourceTree = ""; }; - 55D1C51524B95E6F0087F8A2 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 55D1C51E24B95E6F0087F8A2 /* netdataUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = netdataUITests.swift; sourceTree = ""; }; - 55D1C52024B95E6F0087F8A2 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 55D1C52D24B95F580087F8A2 /* ServerListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ServerListView.swift; sourceTree = ""; }; 55D1C53324B9636E0087F8A2 /* NDServer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NDServer.swift; sourceTree = ""; }; 55D1C53524B969A50087F8A2 /* netdata.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = netdata.entitlements; sourceTree = ""; }; @@ -311,8 +307,6 @@ children = ( 5514042425C68F510081E4A4 /* AlarmWidgetExtension.entitlements */, 55D1C50024B95E6D0087F8A2 /* netdata */, - 55D1C51224B95E6F0087F8A2 /* netdataTests */, - 55D1C51D24B95E6F0087F8A2 /* netdataUITests */, 5514041B25C68F4F0081E4A4 /* AlarmWidget */, 55D1C4FF24B95E6D0087F8A2 /* Products */, 55D1C53624B969AC0087F8A2 /* Frameworks */, @@ -351,24 +345,6 @@ path = "Preview Content"; sourceTree = ""; }; - 55D1C51224B95E6F0087F8A2 /* netdataTests */ = { - isa = PBXGroup; - children = ( - 55D1C51324B95E6F0087F8A2 /* netdataTests.swift */, - 55D1C51524B95E6F0087F8A2 /* Info.plist */, - ); - path = netdataTests; - sourceTree = ""; - }; - 55D1C51D24B95E6F0087F8A2 /* netdataUITests */ = { - isa = PBXGroup; - children = ( - 55D1C51E24B95E6F0087F8A2 /* netdataUITests.swift */, - 55D1C52024B95E6F0087F8A2 /* Info.plist */, - ); - path = netdataUITests; - sourceTree = ""; - }; 55D1C52C24B95F030087F8A2 /* Modules */ = { isa = PBXGroup; children = ( @@ -476,7 +452,7 @@ 55D1C4FA24B95E6D0087F8A2 /* Sources */, 55D1C4FB24B95E6D0087F8A2 /* Frameworks */, 55D1C4FC24B95E6D0087F8A2 /* Resources */, - 552B4E8424CD16C2008B9DA6 /* Embed App Extensions */, + 552B4E8424CD16C2008B9DA6 /* Embed Foundation Extensions */, 5538039C254510DF003A9BFE /* Embed App Clips */, ); buildRules = ( @@ -498,8 +474,9 @@ 55D1C4F624B95E6D0087F8A2 /* Project object */ = { isa = PBXProject; attributes = { + BuildIndependentTargetsInParallel = YES; LastSwiftUpdateCheck = 1240; - LastUpgradeCheck = 1200; + LastUpgradeCheck = 1510; TargetAttributes = { 5514041725C68F4F0081E4A4 = { CreatedOnToolsVersion = 12.4; @@ -688,6 +665,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; @@ -749,6 +727,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; diff --git a/netdataTests/Info.plist b/netdataTests/Info.plist deleted file mode 100644 index 64d65ca..0000000 --- a/netdataTests/Info.plist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - $(PRODUCT_BUNDLE_PACKAGE_TYPE) - CFBundleShortVersionString - 1.0 - CFBundleVersion - 1 - - diff --git a/netdataTests/netdataTests.swift b/netdataTests/netdataTests.swift deleted file mode 100644 index ffae256..0000000 --- a/netdataTests/netdataTests.swift +++ /dev/null @@ -1,33 +0,0 @@ -// -// netdataTests.swift -// netdataTests -// -// Created by Arjun Komath on 11/7/20. -// - -import XCTest -@testable import netdata - -class netdataTests: XCTestCase { - - override func setUpWithError() throws { - // Put setup code here. This method is called before the invocation of each test method in the class. - } - - override func tearDownWithError() throws { - // Put teardown code here. This method is called after the invocation of each test method in the class. - } - - func testExample() throws { - // This is an example of a functional test case. - // Use XCTAssert and related functions to verify your tests produce the correct results. - } - - func testPerformanceExample() throws { - // This is an example of a performance test case. - self.measure { - // Put the code you want to measure the time of here. - } - } - -} diff --git a/netdataUITests/Info.plist b/netdataUITests/Info.plist deleted file mode 100644 index 64d65ca..0000000 --- a/netdataUITests/Info.plist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - $(PRODUCT_BUNDLE_PACKAGE_TYPE) - CFBundleShortVersionString - 1.0 - CFBundleVersion - 1 - - diff --git a/netdataUITests/netdataUITests.swift b/netdataUITests/netdataUITests.swift deleted file mode 100644 index 8afec18..0000000 --- a/netdataUITests/netdataUITests.swift +++ /dev/null @@ -1,42 +0,0 @@ -// -// netdataUITests.swift -// netdataUITests -// -// Created by Arjun Komath on 11/7/20. -// - -import XCTest - -class netdataUITests: XCTestCase { - - override func setUpWithError() throws { - // Put setup code here. This method is called before the invocation of each test method in the class. - - // In UI tests it is usually best to stop immediately when a failure occurs. - continueAfterFailure = false - - // In UI tests it’s important to set the initial state - such as interface orientation - required for your tests before they run. The setUp method is a good place to do this. - } - - override func tearDownWithError() throws { - // Put teardown code here. This method is called after the invocation of each test method in the class. - } - - func testExample() throws { - // UI tests must launch the application that they test. - let app = XCUIApplication() - app.launch() - - // Use recording to get started writing UI tests. - // Use XCTAssert and related functions to verify your tests produce the correct results. - } - - func testLaunchPerformance() throws { - if #available(macOS 10.15, iOS 13.0, tvOS 13.0, *) { - // This measures how long it takes to launch your application. - measure(metrics: [XCTApplicationLaunchMetric()]) { - XCUIApplication().launch() - } - } - } -} From 9e040391cb3f8bc4eb4e19e7c8abb67739e2ed0b Mon Sep 17 00:00:00 2001 From: Arjun Komath Date: Sat, 23 Dec 2023 08:27:42 +1100 Subject: [PATCH 2/2] Remove macOS target --- netdata.xcodeproj/project.pbxproj | 12 ++++++++---- netdata/Info.plist | 2 ++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/netdata.xcodeproj/project.pbxproj b/netdata.xcodeproj/project.pbxproj index d5d3bd7..f780c1a 100644 --- a/netdata.xcodeproj/project.pbxproj +++ b/netdata.xcodeproj/project.pbxproj @@ -627,7 +627,8 @@ PRODUCT_BUNDLE_IDENTIFIER = com.techulus.netdata.AlarmWidget; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - SUPPORTS_MACCATALYST = YES; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = NO; SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2,6"; @@ -654,7 +655,8 @@ PRODUCT_BUNDLE_IDENTIFIER = com.techulus.netdata.AlarmWidget; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - SUPPORTS_MACCATALYST = YES; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = NO; SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2,6"; @@ -801,7 +803,8 @@ MARKETING_VERSION = 2; PRODUCT_BUNDLE_IDENTIFIER = com.techulus.netdata; PRODUCT_NAME = "$(TARGET_NAME)"; - SUPPORTS_MACCATALYST = YES; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = NO; SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2,6"; @@ -830,7 +833,8 @@ MARKETING_VERSION = 2; PRODUCT_BUNDLE_IDENTIFIER = com.techulus.netdata; PRODUCT_NAME = "$(TARGET_NAME)"; - SUPPORTS_MACCATALYST = YES; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = NO; SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2,6"; diff --git a/netdata/Info.plist b/netdata/Info.plist index 344a062..eca84a2 100644 --- a/netdata/Info.plist +++ b/netdata/Info.plist @@ -59,5 +59,7 @@ UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight + ITSAppUsesNonExemptEncryption +