Quellcode durchsuchen

Config-based App Group independent of Trio BundleID (#558)

Co-authored-by: marionbarker <marionbarker@earthlink.net>
Robert vor 11 Monaten
Ursprung
Commit
7beef09f8d
2 geänderte Dateien mit 24 neuen und 9 gelöschten Zeilen
  1. 20 5
      Config.xcconfig
  2. 4 4
      Trio.xcodeproj/project.pbxproj

+ 20 - 5
Config.xcconfig

@@ -1,14 +1,29 @@
+// Some of the items can be modified to match the user's preference
 APP_DISPLAY_NAME = Trio
+APP_ICON = trioBlack
+APP_URL_SCHEME = Trio
+
+// DEVELOPER_TEAM will be set to your Apple Developer ID - typically using ConfigOverride.xcconfig
+DEVELOPER_TEAM = ##TEAM_ID##
+
+// Typically this is not modified unless you want to create a separate (unique) app using your ID
+// It must include $(DEVELOPMENT_TEAM)
+// For example: myOwnApp.$(DEVELOPMENT_TEAM).trio
+BUNDLE_IDENTIFIER = org.nightscout.$(DEVELOPMENT_TEAM).trio
+
+// Danger zone - do not modify these unless you know what you are doing
+
+// The TRIO_APP_GROUP_ID should not be modified - it is required to have this exact format
+// to build with GitHub actions and to work with xDrip4iOS
+TRIO_APP_GROUP_ID = group.org.nightscout.$(DEVELOPMENT_TEAM).trio.trio-app-group
+
+// The developers set the version numbers, please leave them alone
 APP_VERSION = 0.5.0
 APP_DEV_VERSION = 0.5.0.27
 APP_BUILD_NUMBER = 1
 COPYRIGHT_NOTICE =
-DEVELOPER_TEAM = ##TEAM_ID##
-BUNDLE_IDENTIFIER = org.nightscout.$(DEVELOPMENT_TEAM).trio
-APP_ICON = trioBlack
-APP_URL_SCHEME = Trio
 
-// Optional overrides
+// Optional overrides - these can be used to insert your TEAMID into the DEVELOPER_TEAM field
 #include? "../../ConfigOverride.xcconfig"
 #include? "../ConfigOverride.xcconfig"
 #include? "ConfigOverride.xcconfig"

+ 4 - 4
Trio.xcodeproj/project.pbxproj

@@ -4755,7 +4755,7 @@
 			baseConfigurationReference = 38F3783A2613555C009DB701 /* Config.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				APP_GROUP_ID = "group.$(BUNDLE_IDENTIFIER).trio-app-group";
+				APP_GROUP_ID = "$(TRIO_APP_GROUP_ID)";
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -4823,7 +4823,7 @@
 			baseConfigurationReference = 38F3783A2613555C009DB701 /* Config.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				APP_GROUP_ID = "group.$(BUNDLE_IDENTIFIER).trio-app-group";
+				APP_GROUP_ID = "$(TRIO_APP_GROUP_ID)";
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -4884,7 +4884,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				APP_DISPLAY_NAME = "$(APP_DISPLAY_NAME)";
-				APP_GROUP_ID = "$(APP_GROUP_ID)";
+				APP_GROUP_ID = "$(TRIO_APP_GROUP_ID)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = "$(APP_ICON)";
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
@@ -4926,7 +4926,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				APP_DISPLAY_NAME = "$(APP_DISPLAY_NAME)";
-				APP_GROUP_ID = "$(APP_GROUP_ID)";
+				APP_GROUP_ID = "$(TRIO_APP_GROUP_ID)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = "$(APP_ICON)";
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;