diff --git a/.gitignore b/.gitignore index 2218adeb..9641cb1e 100644 --- a/.gitignore +++ b/.gitignore @@ -91,3 +91,6 @@ iOSInjectionProject/ # SwiftLint Remote Config Cache .swiftlint/RemoteConfigCache + +# User-specific xcconfig files +Xcode-config/DEVELOPMENT_TEAM.xcconfig diff --git a/Xcode-config/DEVELOPMENT_TEAM.template.xcconfig b/Xcode-config/DEVELOPMENT_TEAM.template.xcconfig new file mode 100644 index 00000000..d6cf1770 --- /dev/null +++ b/Xcode-config/DEVELOPMENT_TEAM.template.xcconfig @@ -0,0 +1 @@ +DEVELOPMENT_TEAM = AB1234C5DE diff --git a/Xcode-config/Shared.xcconfig b/Xcode-config/Shared.xcconfig new file mode 100644 index 00000000..d0704be3 --- /dev/null +++ b/Xcode-config/Shared.xcconfig @@ -0,0 +1,49 @@ +#include? "DEVELOPMENT_TEAM.xcconfig" + +// Create the file DEVELOPMENT_TEAM.xcconfig +// in the "Xcode-config" directory within the project directory +// with the following build setting: +// DEVELOPMENT_TEAM = [Your TeamID] + +// One way to find your Team ID is to set the “Development Team” +// build setting (Xcode key: "DEVELOPMENT_TEAM") and have a look +// at the “Source Control” changes (menu item “Commit…”/⌥⌘C). +// Just make sure that this change doesn’t actually get commited. + +// You can also find your Team ID by logging into your Apple Developer account +// and going to +// https://developer.apple.com/account/#/membership +// It should be listed under “Team ID”. + +// To set this system up for your own project, +// copy the "Xcode-config" directory there, +// add it to your Xcode project, +// navigate to your project settings +// (root icon in the Xcode Project Navigator) +// click on the project icon there, +// click on the “Info” tab +// under “Configurations” +// open the “Debug”, “Release”, +// and any other build configurations you might have. +// There you can set the pull-down menus in the +// “Based on Configuration File” column to “Shared”. +// Your work in Xcode is done. + +// Don’t forget to add the DEVELOPMENT_TEAM.xcconfig file to your .gitignore: +// # User-specific xcconfig files +// Xcode-config/DEVELOPMENT_TEAM.xcconfig +// The two lines above are an example. +// Please don’t copy the comment slashes over though. + +// You can and should now replace the “DevelopmentTeam = AB1234C5DE;” entries in +// .xcodeproj/project.pbxproj +// with “DevelopmentTeam = "";” +// They would otherwise override the Team ID set via this config file and its include. +// Please note that .pbxproj files use straight quotes. + +// When you commit changes to the Xcode project file +// after changing settings in “Signing & Capabilities” +// Entries like these may appear in your file changes/commit diff preview: +// CODE_SIGN_IDENTITY = …; +// CODE_SIGN_STYLE = Manual/Automatic; +// Please make sure not to commit them to source control. diff --git a/Yattee.xcodeproj/project.pbxproj b/Yattee.xcodeproj/project.pbxproj index 59e4016d..dd468344 100644 --- a/Yattee.xcodeproj/project.pbxproj +++ b/Yattee.xcodeproj/project.pbxproj @@ -827,6 +827,9 @@ 37FD43E22704847C0073EE42 /* View+Fixtures.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "View+Fixtures.swift"; sourceTree = ""; }; 37FEF11227EFD8580033912F /* PlaceholderCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlaceholderCell.swift; sourceTree = ""; }; 37FFC43F272734C3009FFD26 /* Throttle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Throttle.swift; sourceTree = ""; }; + 3DA101AD287C30F50027D920 /* DEVELOPMENT_TEAM.template.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = DEVELOPMENT_TEAM.template.xcconfig; sourceTree = ""; }; + 3DA101AE287C30F50027D920 /* DEVELOPMENT_TEAM.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = DEVELOPMENT_TEAM.xcconfig; sourceTree = ""; }; + 3DA101AF287C30F50027D920 /* Shared.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Shared.xcconfig; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -1231,6 +1234,7 @@ 37D4B0BC2671614700C925CA = { isa = PBXGroup; children = ( + 3DA101AC287C30F50027D920 /* Xcode-config */, 37992DC826CC50CD003D4C27 /* iOS */, 37BE0BD826A214500092E2DB /* macOS */, 37D4B159267164AE00C925CA /* tvOS */, @@ -1429,6 +1433,16 @@ path = Search; sourceTree = ""; }; + 3DA101AC287C30F50027D920 /* Xcode-config */ = { + isa = PBXGroup; + children = ( + 3DA101AD287C30F50027D920 /* DEVELOPMENT_TEAM.template.xcconfig */, + 3DA101AE287C30F50027D920 /* DEVELOPMENT_TEAM.xcconfig */, + 3DA101AF287C30F50027D920 /* Shared.xcconfig */, + ); + path = "Xcode-config"; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -2475,7 +2489,6 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 24; - DEVELOPMENT_TEAM = ""; ENABLE_HARDENED_RUNTIME = YES; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = "Open in Yattee/Info.plist"; @@ -2509,7 +2522,6 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 24; - DEVELOPMENT_TEAM = ""; ENABLE_HARDENED_RUNTIME = YES; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = "Open in Yattee/Info.plist"; @@ -2541,7 +2553,6 @@ CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 24; - DEVELOPMENT_TEAM = ""; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = "Open in Yattee/Info.plist"; INFOPLIST_KEY_CFBundleDisplayName = "Open in Yattee"; @@ -2573,7 +2584,6 @@ CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 24; - DEVELOPMENT_TEAM = ""; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = "Open in Yattee/Info.plist"; INFOPLIST_KEY_CFBundleDisplayName = "Open in Yattee"; @@ -2604,7 +2614,6 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = ""; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -2613,13 +2622,13 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = ""; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; }; 37D4B0EA2671614900C925CA /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 3DA101AF287C30F50027D920 /* Shared.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -2679,6 +2688,7 @@ }; 37D4B0EB2671614900C925CA /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 3DA101AF287C30F50027D920 /* Shared.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -2734,9 +2744,9 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 24; - DEVELOPMENT_TEAM = ""; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = iOS/Info.plist; @@ -2754,6 +2764,7 @@ MARKETING_VERSION = 1.3.5; PRODUCT_BUNDLE_IDENTIFIER = stream.yattee.app; PRODUCT_NAME = Yattee; + PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = iphoneos; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; @@ -2766,9 +2777,9 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 24; - DEVELOPMENT_TEAM = ""; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = iOS/Info.plist; @@ -2786,6 +2797,7 @@ MARKETING_VERSION = 1.3.5; PRODUCT_BUNDLE_IDENTIFIER = stream.yattee.app; PRODUCT_NAME = Yattee; + PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = iphoneos; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; @@ -2804,7 +2816,6 @@ CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 24; - DEVELOPMENT_TEAM = ""; ENABLE_APP_SANDBOX = YES; ENABLE_HARDENED_RUNTIME = YES; ENABLE_PREVIEWS = YES; @@ -2837,7 +2848,6 @@ CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 24; - DEVELOPMENT_TEAM = ""; ENABLE_APP_SANDBOX = YES; ENABLE_HARDENED_RUNTIME = YES; ENABLE_PREVIEWS = YES; @@ -2866,7 +2876,6 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = ""; GENERATE_INFOPLIST_FILE = YES; IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( @@ -2891,7 +2900,6 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = ""; GENERATE_INFOPLIST_FILE = YES; IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( @@ -2918,7 +2926,6 @@ CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = ""; GENERATE_INFOPLIST_FILE = YES; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -2943,7 +2950,6 @@ CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = ""; GENERATE_INFOPLIST_FILE = YES; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -2969,7 +2975,6 @@ CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 24; DEVELOPMENT_ASSET_PATHS = ""; - DEVELOPMENT_TEAM = ""; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = tvOS/Info.plist; @@ -3001,7 +3006,6 @@ CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 24; DEVELOPMENT_ASSET_PATHS = ""; - DEVELOPMENT_TEAM = ""; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = tvOS/Info.plist; @@ -3032,7 +3036,6 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = ""; GENERATE_INFOPLIST_FILE = YES; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -3057,7 +3060,6 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = ""; GENERATE_INFOPLIST_FILE = YES; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -3081,7 +3083,6 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = ""; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -3090,7 +3091,6 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = ""; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -3099,7 +3099,6 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = ""; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -3108,7 +3107,6 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = ""; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release;