From 6df6417cfbba07d1bde6c755f58a97e96b768961 Mon Sep 17 00:00:00 2001 From: Element CI Date: Wed, 4 Jan 2023 10:49:00 -0800 Subject: [PATCH] Prepare next release --- CHANGES.md | 8 ++++++++ ElementX.xcodeproj/project.pbxproj | 8 ++++---- changelog.d/394.bugfix | 1 - changelog.d/pr-399.bugfix | 1 - project.yml | 2 +- 5 files changed, 13 insertions(+), 7 deletions(-) delete mode 100644 changelog.d/394.bugfix delete mode 100644 changelog.d/pr-399.bugfix diff --git a/CHANGES.md b/CHANGES.md index 23814a9eb..ae6fbc98a 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,11 @@ +## Changes in 1.0.11 (2023-01-04) + +🐛 Bugfixes + +- Avoid the "Failed to load messages" popup when all messages have been loaded. ([#399](https://github.com/vector-im/element-x-ios/pull/399)) +- Fix stuck timeline pagination because of too many membership events ([#394](https://github.com/vector-im/element-x-ios/issues/394)) + + ## Changes in 1.0.10 (2022-12-22) ✨ Features diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj index 7009c4414..97455d91a 100644 --- a/ElementX.xcodeproj/project.pbxproj +++ b/ElementX.xcodeproj/project.pbxproj @@ -708,6 +708,7 @@ 541542F5AC323709D8563458 /* AnalyticsPrompt.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnalyticsPrompt.swift; sourceTree = ""; }; 542D4F49FABA056DEEEB3400 /* RustTracing.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RustTracing.swift; sourceTree = ""; }; 5445FCE0CE15E634FDC1A2E2 /* AnalyticsService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnalyticsService.swift; sourceTree = ""; }; + 551DAED7F623AA5366E79927 /* repository */ = {isa = PBXFileReference; lastKnownFileType = folder; name = repository; path = .; sourceTree = SOURCE_ROOT; }; 55BC11560C8A2598964FFA4C /* bs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = bs; path = bs.lproj/Localizable.strings; sourceTree = ""; }; 55D7187F6B0C0A651AC3DFFA /* in */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = in; path = in.lproj/Localizable.strings; sourceTree = ""; }; 55EA4B03F92F31EAA83B3F7B /* FilePreviewModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FilePreviewModels.swift; sourceTree = ""; }; @@ -952,7 +953,6 @@ D1A9CCCF53495CF3D7B19FCE /* MockSessionVerificationControllerProxy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockSessionVerificationControllerProxy.swift; sourceTree = ""; }; D263254AFE5B7993FFBBF324 /* NSE.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = NSE.entitlements; sourceTree = ""; }; D2D783758EAE6A88C93564EB /* VideoPlayerViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VideoPlayerViewModel.swift; sourceTree = ""; }; - D31DC8105C6233E5FFD9B84C /* element-x-ios */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "element-x-ios"; path = .; sourceTree = SOURCE_ROOT; }; D33116993D54FADC0C721C1F /* Application.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Application.swift; sourceTree = ""; }; D3D455BC2423D911A62ACFB2 /* NSELogger.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSELogger.swift; sourceTree = ""; }; D4DA544B2520BFA65D6DB4BB /* target.yml */ = {isa = PBXFileReference; lastKnownFileType = text.yaml; path = target.yml; sourceTree = ""; }; @@ -1937,7 +1937,7 @@ 9413F680ECDFB2B0DDB0DEF2 /* Packages */ = { isa = PBXGroup; children = ( - D31DC8105C6233E5FFD9B84C /* element-x-ios */, + 551DAED7F623AA5366E79927 /* repository */, ); name = Packages; sourceTree = SOURCE_ROOT; @@ -3583,7 +3583,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 16.0; KEYCHAIN_ACCESS_GROUP_IDENTIFIER = "$(AppIdentifierPrefix)$(BASE_BUNDLE_IDENTIFIER)"; MACOSX_DEPLOYMENT_TARGET = 13.0; - MARKETING_VERSION = 1.0.11; + MARKETING_VERSION = 1.0.12; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -3655,7 +3655,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 16.0; KEYCHAIN_ACCESS_GROUP_IDENTIFIER = "$(AppIdentifierPrefix)$(BASE_BUNDLE_IDENTIFIER)"; MACOSX_DEPLOYMENT_TARGET = 13.0; - MARKETING_VERSION = 1.0.11; + MARKETING_VERSION = 1.0.12; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; diff --git a/changelog.d/394.bugfix b/changelog.d/394.bugfix deleted file mode 100644 index 8b20e3b81..000000000 --- a/changelog.d/394.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix stuck timeline pagination because of too many membership events \ No newline at end of file diff --git a/changelog.d/pr-399.bugfix b/changelog.d/pr-399.bugfix deleted file mode 100644 index e55ce594a..000000000 --- a/changelog.d/pr-399.bugfix +++ /dev/null @@ -1 +0,0 @@ -Avoid the "Failed to load messages" popup when all messages have been loaded. \ No newline at end of file diff --git a/project.yml b/project.yml index 22170342b..7ca5dfaf6 100644 --- a/project.yml +++ b/project.yml @@ -26,7 +26,7 @@ settings: APP_GROUP_IDENTIFIER: group.$(BASE_APP_GROUP_IDENTIFIER) BASE_BUNDLE_IDENTIFIER: io.element.elementx KEYCHAIN_ACCESS_GROUP_IDENTIFIER: $(AppIdentifierPrefix)$(BASE_BUNDLE_IDENTIFIER) - MARKETING_VERSION: 1.0.11 + MARKETING_VERSION: 1.0.12 CURRENT_PROJECT_VERSION: 1 DEVELOPMENT_TEAM: 7J4U792NQT