From 38da9c715f0f42df364060161d81c812b3e19432 Mon Sep 17 00:00:00 2001 From: Nobuhiro Ito Date: Sat, 10 Aug 2024 17:13:33 +0900 Subject: [PATCH 1/3] Revert "update project setting, remove storyboard" This reverts commit 4a50f578d9b66e41462b3614fab88d6a1188aea3. --- Ukam.xcodeproj/project.pbxproj | 21 +- .../xcshareddata/xcschemes/Ukam.xcscheme | 2 +- Ukam/Base.lproj/Main.storyboard | 718 ++++++++++++++++++ 3 files changed, 732 insertions(+), 9 deletions(-) create mode 100644 Ukam/Base.lproj/Main.storyboard diff --git a/Ukam.xcodeproj/project.pbxproj b/Ukam.xcodeproj/project.pbxproj index 2f52549..d5540f0 100644 --- a/Ukam.xcodeproj/project.pbxproj +++ b/Ukam.xcodeproj/project.pbxproj @@ -41,6 +41,7 @@ 82C57EFD27D46DB900395627 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82C57EFC27D46DB900395627 /* AppDelegate.swift */; }; 82C57EFF27D46DB900395627 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82C57EFE27D46DB900395627 /* ViewController.swift */; }; 82C57F0127D46DC100395627 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 82C57F0027D46DC100395627 /* Assets.xcassets */; }; + 82C57F0427D46DC100395627 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 82C57F0227D46DC100395627 /* Main.storyboard */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -69,6 +70,7 @@ 82C57EFC27D46DB900395627 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 82C57EFE27D46DB900395627 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; 82C57F0027D46DC100395627 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 82C57F0327D46DC100395627 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; 82C57F0527D46DC100395627 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 82C57F0627D46DC100395627 /* Ukam.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Ukam.entitlements; sourceTree = ""; }; /* End PBXFileReference section */ @@ -193,6 +195,7 @@ 82C57EFE27D46DB900395627 /* ViewController.swift */, 82C57F0027D46DC100395627 /* Assets.xcassets */, 82302D112C669E4300B8BF8C /* Localizable.strings */, + 82C57F0227D46DC100395627 /* Main.storyboard */, 826008222C674A0E00ACD8A7 /* Configurations */, 82C57F0527D46DC100395627 /* Info.plist */, 82C57F0627D46DC100395627 /* Ukam.entitlements */, @@ -230,9 +233,8 @@ 82C57EF127D46DB900395627 /* Project object */ = { isa = PBXProject; attributes = { - BuildIndependentTargetsInParallel = YES; LastSwiftUpdateCheck = 1250; - LastUpgradeCheck = 1520; + LastUpgradeCheck = 1300; TargetAttributes = { 82302D132C66A07C00B8BF8C = { CreatedOnToolsVersion = 15.2; @@ -273,6 +275,7 @@ files = ( 82C57F0127D46DC100395627 /* Assets.xcassets in Resources */, 82302D0F2C669E4300B8BF8C /* Localizable.strings in Resources */, + 82C57F0427D46DC100395627 /* Main.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -361,6 +364,14 @@ name = Localizable.strings; sourceTree = ""; }; + 82C57F0227D46DC100395627 /* Main.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 82C57F0327D46DC100395627 /* Base */, + ); + name = Main.storyboard; + sourceTree = ""; + }; /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ @@ -368,7 +379,6 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_STYLE = Automatic; - DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = NARTSSS6TY; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -378,7 +388,6 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_STYLE = Automatic; - DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = NARTSSS6TY; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -419,7 +428,6 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; - DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -482,7 +490,6 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; - DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -513,7 +520,6 @@ CODE_SIGN_ENTITLEMENTS = Ukam/Ukam.entitlements; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = NARTSSS6TY; ENABLE_HARDENED_RUNTIME = YES; INFOPLIST_FILE = Ukam/Info.plist; @@ -540,7 +546,6 @@ CODE_SIGN_ENTITLEMENTS = Ukam/Ukam.entitlements; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = NARTSSS6TY; ENABLE_HARDENED_RUNTIME = YES; INFOPLIST_FILE = Ukam/Info.plist; diff --git a/Ukam.xcodeproj/xcshareddata/xcschemes/Ukam.xcscheme b/Ukam.xcodeproj/xcshareddata/xcschemes/Ukam.xcscheme index ed5aacc..2bc5942 100644 --- a/Ukam.xcodeproj/xcshareddata/xcschemes/Ukam.xcscheme +++ b/Ukam.xcodeproj/xcshareddata/xcschemes/Ukam.xcscheme @@ -1,6 +1,6 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Default + + + + + + + Left to Right + + + + + + + Right to Left + + + + + + + + + + + Default + + + + + + + Left to Right + + + + + + + Right to Left + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From e5c647ab79a9d28f053e5c1eb3aef5f4e640cb25 Mon Sep 17 00:00:00 2001 From: Nobuhiro Ito Date: Sat, 10 Aug 2024 17:14:04 +0900 Subject: [PATCH 2/3] Update project config --- Ukam.xcodeproj/project.pbxproj | 9 ++++++++- Ukam.xcodeproj/xcshareddata/xcschemes/Ukam.xcscheme | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Ukam.xcodeproj/project.pbxproj b/Ukam.xcodeproj/project.pbxproj index d5540f0..470a141 100644 --- a/Ukam.xcodeproj/project.pbxproj +++ b/Ukam.xcodeproj/project.pbxproj @@ -233,8 +233,9 @@ 82C57EF127D46DB900395627 /* Project object */ = { isa = PBXProject; attributes = { + BuildIndependentTargetsInParallel = YES; LastSwiftUpdateCheck = 1250; - LastUpgradeCheck = 1300; + LastUpgradeCheck = 1520; TargetAttributes = { 82302D132C66A07C00B8BF8C = { CreatedOnToolsVersion = 15.2; @@ -379,6 +380,7 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_STYLE = Automatic; + DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = NARTSSS6TY; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -388,6 +390,7 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_STYLE = Automatic; + DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = NARTSSS6TY; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -428,6 +431,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -490,6 +494,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -520,6 +525,7 @@ CODE_SIGN_ENTITLEMENTS = Ukam/Ukam.entitlements; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; + DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = NARTSSS6TY; ENABLE_HARDENED_RUNTIME = YES; INFOPLIST_FILE = Ukam/Info.plist; @@ -546,6 +552,7 @@ CODE_SIGN_ENTITLEMENTS = Ukam/Ukam.entitlements; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; + DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = NARTSSS6TY; ENABLE_HARDENED_RUNTIME = YES; INFOPLIST_FILE = Ukam/Info.plist; diff --git a/Ukam.xcodeproj/xcshareddata/xcschemes/Ukam.xcscheme b/Ukam.xcodeproj/xcshareddata/xcschemes/Ukam.xcscheme index 2bc5942..ed5aacc 100644 --- a/Ukam.xcodeproj/xcshareddata/xcschemes/Ukam.xcscheme +++ b/Ukam.xcodeproj/xcshareddata/xcschemes/Ukam.xcscheme @@ -1,6 +1,6 @@ Date: Sat, 10 Aug 2024 17:15:18 +0900 Subject: [PATCH 3/3] remove default ViewController --- Ukam.xcodeproj/project.pbxproj | 4 ---- Ukam/Base.lproj/Main.storyboard | 25 ++----------------------- Ukam/ViewController.swift | 26 -------------------------- 3 files changed, 2 insertions(+), 53 deletions(-) delete mode 100644 Ukam/ViewController.swift diff --git a/Ukam.xcodeproj/project.pbxproj b/Ukam.xcodeproj/project.pbxproj index 470a141..9e072db 100644 --- a/Ukam.xcodeproj/project.pbxproj +++ b/Ukam.xcodeproj/project.pbxproj @@ -39,7 +39,6 @@ 82B14E082C5CF685000B08C3 /* LayoutConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82B14E072C5CF685000B08C3 /* LayoutConstants.swift */; }; 82B14E0C2C5D11B4000B08C3 /* ScreenCaptureKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 82B14E0B2C5D11B4000B08C3 /* ScreenCaptureKit.framework */; }; 82C57EFD27D46DB900395627 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82C57EFC27D46DB900395627 /* AppDelegate.swift */; }; - 82C57EFF27D46DB900395627 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82C57EFE27D46DB900395627 /* ViewController.swift */; }; 82C57F0127D46DC100395627 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 82C57F0027D46DC100395627 /* Assets.xcassets */; }; 82C57F0427D46DC100395627 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 82C57F0227D46DC100395627 /* Main.storyboard */; }; /* End PBXBuildFile section */ @@ -68,7 +67,6 @@ 82B14E0B2C5D11B4000B08C3 /* ScreenCaptureKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ScreenCaptureKit.framework; path = System/Library/Frameworks/ScreenCaptureKit.framework; sourceTree = SDKROOT; }; 82C57EF927D46DB900395627 /* Ukam.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Ukam.app; sourceTree = BUILT_PRODUCTS_DIR; }; 82C57EFC27D46DB900395627 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - 82C57EFE27D46DB900395627 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; 82C57F0027D46DC100395627 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 82C57F0327D46DC100395627 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; 82C57F0527D46DC100395627 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -192,7 +190,6 @@ 822CDF4227D4C77F00C6B331 /* Managers */, 822CDF3F27D4C71F00C6B331 /* Model */, 82C57EFC27D46DB900395627 /* AppDelegate.swift */, - 82C57EFE27D46DB900395627 /* ViewController.swift */, 82C57F0027D46DC100395627 /* Assets.xcassets */, 82302D112C669E4300B8BF8C /* Localizable.strings */, 82C57F0227D46DC100395627 /* Main.storyboard */, @@ -336,7 +333,6 @@ 82B14E042C5CE172000B08C3 /* WindowsViewDataSource.swift in Sources */, 822CDF4127D4C72E00C6B331 /* Window.swift in Sources */, 82B14E062C5CED30000B08C3 /* WindowItemView.swift in Sources */, - 82C57EFF27D46DB900395627 /* ViewController.swift in Sources */, 828688FA2C651B6E0059CAEE /* PermissionsViewController.swift in Sources */, 828688F82C65158B0059CAEE /* PermissionsView.swift in Sources */, 82C57EFD27D46DB900395627 /* AppDelegate.swift in Sources */, diff --git a/Ukam/Base.lproj/Main.storyboard b/Ukam/Base.lproj/Main.storyboard index 7f9ee25..9ff8916 100644 --- a/Ukam/Base.lproj/Main.storyboard +++ b/Ukam/Base.lproj/Main.storyboard @@ -674,37 +674,16 @@ - + - - - - - - - - - - - - - - - - - - - - - - + diff --git a/Ukam/ViewController.swift b/Ukam/ViewController.swift deleted file mode 100644 index f085a71..0000000 --- a/Ukam/ViewController.swift +++ /dev/null @@ -1,26 +0,0 @@ -// -// ViewController.swift -// WindowGate -// -// Created by Nobuhiro Ito on 3/6/22. -// - -import Cocoa - -class ViewController: NSViewController { - - override func viewDidLoad() { - super.viewDidLoad() - - // Do any additional setup after loading the view. - } - - override var representedObject: Any? { - didSet { - // Update the view, if already loaded. - } - } - - -} -