Skip to content

Commit f296c90

Browse files
alberti42alberti42
committed
Use LocalSigning.xcconfig for the developer ID infos
1 parent 76561e6 commit f296c90

4 files changed

Lines changed: 22 additions & 13 deletions

File tree

‎.gitattributes‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎.github/workflows/draft-release.yml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,22 @@ jobs:
8080
security set-key-partition-list \
8181
-S "apple-tool:,apple:,codesign:" -s -k "$KC_PASS" "$KC"
8282
83+
- name: Create LocalSigning.xcconfig from secrets
84+
env:
85+
TEAM_ID: ${{ secrets.NOTARIZATION_TEAM_ID }}
86+
run: |
87+
echo "DEVELOPMENT_TEAM = $TEAM_ID" > LocalSigning.xcconfig
88+
echo "BUNDLE_ID_BASE = io.alberti42.VolumeControl" >> LocalSigning.xcconfig
89+
8390
# ── Build ─────────────────────────────────────────────────────────────────
8491
- name: Install xcpretty
8592
run: gem install xcpretty --no-document
8693

8794
- name: Build universal binary
8895
run: |
8996
# Call xcodebuild directly so we can:
90-
# 1. Suppress Xcode's automatic signing (DEVELOPMENT_TEAM is
91-
# anonymised to 0000000000 in the committed pbxproj).
97+
# 1. Suppress Xcode's automatic signing (DEVELOPMENT_TEAM and
98+
# BUNDLE_ID_BASE are now in LocalSigning.xcconfig).
9299
# The explicit `codesign` step below does the real signing.
93100
# 2. Enable pipefail so a failed build isn't masked by xcpretty's
94101
# zero exit code.

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,4 @@ Releases/appcast.xml
2626
# Sublime Text
2727
*.sublime-project
2828
*.sublime-workspace
29+
LocalSigning.xcconfig

‎Volume Control.xcodeproj/project.pbxproj‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@
8989
65EF8F582E888C6B00AAE7B7 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Sparkle.framework; sourceTree = "<group>"; };
9090
BC20FAA128902EF500CF5CAF /* Doppler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Doppler.h; sourceTree = "<group>"; };
9191
BC20FAA228902EF500CF5CB0 /* Swinsian.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Swinsian.h; sourceTree = "<group>"; };
92+
65CAFE00CAFE00CAFE00CAFE /* LocalSigning.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "LocalSigning.xcconfig"; path = "LocalSigning.xcconfig"; sourceTree = SOURCE_ROOT; };
9293
/* End PBXFileReference section */
9394

