Align Safari extension signing settings

Author: Bbrizly

safari-app/Pluck/Pluck.xcodeproj/project.pbxproj

@@ -222,7 +222,7 @@
 					};
 				};
 			};
-			buildConfigurationList = 3FE01093300443A2003A8AAE /* Build configuration list for PBXProject "Pluck Pins" */;
+			buildConfigurationList = 3FE01093300443A2003A8AAE /* Build configuration list for PBXProject "Pluck" */;
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
@@ -442,8 +442,10 @@
 		3FE010BE300443A3003A8AAE /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
+				DEVELOPMENT_TEAM = 69NPZWZB47;
 				ENABLE_APP_SANDBOX = YES;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_USER_SELECTED_FILES = readonly;
@@ -476,8 +478,10 @@
 		3FE010BF300443A3003A8AAE /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
+				DEVELOPMENT_TEAM = 69NPZWZB47;
 				ENABLE_APP_SANDBOX = YES;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_USER_SELECTED_FILES = readonly;
@@ -512,9 +516,11 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 1;
+				DEVELOPMENT_TEAM = 69NPZWZB47;
 				ENABLE_APP_SANDBOX = YES;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_OUTGOING_NETWORK_CONNECTIONS = YES;
@@ -553,9 +559,11 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 1;
+				DEVELOPMENT_TEAM = 69NPZWZB47;
 				ENABLE_APP_SANDBOX = YES;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_OUTGOING_NETWORK_CONNECTIONS = YES;
@@ -592,7 +600,7 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		3FE01093300443A2003A8AAE /* Build configuration list for PBXProject "Pluck Pins" */ = {
+		3FE01093300443A2003A8AAE /* Build configuration list for PBXProject "Pluck" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				3FE010BB300443A3003A8AAE /* Debug */,

safari-app/Pluck/Pluck.xcodeproj/xcshareddata/xcschemes/Pluck (macOS).xcscheme

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "2600"
-   version = "1.7">
+   version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES"
@@ -28,6 +28,8 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"

scripts/package-safari.sh

@@ -5,6 +5,7 @@ ROOT="$(cd "$(dirname "$0")/.." && pwd)"
 OUTPUT="${1:-$ROOT/safari-app}"
 BUNDLE_ID="${BUNDLE_ID:-com.bbrizly.pluck}"
 APP_NAME="${APP_NAME:-Pluck Pins}"
+DEVELOPMENT_TEAM="${DEVELOPMENT_TEAM:-69NPZWZB47}"
 
 if xcrun --find safari-web-extension-packager >/dev/null 2>&1; then
   TOOL="safari-web-extension-packager"
@@ -27,6 +28,19 @@ echo "Safari Xcode project created in: $OUTPUT"
 PROJECT=$(find "$OUTPUT" -maxdepth 2 -name '*.xcodeproj' -print -quit 2>/dev/null || true)
 if [[ -n "$PROJECT" && "$APP_NAME" == "Pluck Pins" ]]; then
   TARGET_BUNDLE_ID="$BUNDLE_ID" /usr/bin/perl -0pi -e 's/PRODUCT_BUNDLE_IDENTIFIER = "?com\.bbrizly\.Pluck-Pins"?;/PRODUCT_BUNDLE_IDENTIFIER = $ENV{TARGET_BUNDLE_ID};/g' "$PROJECT/project.pbxproj"
+  DEVELOPMENT_TEAM="$DEVELOPMENT_TEAM" /usr/bin/perl -0pi -e '
+    sub fix_signing {
+      my ($block) = @_;
+      return $block unless $block =~ /PRODUCT_BUNDLE_IDENTIFIER = com\.bbrizly\.pluck(?:\.Extension)?;/;
+      my $team = $ENV{DEVELOPMENT_TEAM};
+      $block =~ s/DEVELOPMENT_TEAM = [^;]+;/DEVELOPMENT_TEAM = $team;/g;
+      $block =~ s/"CODE_SIGN_IDENTITY\[sdk=macosx\*\]" = "[^"]+";/"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";/g;
+      $block =~ s/(CODE_SIGN_STYLE = Automatic;\n)/\t\t\t\t"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";\n$1/ unless $block =~ /CODE_SIGN_IDENTITY\[sdk=macosx\*\]/;
+      $block =~ s/(CURRENT_PROJECT_VERSION = [^;]+;\n)/$1\t\t\t\tDEVELOPMENT_TEAM = $team;\n/ unless $block =~ /DEVELOPMENT_TEAM = /;
+      return $block;
+    }
+    s/(buildSettings = \{.*?\n\t\t\t\};)/fix_signing($1)/ges;
+  ' "$PROJECT/project.pbxproj"
   RESOURCE_ROOT="$ROOT/extension" \
   RESOURCE_ROOT_NO_SLASH="${ROOT#/}/extension" \
   TARGET_RESOURCE_PATH="../../../extension" \