From b8b58b472728e65ca7dd3dc3c299167cf35f025c Mon Sep 17 00:00:00 2001 From: Gil Eluard Date: Fri, 26 Mar 2021 12:56:56 +0100 Subject: [PATCH 1/5] Unit tests are broken - xcodegen target file updated --- RiotTests/Debug.xcconfig | 20 ++++++++++++++++++++ RiotTests/Release.xcconfig | 20 ++++++++++++++++++++ RiotTests/target.yml | 20 +++++++++++++++++--- 3 files changed, 57 insertions(+), 3 deletions(-) create mode 100644 RiotTests/Debug.xcconfig create mode 100644 RiotTests/Release.xcconfig diff --git a/RiotTests/Debug.xcconfig b/RiotTests/Debug.xcconfig new file mode 100644 index 000000000..be053c75b --- /dev/null +++ b/RiotTests/Debug.xcconfig @@ -0,0 +1,20 @@ +// +// Copyright 2020 Vector Creations Ltd +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +// Configuration settings file format documentation can be found at: +// https://help.apple.com/xcode/#/dev745c5c974 + +#include "Pods/Target Support Files/Pods-RiotTests/Pods-RiotTests.debug.xcconfig" diff --git a/RiotTests/Release.xcconfig b/RiotTests/Release.xcconfig new file mode 100644 index 000000000..5a62ed9cd --- /dev/null +++ b/RiotTests/Release.xcconfig @@ -0,0 +1,20 @@ +// +// Copyright 2020 Vector Creations Ltd +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +// Configuration settings file format documentation can be found at: +// https://help.apple.com/xcode/#/dev745c5c974 + +#include "Pods/Target Support Files/Pods-RiotTests/Pods-RiotTests.release.xcconfig" diff --git a/RiotTests/target.yml b/RiotTests/target.yml index 83cd4c55e..fa2288a2e 100644 --- a/RiotTests/target.yml +++ b/RiotTests/target.yml @@ -33,15 +33,19 @@ targets: dependencies: - target: Riot + configFiles: + Debug: Debug.xcconfig + Release: Release.xcconfig + settings: base: BUNDLE_LOADER: $(TEST_HOST) FRAMEWORK_SEARCH_PATHS: $(SDKROOT)/Developer/Library/Frameworks $(inherited) - INFOPLIST_FILE: Info.plist + INFOPLIST_FILE: RiotTests/Info.plist LD_RUNPATH_SEARCH_PATHS: $(inherited) @executable_path/Frameworks @loader_path/Frameworks PRODUCT_BUNDLE_IDENTIFIER: org.matrix.$(PRODUCT_NAME:rfc1034identifier) PRODUCT_NAME: RiotTests - SWIFT_OBJC_BRIDGING_HEADER: RiotTests-Bridging-Header.h + SWIFT_OBJC_BRIDGING_HEADER: RiotTests/RiotTests-Bridging-Header.h TEST_HOST: $(BUILT_PRODUCTS_DIR)/Riot.app/Riot configs: Debug: @@ -49,4 +53,14 @@ targets: PROVISIONING_PROFILE: $(RIOT_PROVISIONING_PROFILE) PROVISIONING_PROFILE_SPECIFIER: $(RIOT_PROVISIONING_PROFILE_SPECIFIER) - sources: . + sources: + - path: . + - path: ../Config/Configurable.swift + - path: ../Config/BuildSettings.swift + - path: ../Config/AppConfiguration.swift + - path: ../Config/CommonConfiguration.swift + - path: ../Riot/Categories/Bundle.swift + - path: ../Riot/Generated/InfoPlist.swift + - path: ../Riot/Managers/Settings/RiotSettings.swift + - path: ../Riot/Managers/EncryptionKeyManager/EncryptionKeyManager.swift + - path: ../Riot/Managers/KeyValueStorage/ From aeac807686edfd2cd6d00c1f7db1c120f01ef9c6 Mon Sep 17 00:00:00 2001 From: Gil Eluard Date: Fri, 26 Mar 2021 13:06:38 +0100 Subject: [PATCH 2/5] Updated CHANGES.rst --- CHANGES.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index 1258b137c..8dffc4bff 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -8,7 +8,7 @@ Changes to be released in next version * 🐛 Bugfix - * + * Xcodegen: Unit tests are broken (#4152). ⚠️ API Changes * From ca28199205c607a7468a33a4b5f3cdd12258322f Mon Sep 17 00:00:00 2001 From: manuroe Date: Fri, 26 Mar 2021 17:07:59 +0100 Subject: [PATCH 3/5] version++ --- CHANGES.rst | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index 8dffc4bff..cb519d96a 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,4 +1,4 @@ -Changes to be released in next version +Changes in 1.2.8 (2021-03-26) ================================================= ✨ Features @@ -22,6 +22,9 @@ Changes to be released in next version Others * +Improvements: + + Changes in 1.2.7 (2021-03-24) ================================================= From 2ce557773a4ed164fa59812013d73af47c15b2bc Mon Sep 17 00:00:00 2001 From: manuroe Date: Fri, 26 Mar 2021 17:23:39 +0100 Subject: [PATCH 4/5] finish version++ From cd7d533edd16da6c54db60fdb03fb7c40d2edabf Mon Sep 17 00:00:00 2001 From: manuroe Date: Fri, 26 Mar 2021 17:23:48 +0100 Subject: [PATCH 5/5] Prepare for new sprint --- CHANGES.rst | 24 ++++++++++++++++++++++++ Config/AppIdentifiers.xcconfig | 4 ++-- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index cb519d96a..09d797340 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,27 @@ +Changes to be released in next version +================================================= + +✨ Features + * + +🙌 Improvements + * + +🐛 Bugfix + * + +⚠️ API Changes + * + +🗣 Translations + * + +🧱 Build + * + +Others + * + Changes in 1.2.8 (2021-03-26) ================================================= diff --git a/Config/AppIdentifiers.xcconfig b/Config/AppIdentifiers.xcconfig index ebcc71705..9c0a99957 100644 --- a/Config/AppIdentifiers.xcconfig +++ b/Config/AppIdentifiers.xcconfig @@ -22,8 +22,8 @@ APPLICATION_GROUP_IDENTIFIER = group.im.vector APPLICATION_SCHEME = element // Version -MARKETING_VERSION = 1.2.8 -CURRENT_PROJECT_VERSION = 1.2.8 +MARKETING_VERSION = 1.2.9 +CURRENT_PROJECT_VERSION = 1.2.9 // Team