From 81ee5442dde2134aef6115b8834e76991a9d8028 Mon Sep 17 00:00:00 2001 From: Nathan Mattes Date: Tue, 19 Nov 2024 16:15:23 +0100 Subject: [PATCH 1/2] Bump version to 1.48.4 --- CHANGELOG.md | 2 +- deltachat-ios.xcodeproj/project.pbxproj | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ae696e05a..2f8a690df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Delta Chat iOS Changelog -## Unreleased +## v1.48.4 - fix: show forward-icon on iOS 15 and older - Add an option to use Proxy-servers (#2382, #2390) diff --git a/deltachat-ios.xcodeproj/project.pbxproj b/deltachat-ios.xcodeproj/project.pbxproj index df289d3eb..ce82a712f 100644 --- a/deltachat-ios.xcodeproj/project.pbxproj +++ b/deltachat-ios.xcodeproj/project.pbxproj @@ -2153,6 +2153,7 @@ CODE_SIGN_ENTITLEMENTS = "deltachat-ios/deltachat-ios.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 114; DEVELOPMENT_TEAM = 8Y86453UA8; ENABLE_BITCODE = NO; HEADER_SEARCH_PATHS = ( @@ -2171,6 +2172,7 @@ "$(PROJECT_DIR)/deltachat-ios/libraries/deltachat-core-rust/deltachat-ffi", "$(PROJECT_DIR)/deltachat-ios/libraries", ); + MARKETING_VERSION = 1.48.4; OTHER_CFLAGS = ( "$(inherited)", "-isystem", @@ -2223,6 +2225,7 @@ CODE_SIGN_ENTITLEMENTS = "deltachat-ios/deltachat-ios.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 114; DEVELOPMENT_TEAM = 8Y86453UA8; ENABLE_BITCODE = NO; HEADER_SEARCH_PATHS = ( @@ -2241,6 +2244,7 @@ "$(PROJECT_DIR)/deltachat-ios/libraries/deltachat-core-rust/deltachat-ffi", "$(PROJECT_DIR)/deltachat-ios/libraries", ); + MARKETING_VERSION = 1.48.4; OTHER_CFLAGS = ( "$(inherited)", "-isystem", From 18f7eef0f768e14acb52dbf01359b1274fa6cd09 Mon Sep 17 00:00:00 2001 From: Nathan Mattes Date: Tue, 19 Nov 2024 16:31:32 +0100 Subject: [PATCH 2/2] Properly set version and build for real this time I promise! --- deltachat-ios.xcodeproj/project.pbxproj | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/deltachat-ios.xcodeproj/project.pbxproj b/deltachat-ios.xcodeproj/project.pbxproj index ce82a712f..07903baaf 100644 --- a/deltachat-ios.xcodeproj/project.pbxproj +++ b/deltachat-ios.xcodeproj/project.pbxproj @@ -2053,7 +2053,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 112; + CURRENT_PROJECT_VERSION = 115; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -2073,7 +2073,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 12.0; - MARKETING_VERSION = 1.48.3; + MARKETING_VERSION = 1.48.4; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -2118,7 +2118,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 112; + CURRENT_PROJECT_VERSION = 115; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -2132,7 +2132,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 12.0; - MARKETING_VERSION = 1.48.3; + MARKETING_VERSION = 1.48.4; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_COMPILATION_MODE = wholemodule; @@ -2153,7 +2153,6 @@ CODE_SIGN_ENTITLEMENTS = "deltachat-ios/deltachat-ios.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 114; DEVELOPMENT_TEAM = 8Y86453UA8; ENABLE_BITCODE = NO; HEADER_SEARCH_PATHS = ( @@ -2172,7 +2171,6 @@ "$(PROJECT_DIR)/deltachat-ios/libraries/deltachat-core-rust/deltachat-ffi", "$(PROJECT_DIR)/deltachat-ios/libraries", ); - MARKETING_VERSION = 1.48.4; OTHER_CFLAGS = ( "$(inherited)", "-isystem", @@ -2225,7 +2223,6 @@ CODE_SIGN_ENTITLEMENTS = "deltachat-ios/deltachat-ios.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 114; DEVELOPMENT_TEAM = 8Y86453UA8; ENABLE_BITCODE = NO; HEADER_SEARCH_PATHS = ( @@ -2244,7 +2241,6 @@ "$(PROJECT_DIR)/deltachat-ios/libraries/deltachat-core-rust/deltachat-ffi", "$(PROJECT_DIR)/deltachat-ios/libraries", ); - MARKETING_VERSION = 1.48.4; OTHER_CFLAGS = ( "$(inherited)", "-isystem",