Prechádzať zdrojové kódy

sync versions of deltachat-ios and DcShare target

B. Petersen 5 rokov pred
rodič
commit
b32f3341b1

+ 3 - 3
DcShare/Info.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSExtension</key>
 	<key>NSExtension</key>
 	<dict>
 	<dict>
 		<key>NSExtensionAttributes</key>
 		<key>NSExtensionAttributes</key>
@@ -37,7 +37,7 @@ ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.movie" ||
 ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.plain-text" ||
 ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.plain-text" ||
 ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.url"
 ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.url"
 ).@count == $extensionItem.attachments.@count
 ).@count == $extensionItem.attachments.@count
-).@count >= 1</string>
+).@count &gt;= 1</string>
 		</dict>
 		</dict>
 		<key>NSExtensionMainStoryboard</key>
 		<key>NSExtensionMainStoryboard</key>
 		<string>MainInterface</string>
 		<string>MainInterface</string>

+ 4 - 0
deltachat-ios.xcodeproj/project.pbxproj

@@ -1597,11 +1597,13 @@
 				CODE_SIGN_ENTITLEMENTS = DcShare/DcShare.entitlements;
 				CODE_SIGN_ENTITLEMENTS = DcShare/DcShare.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
 				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 31;
 				DEVELOPMENT_TEAM = 8Y86453UA8;
 				DEVELOPMENT_TEAM = 8Y86453UA8;
 				ENABLE_BITCODE = NO;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = DcShare/Info.plist;
 				INFOPLIST_FILE = DcShare/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
+				MARKETING_VERSION = 1.8.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.delta.DcShare;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.delta.DcShare;
@@ -1619,11 +1621,13 @@
 				CODE_SIGN_ENTITLEMENTS = DcShare/DcShare.entitlements;
 				CODE_SIGN_ENTITLEMENTS = DcShare/DcShare.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
 				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 31;
 				DEVELOPMENT_TEAM = 8Y86453UA8;
 				DEVELOPMENT_TEAM = 8Y86453UA8;
 				ENABLE_BITCODE = NO;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = DcShare/Info.plist;
 				INFOPLIST_FILE = DcShare/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
+				MARKETING_VERSION = 1.8.0;
 				MTL_FAST_MATH = YES;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.delta.DcShare;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.delta.DcShare;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PRODUCT_NAME = "$(TARGET_NAME)";

+ 2 - 0
docs/release-checklist.md

@@ -24,6 +24,8 @@ in Xcode:
 5. a) adapt version ("View/Navigator/Project Navigator/deltachat-ios",
 5. a) adapt version ("View/Navigator/Project Navigator/deltachat-ios",
       target "deltachat-ios", then "General/Version")
       target "deltachat-ios", then "General/Version")
    b) increase the build number in the same dialog
    b) increase the build number in the same dialog
+   c) to avoid a warning,
+      use the same version and build number for target "DcShare"
 
 
 6. a) select "Generic iOS Device" in the toolbar
 6. a) select "Generic iOS Device" in the toolbar
    b) select menu "Product/Archive"
    b) select menu "Product/Archive"