diff --git a/Menubar RunCat/Menubar RunCat.xcodeproj/project.pbxproj b/Menubar RunCat.xcodeproj/project.pbxproj similarity index 98% rename from Menubar RunCat/Menubar RunCat.xcodeproj/project.pbxproj rename to Menubar RunCat.xcodeproj/project.pbxproj index b59b194..aac83e8 100644 --- a/Menubar RunCat/Menubar RunCat.xcodeproj/project.pbxproj +++ b/Menubar RunCat.xcodeproj/project.pbxproj @@ -90,7 +90,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 1030; - LastUpgradeCheck = 1030; + LastUpgradeCheck = 1200; ORGANIZATIONNAME = "Takuto Nakamura"; TargetAttributes = { 1CEF109B22F922DB00DAD355 = { @@ -178,6 +178,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -239,6 +240,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -272,6 +274,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = "Menubar RunCat/Menubar_RunCat.entitlements"; + CODE_SIGN_IDENTITY = "-"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; DEVELOPMENT_TEAM = VJ5N2X84K8; @@ -292,6 +295,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = "Menubar RunCat/Menubar_RunCat.entitlements"; + CODE_SIGN_IDENTITY = "-"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; DEVELOPMENT_TEAM = VJ5N2X84K8; diff --git a/Menubar RunCat/Menubar RunCat.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Menubar RunCat.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from Menubar RunCat/Menubar RunCat.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to Menubar RunCat.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/Menubar RunCat/Menubar RunCat.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Menubar RunCat.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from Menubar RunCat/Menubar RunCat.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to Menubar RunCat.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/Menubar RunCat.xcodeproj/project.xcworkspace/xcuserdata/takuto.xcuserdatad/UserInterfaceState.xcuserstate b/Menubar RunCat.xcodeproj/project.xcworkspace/xcuserdata/takuto.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000..320d1c8 Binary files /dev/null and b/Menubar RunCat.xcodeproj/project.xcworkspace/xcuserdata/takuto.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/Menubar RunCat/Menubar RunCat.xcodeproj/xcuserdata/takuto.xcuserdatad/xcschemes/xcschememanagement.plist b/Menubar RunCat.xcodeproj/xcuserdata/takuto.xcuserdatad/xcschemes/xcschememanagement.plist similarity index 100% rename from Menubar RunCat/Menubar RunCat.xcodeproj/xcuserdata/takuto.xcuserdatad/xcschemes/xcschememanagement.plist rename to Menubar RunCat.xcodeproj/xcuserdata/takuto.xcuserdatad/xcschemes/xcschememanagement.plist diff --git a/Menubar RunCat/Menubar RunCat/AppDelegate.swift b/Menubar RunCat/AppDelegate.swift similarity index 100% rename from Menubar RunCat/Menubar RunCat/AppDelegate.swift rename to Menubar RunCat/AppDelegate.swift diff --git a/Menubar RunCat/Menubar RunCat/Assets.xcassets/AppIcon.appiconset/Contents.json b/Menubar RunCat/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from Menubar RunCat/Menubar RunCat/Assets.xcassets/AppIcon.appiconset/Contents.json rename to Menubar RunCat/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/Menubar RunCat/Menubar RunCat/Assets.xcassets/AppIcon.appiconset/Icon-App-128x128@1x.png b/Menubar RunCat/Assets.xcassets/AppIcon.appiconset/Icon-App-128x128@1x.png similarity index 100% rename from Menubar RunCat/Menubar RunCat/Assets.xcassets/AppIcon.appiconset/Icon-App-128x128@1x.png rename to Menubar RunCat/Assets.xcassets/AppIcon.appiconset/Icon-App-128x128@1x.png diff --git a/Menubar RunCat/Menubar RunCat/Assets.xcassets/AppIcon.appiconset/Icon-App-128x128@2x.png b/Menubar RunCat/Assets.xcassets/AppIcon.appiconset/Icon-App-128x128@2x.png similarity index 100% rename from Menubar RunCat/Menubar RunCat/Assets.xcassets/AppIcon.appiconset/Icon-App-128x128@2x.png rename to Menubar RunCat/Assets.xcassets/AppIcon.appiconset/Icon-App-128x128@2x.png diff --git a/Menubar RunCat/Menubar RunCat/Assets.xcassets/AppIcon.appiconset/Icon-App-16x16@1x.png b/Menubar RunCat/Assets.xcassets/AppIcon.appiconset/Icon-App-16x16@1x.png similarity index 100% rename from Menubar RunCat/Menubar RunCat/Assets.xcassets/AppIcon.appiconset/Icon-App-16x16@1x.png rename to Menubar RunCat/Assets.xcassets/AppIcon.appiconset/Icon-App-16x16@1x.png diff --git a/Menubar RunCat/Menubar RunCat/Assets.xcassets/AppIcon.appiconset/Icon-App-16x16@2x.png b/Menubar RunCat/Assets.xcassets/AppIcon.appiconset/Icon-App-16x16@2x.png similarity index 100% rename from Menubar RunCat/Menubar RunCat/Assets.xcassets/AppIcon.appiconset/Icon-App-16x16@2x.png rename to Menubar RunCat/Assets.xcassets/AppIcon.appiconset/Icon-App-16x16@2x.png diff --git a/Menubar RunCat/Menubar RunCat/Assets.xcassets/AppIcon.appiconset/Icon-App-256x256@1x.png b/Menubar RunCat/Assets.xcassets/AppIcon.appiconset/Icon-App-256x256@1x.png similarity index 100% rename from Menubar RunCat/Menubar RunCat/Assets.xcassets/AppIcon.appiconset/Icon-App-256x256@1x.png rename to Menubar RunCat/Assets.xcassets/AppIcon.appiconset/Icon-App-256x256@1x.png diff --git a/Menubar RunCat/Menubar RunCat/Assets.xcassets/AppIcon.appiconset/Icon-App-256x256@2x.png b/Menubar RunCat/Assets.xcassets/AppIcon.appiconset/Icon-App-256x256@2x.png similarity index 100% rename from Menubar RunCat/Menubar RunCat/Assets.xcassets/AppIcon.appiconset/Icon-App-256x256@2x.png rename to Menubar RunCat/Assets.xcassets/AppIcon.appiconset/Icon-App-256x256@2x.png diff --git a/Menubar RunCat/Menubar RunCat/Assets.xcassets/AppIcon.appiconset/Icon-App-32x32@1x.png b/Menubar RunCat/Assets.xcassets/AppIcon.appiconset/Icon-App-32x32@1x.png similarity index 100% rename from Menubar RunCat/Menubar RunCat/Assets.xcassets/AppIcon.appiconset/Icon-App-32x32@1x.png rename to Menubar RunCat/Assets.xcassets/AppIcon.appiconset/Icon-App-32x32@1x.png diff --git a/Menubar RunCat/Menubar RunCat/Assets.xcassets/AppIcon.appiconset/Icon-App-32x32@2x.png b/Menubar RunCat/Assets.xcassets/AppIcon.appiconset/Icon-App-32x32@2x.png similarity index 100% rename from Menubar RunCat/Menubar RunCat/Assets.xcassets/AppIcon.appiconset/Icon-App-32x32@2x.png rename to Menubar RunCat/Assets.xcassets/AppIcon.appiconset/Icon-App-32x32@2x.png diff --git a/Menubar RunCat/Menubar RunCat/Assets.xcassets/AppIcon.appiconset/Icon-App-512x512@1x.png b/Menubar RunCat/Assets.xcassets/AppIcon.appiconset/Icon-App-512x512@1x.png similarity index 100% rename from Menubar RunCat/Menubar RunCat/Assets.xcassets/AppIcon.appiconset/Icon-App-512x512@1x.png rename to Menubar RunCat/Assets.xcassets/AppIcon.appiconset/Icon-App-512x512@1x.png diff --git a/Menubar RunCat/Menubar RunCat/Assets.xcassets/AppIcon.appiconset/Icon-App-512x512@2x.png b/Menubar RunCat/Assets.xcassets/AppIcon.appiconset/Icon-App-512x512@2x.png similarity index 100% rename from Menubar RunCat/Menubar RunCat/Assets.xcassets/AppIcon.appiconset/Icon-App-512x512@2x.png rename to Menubar RunCat/Assets.xcassets/AppIcon.appiconset/Icon-App-512x512@2x.png diff --git a/Menubar RunCat/Menubar RunCat/Assets.xcassets/Contents.json b/Menubar RunCat/Assets.xcassets/Contents.json similarity index 100% rename from Menubar RunCat/Menubar RunCat/Assets.xcassets/Contents.json rename to Menubar RunCat/Assets.xcassets/Contents.json diff --git a/Menubar RunCat/Menubar RunCat/Assets.xcassets/cat_page0.imageset/Contents.json b/Menubar RunCat/Assets.xcassets/cat_page0.imageset/Contents.json similarity index 100% rename from Menubar RunCat/Menubar RunCat/Assets.xcassets/cat_page0.imageset/Contents.json rename to Menubar RunCat/Assets.xcassets/cat_page0.imageset/Contents.json diff --git a/Menubar RunCat/Menubar RunCat/Assets.xcassets/cat_page0.imageset/cat0.png b/Menubar RunCat/Assets.xcassets/cat_page0.imageset/cat0.png similarity index 100% rename from Menubar RunCat/Menubar RunCat/Assets.xcassets/cat_page0.imageset/cat0.png rename to Menubar RunCat/Assets.xcassets/cat_page0.imageset/cat0.png diff --git a/Menubar RunCat/Menubar RunCat/Assets.xcassets/cat_page1.imageset/Contents.json b/Menubar RunCat/Assets.xcassets/cat_page1.imageset/Contents.json similarity index 100% rename from Menubar RunCat/Menubar RunCat/Assets.xcassets/cat_page1.imageset/Contents.json rename to Menubar RunCat/Assets.xcassets/cat_page1.imageset/Contents.json diff --git a/Menubar RunCat/Menubar RunCat/Assets.xcassets/cat_page1.imageset/cat1.png b/Menubar RunCat/Assets.xcassets/cat_page1.imageset/cat1.png similarity index 100% rename from Menubar RunCat/Menubar RunCat/Assets.xcassets/cat_page1.imageset/cat1.png rename to Menubar RunCat/Assets.xcassets/cat_page1.imageset/cat1.png diff --git a/Menubar RunCat/Menubar RunCat/Assets.xcassets/cat_page2.imageset/Contents.json b/Menubar RunCat/Assets.xcassets/cat_page2.imageset/Contents.json similarity index 100% rename from Menubar RunCat/Menubar RunCat/Assets.xcassets/cat_page2.imageset/Contents.json rename to Menubar RunCat/Assets.xcassets/cat_page2.imageset/Contents.json diff --git a/Menubar RunCat/Menubar RunCat/Assets.xcassets/cat_page2.imageset/cat2.png b/Menubar RunCat/Assets.xcassets/cat_page2.imageset/cat2.png similarity index 100% rename from Menubar RunCat/Menubar RunCat/Assets.xcassets/cat_page2.imageset/cat2.png rename to Menubar RunCat/Assets.xcassets/cat_page2.imageset/cat2.png diff --git a/Menubar RunCat/Menubar RunCat/Assets.xcassets/cat_page3.imageset/Contents.json b/Menubar RunCat/Assets.xcassets/cat_page3.imageset/Contents.json similarity index 100% rename from Menubar RunCat/Menubar RunCat/Assets.xcassets/cat_page3.imageset/Contents.json rename to Menubar RunCat/Assets.xcassets/cat_page3.imageset/Contents.json diff --git a/Menubar RunCat/Menubar RunCat/Assets.xcassets/cat_page3.imageset/cat3.png b/Menubar RunCat/Assets.xcassets/cat_page3.imageset/cat3.png similarity index 100% rename from Menubar RunCat/Menubar RunCat/Assets.xcassets/cat_page3.imageset/cat3.png rename to Menubar RunCat/Assets.xcassets/cat_page3.imageset/cat3.png diff --git a/Menubar RunCat/Menubar RunCat/Assets.xcassets/cat_page4.imageset/Contents.json b/Menubar RunCat/Assets.xcassets/cat_page4.imageset/Contents.json similarity index 100% rename from Menubar RunCat/Menubar RunCat/Assets.xcassets/cat_page4.imageset/Contents.json rename to Menubar RunCat/Assets.xcassets/cat_page4.imageset/Contents.json diff --git a/Menubar RunCat/Menubar RunCat/Assets.xcassets/cat_page4.imageset/cat4.png b/Menubar RunCat/Assets.xcassets/cat_page4.imageset/cat4.png similarity index 100% rename from Menubar RunCat/Menubar RunCat/Assets.xcassets/cat_page4.imageset/cat4.png rename to Menubar RunCat/Assets.xcassets/cat_page4.imageset/cat4.png diff --git a/Menubar RunCat/Menubar RunCat/Base.lproj/Main.storyboard b/Menubar RunCat/Base.lproj/Main.storyboard similarity index 96% rename from Menubar RunCat/Menubar RunCat/Base.lproj/Main.storyboard rename to Menubar RunCat/Base.lproj/Main.storyboard index 6aa83de..4570384 100644 --- a/Menubar RunCat/Menubar RunCat/Base.lproj/Main.storyboard +++ b/Menubar RunCat/Base.lproj/Main.storyboard @@ -1,8 +1,8 @@ - + - + diff --git a/Menubar RunCat/Menubar RunCat/CPU.swift b/Menubar RunCat/CPU.swift similarity index 100% rename from Menubar RunCat/Menubar RunCat/CPU.swift rename to Menubar RunCat/CPU.swift diff --git a/Menubar RunCat/Menubar RunCat/Info.plist b/Menubar RunCat/Info.plist similarity index 100% rename from Menubar RunCat/Menubar RunCat/Info.plist rename to Menubar RunCat/Info.plist diff --git a/Menubar RunCat/Menubar RunCat.xcodeproj/project.xcworkspace/xcuserdata/takuto.xcuserdatad/UserInterfaceState.xcuserstate b/Menubar RunCat/Menubar RunCat.xcodeproj/project.xcworkspace/xcuserdata/takuto.xcuserdatad/UserInterfaceState.xcuserstate deleted file mode 100644 index 8d89af7..0000000 Binary files a/Menubar RunCat/Menubar RunCat.xcodeproj/project.xcworkspace/xcuserdata/takuto.xcuserdatad/UserInterfaceState.xcuserstate and /dev/null differ diff --git a/Menubar RunCat/Menubar RunCat/Menubar_RunCat.entitlements b/Menubar RunCat/Menubar_RunCat.entitlements similarity index 100% rename from Menubar RunCat/Menubar RunCat/Menubar_RunCat.entitlements rename to Menubar RunCat/Menubar_RunCat.entitlements