diff --git a/.gitignore b/.gitignore index b88b851..16bdc36 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ # Xcode xcuserdata/ +*.xcuserstate # macOS .DS_Store @@ -18,3 +19,5 @@ playground.xcworkspace # Swift Package Manager .build/ +# Xcode Derived Data +DerivedData/ diff --git a/macOS version/Asahi Linux Helper.xcodeproj/project.pbxproj b/macOS version/Asahi Linux Helper.xcodeproj/project.pbxproj index df43b8f..36d2654 100644 --- a/macOS version/Asahi Linux Helper.xcodeproj/project.pbxproj +++ b/macOS version/Asahi Linux Helper.xcodeproj/project.pbxproj @@ -8,6 +8,9 @@ /* Begin PBXBuildFile section */ CE0C122A2BB4CC02001A0EEE /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE0C12292BB4CC02001A0EEE /* ContentView.swift */; }; + CE5038FE2BBD8D1200D32CD7 /* UnitTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE5038FD2BBD8D1200D32CD7 /* UnitTests.swift */; }; + CE50390B2BBD8D4100D32CD7 /* UITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE50390A2BBD8D4100D32CD7 /* UITests.swift */; }; + CE50390D2BBD8D4100D32CD7 /* UITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE50390C2BBD8D4100D32CD7 /* UITestsLaunchTests.swift */; }; CE77CAEC2BB0A80A009BBB8C /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE77CAEB2BB0A80A009BBB8C /* AppDelegate.swift */; }; CE77CAF02BB0A80B009BBB8C /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = CE77CAEF2BB0A80B009BBB8C /* Assets.xcassets */; }; CE77CAF32BB0A80B009BBB8C /* Base in Resources */ = {isa = PBXBuildFile; fileRef = CE77CAF22BB0A80B009BBB8C /* Base */; }; @@ -15,6 +18,23 @@ CEFFBD8C2BB6D2B6008979EF /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = CEFFBD8A2BB6D2B6008979EF /* Localizable.strings */; }; /* End PBXBuildFile section */ +/* Begin PBXContainerItemProxy section */ + CE5038FF2BBD8D1200D32CD7 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = CE77CAE02BB0A80A009BBB8C /* Project object */; + proxyType = 1; + remoteGlobalIDString = CE77CAE72BB0A80A009BBB8C; + remoteInfo = "Asahi Linux Helper"; + }; + CE50390E2BBD8D4100D32CD7 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = CE77CAE02BB0A80A009BBB8C /* Project object */; + proxyType = 1; + remoteGlobalIDString = CE77CAE72BB0A80A009BBB8C; + remoteInfo = "Asahi Linux Helper"; + }; +/* End PBXContainerItemProxy section */ + /* Begin PBXCopyFilesBuildPhase section */ CEF5A6282BB2D53000ED22AC /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; @@ -29,6 +49,12 @@ /* Begin PBXFileReference section */ CE0C12292BB4CC02001A0EEE /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; + CE5038DE2BBD888300D32CD7 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Platforms/MacOSX.platform/Developer/Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; }; + CE5038FB2BBD8D1200D32CD7 /* UnitTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = UnitTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + CE5038FD2BBD8D1200D32CD7 /* UnitTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnitTests.swift; sourceTree = ""; }; + CE5039082BBD8D4100D32CD7 /* UITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = UITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + CE50390A2BBD8D4100D32CD7 /* UITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UITests.swift; sourceTree = ""; }; + CE50390C2BBD8D4100D32CD7 /* UITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UITestsLaunchTests.swift; sourceTree = ""; }; CE77CAE82BB0A80A009BBB8C /* Asahi Linux Helper.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Asahi Linux Helper.app"; sourceTree = BUILT_PRODUCTS_DIR; }; CE77CAEB2BB0A80A009BBB8C /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; CE77CAEF2BB0A80B009BBB8C /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; @@ -41,6 +67,20 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ + CE5038F82BBD8D1200D32CD7 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + CE5039052BBD8D4100D32CD7 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; CE77CAE52BB0A80A009BBB8C /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -51,11 +91,39 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + CE5038DD2BBD888300D32CD7 /* Frameworks */ = { + isa = PBXGroup; + children = ( + CE5038DE2BBD888300D32CD7 /* XCTest.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; + CE5038FC2BBD8D1200D32CD7 /* UnitTests */ = { + isa = PBXGroup; + children = ( + CE5038FD2BBD8D1200D32CD7 /* UnitTests.swift */, + ); + path = UnitTests; + sourceTree = ""; + }; + CE5039092BBD8D4100D32CD7 /* UITests */ = { + isa = PBXGroup; + children = ( + CE50390A2BBD8D4100D32CD7 /* UITests.swift */, + CE50390C2BBD8D4100D32CD7 /* UITestsLaunchTests.swift */, + ); + path = UITests; + sourceTree = ""; + }; CE77CADF2BB0A80A009BBB8C = { isa = PBXGroup; children = ( CE77CAEA2BB0A80A009BBB8C /* Asahi Linux Helper */, + CE5038FC2BBD8D1200D32CD7 /* UnitTests */, + CE5039092BBD8D4100D32CD7 /* UITests */, CE77CAE92BB0A80A009BBB8C /* Products */, + CE5038DD2BBD888300D32CD7 /* Frameworks */, ); sourceTree = ""; }; @@ -63,6 +131,8 @@ isa = PBXGroup; children = ( CE77CAE82BB0A80A009BBB8C /* Asahi Linux Helper.app */, + CE5038FB2BBD8D1200D32CD7 /* UnitTests.xctest */, + CE5039082BBD8D4100D32CD7 /* UITests.xctest */, ); name = Products; sourceTree = ""; @@ -86,6 +156,42 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ + CE5038FA2BBD8D1200D32CD7 /* UnitTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = CE5039012BBD8D1200D32CD7 /* Build configuration list for PBXNativeTarget "UnitTests" */; + buildPhases = ( + CE5038F72BBD8D1200D32CD7 /* Sources */, + CE5038F82BBD8D1200D32CD7 /* Frameworks */, + CE5038F92BBD8D1200D32CD7 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + CE5039002BBD8D1200D32CD7 /* PBXTargetDependency */, + ); + name = UnitTests; + productName = UnitTests; + productReference = CE5038FB2BBD8D1200D32CD7 /* UnitTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; + CE5039072BBD8D4100D32CD7 /* UITests */ = { + isa = PBXNativeTarget; + buildConfigurationList = CE5039102BBD8D4100D32CD7 /* Build configuration list for PBXNativeTarget "UITests" */; + buildPhases = ( + CE5039042BBD8D4100D32CD7 /* Sources */, + CE5039052BBD8D4100D32CD7 /* Frameworks */, + CE5039062BBD8D4100D32CD7 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + CE50390F2BBD8D4100D32CD7 /* PBXTargetDependency */, + ); + name = UITests; + productName = UITests; + productReference = CE5039082BBD8D4100D32CD7 /* UITests.xctest */; + productType = "com.apple.product-type.bundle.ui-testing"; + }; CE77CAE72BB0A80A009BBB8C /* Asahi Linux Helper */ = { isa = PBXNativeTarget; buildConfigurationList = CE77CAF72BB0A80B009BBB8C /* Build configuration list for PBXNativeTarget "Asahi Linux Helper" */; @@ -114,6 +220,14 @@ LastSwiftUpdateCheck = 1530; LastUpgradeCheck = 1530; TargetAttributes = { + CE5038FA2BBD8D1200D32CD7 = { + CreatedOnToolsVersion = 15.3; + TestTargetID = CE77CAE72BB0A80A009BBB8C; + }; + CE5039072BBD8D4100D32CD7 = { + CreatedOnToolsVersion = 15.3; + TestTargetID = CE77CAE72BB0A80A009BBB8C; + }; CE77CAE72BB0A80A009BBB8C = { CreatedOnToolsVersion = 15.3; }; @@ -133,11 +247,27 @@ projectRoot = ""; targets = ( CE77CAE72BB0A80A009BBB8C /* Asahi Linux Helper */, + CE5038FA2BBD8D1200D32CD7 /* UnitTests */, + CE5039072BBD8D4100D32CD7 /* UITests */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ + CE5038F92BBD8D1200D32CD7 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + CE5039062BBD8D4100D32CD7 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; CE77CAE62BB0A80A009BBB8C /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -152,6 +282,23 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ + CE5038F72BBD8D1200D32CD7 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + CE5038FE2BBD8D1200D32CD7 /* UnitTests.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + CE5039042BBD8D4100D32CD7 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + CE50390D2BBD8D4100D32CD7 /* UITestsLaunchTests.swift in Sources */, + CE50390B2BBD8D4100D32CD7 /* UITests.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; CE77CAE42BB0A80A009BBB8C /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -163,6 +310,19 @@ }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + CE5039002BBD8D1200D32CD7 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = CE77CAE72BB0A80A009BBB8C /* Asahi Linux Helper */; + targetProxy = CE5038FF2BBD8D1200D32CD7 /* PBXContainerItemProxy */; + }; + CE50390F2BBD8D4100D32CD7 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = CE77CAE72BB0A80A009BBB8C /* Asahi Linux Helper */; + targetProxy = CE50390E2BBD8D4100D32CD7 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin PBXVariantGroup section */ CE77CAF12BB0A80B009BBB8C /* Main.storyboard */ = { isa = PBXVariantGroup; @@ -183,6 +343,72 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ + CE5039022BBD8D1200D32CD7 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MACOSX_DEPLOYMENT_TARGET = 14.4; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = org.example.UnitTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_EMIT_LOC_STRINGS = NO; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Asahi Linux Helper.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Asahi Linux Helper"; + }; + name = Debug; + }; + CE5039032BBD8D1200D32CD7 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MACOSX_DEPLOYMENT_TARGET = 14.4; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = org.example.UnitTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_EMIT_LOC_STRINGS = NO; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Asahi Linux Helper.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Asahi Linux Helper"; + }; + name = Release; + }; + CE5039112BBD8D4100D32CD7 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MACOSX_DEPLOYMENT_TARGET = 14.4; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = org.example.UITests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_EMIT_LOC_STRINGS = NO; + SWIFT_VERSION = 5.0; + TEST_TARGET_NAME = "Asahi Linux Helper"; + }; + name = Debug; + }; + CE5039122BBD8D4100D32CD7 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MACOSX_DEPLOYMENT_TARGET = 14.4; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = org.example.UITests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_EMIT_LOC_STRINGS = NO; + SWIFT_VERSION = 5.0; + TEST_TARGET_NAME = "Asahi Linux Helper"; + }; + name = Release; + }; CE77CAF52BB0A80B009BBB8C /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -379,6 +605,24 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ + CE5039012BBD8D1200D32CD7 /* Build configuration list for PBXNativeTarget "UnitTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + CE5039022BBD8D1200D32CD7 /* Debug */, + CE5039032BBD8D1200D32CD7 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + CE5039102BBD8D4100D32CD7 /* Build configuration list for PBXNativeTarget "UITests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + CE5039112BBD8D4100D32CD7 /* Debug */, + CE5039122BBD8D4100D32CD7 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; CE77CAE32BB0A80A009BBB8C /* Build configuration list for PBXProject "Asahi Linux Helper" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/macOS version/Asahi Linux Helper.xcodeproj/xcshareddata/xcschemes/Asahi Linux helper.xcscheme b/macOS version/Asahi Linux Helper.xcodeproj/xcshareddata/xcschemes/Asahi Linux Helper.xcscheme similarity index 75% rename from macOS version/Asahi Linux Helper.xcodeproj/xcshareddata/xcschemes/Asahi Linux helper.xcscheme rename to macOS version/Asahi Linux Helper.xcodeproj/xcshareddata/xcschemes/Asahi Linux Helper.xcscheme index 19a5303..74c7f59 100644 --- a/macOS version/Asahi Linux Helper.xcodeproj/xcshareddata/xcschemes/Asahi Linux helper.xcscheme +++ b/macOS version/Asahi Linux Helper.xcodeproj/xcshareddata/xcschemes/Asahi Linux Helper.xcscheme @@ -29,6 +29,30 @@ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv = "YES" shouldAutocreateTestPlan = "YES"> + + + + + + + + + +