diff --git a/ResearchKit.xcodeproj/project.pbxproj b/ResearchKit.xcodeproj/project.pbxproj index 6a7b8e912..c52483ae1 100644 --- 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 = ""; }; CA0AC56828BD4FAB00E80040 /* ORKStepViewControllerHelpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ORKStepViewControllerHelpers.swift; sourceTree = ""; }; 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 = ""; }; CA23A31C2899941700EC6E91 /* ORKSkin_Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ORKSkin_Private.h; sourceTree = ""; }; CA2B902528A187390025B773 /* ORKTask_Util.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ORKTask_Util.m; sourceTree = ""; }; CA481E8128CBD6D9001C4D49 /* ResearchKitUI-Shared.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "ResearchKitUI-Shared.xcconfig"; sourceTree = ""; }; @@ -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 index 31955fa28..6683c6a9d 100644 --- 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 index 14347df8c..f885955ec 100644 --- a/ResearchKit/Info.plist +++ b/ResearchKit/Info.plist @@ -3,17 +3,17 @@ CFBundleDevelopmentRegion - en + $(DEVELOPMENT_LANGUAGE) CFBundleExecutable - ${EXECUTABLE_NAME} + $(EXECUTABLE_NAME) CFBundleIdentifier $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName - ${PRODUCT_NAME} + $(PRODUCT_NAME) CFBundlePackageType - BNDL + $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString $(VERSION_NUMBER) CFBundleSignature diff --git a/ResearchKitActiveTask/Info.plist b/ResearchKitActiveTask/Info.plist index 291294aca..f885955ec 100644 --- a/ResearchKitActiveTask/Info.plist +++ b/ResearchKitActiveTask/Info.plist @@ -4,8 +4,6 @@ CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) - CFBundleDisplayName - ResearchKitActiveTask CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier @@ -13,12 +11,14 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - ResearchKitActiveTask + $(PRODUCT_NAME) CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 1.0 + $(VERSION_NUMBER) + CFBundleSignature + ???? CFBundleVersion - $(ORK_FRAMEWORK_BUILD_NUMBER) + $(VERSION_NUMBER) diff --git a/ResearchKitUI/Info-iOS.plist b/ResearchKitUI/Info-iOS.plist deleted file mode 100644 index a495e5e6b..000000000 --- a/ResearchKitUI/Info-iOS.plist +++ /dev/null @@ -1,24 +0,0 @@ - - - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleDisplayName - ResearchKitUI - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ResearchKitUI - CFBundlePackageType - $(PRODUCT_BUNDLE_PACKAGE_TYPE) - CFBundleShortVersionString - 1.0 - CFBundleVersion - $(ORK_FRAMEWORK_BUILD_NUMBER) - - diff --git a/ResearchKitUI/Info.plist b/ResearchKitUI/Info.plist index 9bcb24442..f885955ec 100644 --- a/ResearchKitUI/Info.plist +++ b/ResearchKitUI/Info.plist @@ -15,8 +15,10 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 1.0 + $(VERSION_NUMBER) + CFBundleSignature + ???? CFBundleVersion - $(CURRENT_PROJECT_VERSION) + $(VERSION_NUMBER)