9495
/* Begin PBXFileSystemSynchronizedGroupBuildPhaseMembershipExceptionSet section */
@@ -147,6 +148,7 @@
147148
65996D1C267EADAA0080A9A5 /* Resources */,
148149
6546E18B2E8C66FB0087E95F /* VolumeControl */,
149150
65DBBEDB2E89DE1800752329 /* Volume Control Helper */,
151+
65CAFE00CAFE00CAFE00CAFE /* LocalSigning.xcconfig */,
150152
65996D0C267EACE30080A9A5 /* Frameworks */,
151153
65996C56267EA86A0080A9A5 /* Products */,
152154
);
@@ -432,6 +434,7 @@
432434
/* Begin XCBuildConfiguration section */
433435
65996C64267EA86B0080A9A5 /* Debug */ = {
434436
isa = XCBuildConfiguration;
437+
baseConfigurationReference = 65CAFE00CAFE00CAFE00CAFE /* LocalSigning.xcconfig */;
435438
buildSettings = {
436439
ALWAYS_SEARCH_USER_PATHS = NO;
437440
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
@@ -467,7 +470,6 @@
467470
COPY_PHASE_STRIP = NO;
468471
DEAD_CODE_STRIPPING = YES;
469472
DEBUG_INFORMATION_FORMAT = dwarf;
470-
DEVELOPMENT_TEAM = 0000000000;
471473
ENABLE_STRICT_OBJC_MSGSEND = YES;
472474
ENABLE_TESTABILITY = YES;
473475
ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -496,6 +498,7 @@
496498
};
497499
65996C65267EA86B0080A9A5 /* Release */ = {
498500
isa = XCBuildConfiguration;
501+
baseConfigurationReference = 65CAFE00CAFE00CAFE00CAFE /* LocalSigning.xcconfig */;
499502
buildSettings = {
500503
ALWAYS_SEARCH_USER_PATHS = NO;
501504
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
@@ -531,7 +534,6 @@
531534
COPY_PHASE_STRIP = NO;
532535
DEAD_CODE_STRIPPING = YES;
533536
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
534-
DEVELOPMENT_TEAM = 0000000000;
535537
ENABLE_NS_ASSERTIONS = NO;
536538
ENABLE_STRICT_OBJC_MSGSEND = YES;
537539
ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -553,6 +555,7 @@
553555
};
554556
65996C67267EA86B0080A9A5 /* Debug */ = {
555557
isa = XCBuildConfiguration;
558+
baseConfigurationReference = 65CAFE00CAFE00CAFE00CAFE /* LocalSigning.xcconfig */;
556559
buildSettings = {
557560
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
558561
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
@@ -563,7 +566,6 @@
563566
COMBINE_HIDPI_IMAGES = YES;
564567
CURRENT_PROJECT_VERSION = 214;
565568
DEAD_CODE_STRIPPING = YES;
566-
DEVELOPMENT_TEAM = 0000000000;
567569
ENABLE_APP_SANDBOX = NO;
568570
ENABLE_HARDENED_RUNTIME = YES;
569571
ENABLE_RESOURCE_ACCESS_PHOTO_LIBRARY = NO;
@@ -581,7 +583,7 @@
581583
);
582584
MACOSX_DEPLOYMENT_TARGET = 13.5;
583585
MARKETING_VERSION = 2.2.0;
584-
PRODUCT_BUNDLE_IDENTIFIER = io.your.company.VolumeControl;
586+
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_BASE)";
585587
PRODUCT_NAME = "$(TARGET_NAME)";
586588
PROVISIONING_PROFILE_SPECIFIER = "";
587589
RUNTIME_EXCEPTION_ALLOW_DYLD_ENVIRONMENT_VARIABLES = NO;
@@ -596,6 +598,7 @@
596598
};
597599
65996C68267EA86B0080A9A5 /* Release */ = {
598600
isa = XCBuildConfiguration;
601+
baseConfigurationReference = 65CAFE00CAFE00CAFE00CAFE /* LocalSigning.xcconfig */;
599602
buildSettings = {
600603
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
601604
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
@@ -606,7 +609,6 @@
606609
COMBINE_HIDPI_IMAGES = YES;
607610
CURRENT_PROJECT_VERSION = 214;
608611
DEAD_CODE_STRIPPING = YES;
609-
DEVELOPMENT_TEAM = 0000000000;
610612
ENABLE_APP_SANDBOX = NO;
611613
ENABLE_HARDENED_RUNTIME = YES;
612614
ENABLE_RESOURCE_ACCESS_PHOTO_LIBRARY = NO;
@@ -624,7 +626,7 @@
624626
);
625627
MACOSX_DEPLOYMENT_TARGET = 13.5;
626628
MARKETING_VERSION = 2.2.0;
627-
PRODUCT_BUNDLE_IDENTIFIER = io.your.company.VolumeControl;
629+
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_BASE)";
628630
PRODUCT_NAME = "$(TARGET_NAME)";
629631
PROVISIONING_PROFILE_SPECIFIER = "";
630632
RUNTIME_EXCEPTION_ALLOW_DYLD_ENVIRONMENT_VARIABLES = NO;
@@ -639,14 +641,14 @@
639641
};
640642
65DBBEE32E89DE1A00752329 /* Debug */ = {
641643
isa = XCBuildConfiguration;
644+
baseConfigurationReference = 65CAFE00CAFE00CAFE00CAFE /* LocalSigning.xcconfig */;
642645
buildSettings = {
643646
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
644647
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
645648
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
646649
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
647650
CODE_SIGN_STYLE = Automatic;
648651
CURRENT_PROJECT_VERSION = 214;
649-
DEVELOPMENT_TEAM = 0000000000;
650652
ENABLE_APP_SANDBOX = YES;
651653
ENABLE_HARDENED_RUNTIME = YES;
652654
ENABLE_PREVIEWS = YES;
@@ -669,7 +671,7 @@
669671
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
670672
MACOSX_DEPLOYMENT_TARGET = 13.5;
671673
MARKETING_VERSION = 1.0;
672-
PRODUCT_BUNDLE_IDENTIFIER = io.your.company.VolumeControlHelper;
674+
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_BASE)Helper";
673675
PRODUCT_NAME = "$(TARGET_NAME)";
674676
REGISTER_APP_GROUPS = YES;
675677
SDKROOT = auto;
@@ -689,14 +691,14 @@
689691
};
690692
65DBBEE42E89DE1A00752329 /* Release */ = {
691693
isa = XCBuildConfiguration;
694+
baseConfigurationReference = 65CAFE00CAFE00CAFE00CAFE /* LocalSigning.xcconfig */;
692695
buildSettings = {
693696
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
694697
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
695698
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
696699
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
697700
CODE_SIGN_STYLE = Automatic;
698701
CURRENT_PROJECT_VERSION = 214;
699-
DEVELOPMENT_TEAM = 0000000000;
700702
ENABLE_APP_SANDBOX = YES;
701703
ENABLE_HARDENED_RUNTIME = YES;
702704
ENABLE_PREVIEWS = YES;
@@ -719,7 +721,7 @@
719721
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
720722
MACOSX_DEPLOYMENT_TARGET = 13.5;
721723
MARKETING_VERSION = 1.0;
722-
PRODUCT_BUNDLE_IDENTIFIER = io.your.company.VolumeControlHelper;
724+
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_BASE)Helper";
723725
PRODUCT_NAME = "$(TARGET_NAME)";
724726
REGISTER_APP_GROUPS = YES;
725727
SDKROOT = auto;

0 commit comments

Comments
 (0)