Skip to content

Commit 197b90c

Browse files
authored
chore: extract bundle configuration item (#146)
1 parent 29509aa commit 197b90c

File tree

2 files changed

+22
-18
lines changed

2 files changed

+22
-18
lines changed

iosApp/Configuration/Config.xcconfig

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1-
TEAM_ID=
1+
OONI_TEAM_ID=
2+
OONI_PROBE_BUNDLE_ID=org.ooni.probe
3+
OONI_PROBE_APP_NAME=OONI Probe
4+
NMS_BUNDLE_ID=org.dw.probe
5+
NMS_APP_NAME=News Media Scan
6+
NMS_TEAM_ID=
27
BUNDLE_ID=org.ooni.probe.OONIProbe
3-
APP_NAME=OONI Probe

iosApp/iosApp.xcodeproj/project.pbxproj

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -630,7 +630,7 @@
630630
CODE_SIGN_IDENTITY = "Apple Development";
631631
CODE_SIGN_STYLE = Automatic;
632632
DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\"";
633-
DEVELOPMENT_TEAM = "${TEAM_ID}";
633+
DEVELOPMENT_TEAM = "${OONI_TEAM_ID}";
634634
ENABLE_PREVIEWS = YES;
635635
FRAMEWORK_SEARCH_PATHS = (
636636
"$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
@@ -648,9 +648,9 @@
648648
"-framework",
649649
composeApp,
650650
);
651-
PRODUCT_BUNDLE_IDENTIFIER = org.ooni.probe.debug;
652-
"PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = org.ooni.probe.debug;
653-
PRODUCT_NAME = "${APP_NAME}";
651+
PRODUCT_BUNDLE_IDENTIFIER = "${OONI_PROBE_BUNDLE_ID}.debug";
652+
"PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = "${OONI_PROBE_BUNDLE_ID}.debug";
653+
PRODUCT_NAME = "${OONI_PROBE_APP_NAME}";
654654
PROVISIONING_PROFILE_SPECIFIER = "";
655655
SWIFT_VERSION = 5.0;
656656
TARGETED_DEVICE_FAMILY = "1,2";
@@ -666,7 +666,7 @@
666666
CODE_SIGN_IDENTITY = "Apple Development";
667667
CODE_SIGN_STYLE = Automatic;
668668
DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\"";
669-
DEVELOPMENT_TEAM = "${TEAM_ID}";
669+
DEVELOPMENT_TEAM = "${OONI_TEAM_ID}";
670670
ENABLE_PREVIEWS = YES;
671671
FRAMEWORK_SEARCH_PATHS = (
672672
"$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
@@ -684,9 +684,9 @@
684684
"-framework",
685685
composeApp,
686686
);
687-
PRODUCT_BUNDLE_IDENTIFIER = org.ooni.probe;
688-
"PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = org.ooni.probe;
689-
PRODUCT_NAME = "${APP_NAME}";
687+
PRODUCT_BUNDLE_IDENTIFIER = "${OONI_PROBE_BUNDLE_ID}";
688+
"PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = "${OONI_PROBE_BUNDLE_ID}";
689+
PRODUCT_NAME = "${OONI_PROBE_APP_NAME}";
690690
PROVISIONING_PROFILE_SPECIFIER = "";
691691
SWIFT_VERSION = 5.0;
692692
TARGETED_DEVICE_FAMILY = "1,2";
@@ -701,7 +701,7 @@
701701
CODE_SIGN_IDENTITY = "Apple Development";
702702
CODE_SIGN_STYLE = Automatic;
703703
DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\"";
704-
DEVELOPMENT_TEAM = "${TEAM_ID}";
704+
DEVELOPMENT_TEAM = "${NMS_TEAM_ID}";
705705
ENABLE_PREVIEWS = YES;
706706
FRAMEWORK_SEARCH_PATHS = (
707707
"$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
@@ -719,9 +719,9 @@
719719
"-framework",
720720
composeApp,
721721
);
722-
PRODUCT_BUNDLE_IDENTIFIER = org.dw.probe.debug;
723-
"PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = org.dw.probe.debug;
724-
PRODUCT_NAME = "$(TARGET_NAME)";
722+
PRODUCT_BUNDLE_IDENTIFIER = "${NMS_BUNDLE_ID}.debug";
723+
"PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = "${NMS_BUNDLE_ID}.debug";
724+
PRODUCT_NAME = "${NMS_APP_NAME}";
725725
PROVISIONING_PROFILE_SPECIFIER = "";
726726
SWIFT_VERSION = 5.0;
727727
TARGETED_DEVICE_FAMILY = "1,2";
@@ -736,7 +736,7 @@
736736
CODE_SIGN_IDENTITY = "Apple Development";
737737
CODE_SIGN_STYLE = Automatic;
738738
DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\"";
739-
DEVELOPMENT_TEAM = "${TEAM_ID}";
739+
DEVELOPMENT_TEAM = "${NMS_TEAM_ID}";
740740
ENABLE_PREVIEWS = YES;
741741
FRAMEWORK_SEARCH_PATHS = (
742742
"$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
@@ -754,9 +754,9 @@
754754
"-framework",
755755
composeApp,
756756
);
757-
PRODUCT_BUNDLE_IDENTIFIER = org.dw.probe;
758-
"PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = org.dw.probe;
759-
PRODUCT_NAME = "$(TARGET_NAME)";
757+
PRODUCT_BUNDLE_IDENTIFIER = "${NMS_BUNDLE_ID}";
758+
"PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = "${NMS_BUNDLE_ID}";
759+
PRODUCT_NAME = "${NMS_APP_NAME}";
760760
PROVISIONING_PROFILE_SPECIFIER = "";
761761
SWIFT_VERSION = 5.0;
762762
TARGETED_DEVICE_FAMILY = "1,2";

0 commit comments

Comments
 (0)