Fix Info.plists

StanfordBDHG · May 30, 2024 · 3fa66cc · 3fa66cc
1 parent cf7ad89
commit 3fa66cc
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 38 deletions.
diff --git a/ResearchKit.xcodeproj/project.pbxproj b/ResearchKit.xcodeproj/project.pbxproj
@@ -1970,7 +1970,6 @@
 		CA08054328AD7EBA001695EF /* ORKStep+ResearchKitUI.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "ORKStep+ResearchKitUI.m"; sourceTree = "<group>"; };
 		CA0AC56828BD4FAB00E80040 /* ORKStepViewControllerHelpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ORKStepViewControllerHelpers.swift; sourceTree = "<group>"; };
 		CA1C7A5A288B0C68004DAB3A /* ResearchKitUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ResearchKitUI.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		CA1C7A5B288B0C69004DAB3A /* Info-iOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-iOS.plist"; sourceTree = "<group>"; };
 		CA23A31C2899941700EC6E91 /* ORKSkin_Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ORKSkin_Private.h; sourceTree = "<group>"; };
 		CA2B902528A187390025B773 /* ORKTask_Util.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ORKTask_Util.m; sourceTree = "<group>"; };
 		CA481E8128CBD6D9001C4D49 /* ResearchKitUI-Shared.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "ResearchKitUI-Shared.xcconfig"; sourceTree = "<group>"; };
@@ -2689,7 +2688,6 @@
 				CA6A0D9D288F1BDC0048C1EF /* ResearchKitUI_Private.h */,
 				0B0852752BD872D800149963 /* PrivacyInfo.xcprivacy */,
 				5D06633024FEF272005D9B40 /* Info.plist */,
-				CA1C7A5B288B0C69004DAB3A /* Info-iOS.plist */,
 				51FBAC582BC86E6E009CA28F /* ResearchKitUI_Private.modulemap */,
 			);
 			path = ResearchKitUI;

diff --git a/ResearchKit/Configuration/ResearchKitUI/ResearchKitUI-Shared.xcconfig b/ResearchKit/Configuration/ResearchKitUI/ResearchKitUI-Shared.xcconfig
@@ -5,6 +5,6 @@
 #include "../ResearchKit/ResearchKit-Shared.xcconfig"
 
 GCC_PREFIX_HEADER = ResearchKitUI/ResearchKitUI_Prefix.pch
-INFOPLIST_FILE = ResearchKitUI/Info-iOS.plist
+INFOPLIST_FILE = ResearchKitUI/Info.plist
 MODULEMAP_FILE = ResearchKitUI/ResearchKitUI.modulemap
 PRODUCT_NAME = ResearchKitUI
diff --git a/ResearchKit/Info.plist b/ResearchKit/Info.plist
@@ -3,17 +3,17 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleExecutable</key>
-	<string>${EXECUTABLE_NAME}</string>
+	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
 	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>${PRODUCT_NAME}</string>
+	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
-	<string>BNDL</string>
+	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
 	<string>$(VERSION_NUMBER)</string>
 	<key>CFBundleSignature</key>

diff --git a/ResearchKitActiveTask/Info.plist b/ResearchKitActiveTask/Info.plist
@@ -4,21 +4,21 @@
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleDisplayName</key>
-	<string>ResearchKitActiveTask</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
 	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>ResearchKitActiveTask</string>
+	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>$(VERSION_NUMBER)</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>$(ORK_FRAMEWORK_BUILD_NUMBER)</string>
+	<string>$(VERSION_NUMBER)</string>
 </dict>
 </plist>
diff --git a/ResearchKitUI/Info-iOS.plist b/ResearchKitUI/Info-iOS.plist
diff --git a/ResearchKitUI/Info.plist b/ResearchKitUI/Info.plist
@@ -15,8 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>$(VERSION_NUMBER)</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<string>$(VERSION_NUMBER)</string>
 </dict>
 </plist>