From 50a41366d72a804acb852dc18cb6b2f9c837d2bb Mon Sep 17 00:00:00 2001 From: Michael Redig Date: Fri, 5 Aug 2022 17:05:57 -0500 Subject: [PATCH 1/4] (refactor) project settings update (cherry picked from commit 0aa5a4ef29863f680041a6f5bc3310377bb0f009) --- MatrixSDK.xcodeproj/project.pbxproj | 8 +++++--- .../xcshareddata/xcschemes/MatrixSDK-iOS.xcscheme | 2 +- .../xcshareddata/xcschemes/MatrixSDK-macOS.xcscheme | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/MatrixSDK.xcodeproj/project.pbxproj b/MatrixSDK.xcodeproj/project.pbxproj index 88b2d6d746..0f3921aa59 100644 --- a/MatrixSDK.xcodeproj/project.pbxproj +++ b/MatrixSDK.xcodeproj/project.pbxproj @@ -5946,7 +5946,7 @@ 32C6F92419DD814400EA4E9C /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1160; + LastUpgradeCheck = 1340; ORGANIZATIONNAME = matrix.org; TargetAttributes = { 32C6F92C19DD814400EA4E9C = { @@ -7296,6 +7296,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -7321,7 +7322,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; @@ -7358,6 +7359,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -7377,7 +7379,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = ""; diff --git a/MatrixSDK.xcodeproj/xcshareddata/xcschemes/MatrixSDK-iOS.xcscheme b/MatrixSDK.xcodeproj/xcshareddata/xcschemes/MatrixSDK-iOS.xcscheme index b2e100f011..80e9624b62 100644 --- a/MatrixSDK.xcodeproj/xcshareddata/xcschemes/MatrixSDK-iOS.xcscheme +++ b/MatrixSDK.xcodeproj/xcshareddata/xcschemes/MatrixSDK-iOS.xcscheme @@ -1,6 +1,6 @@ Date: Fri, 5 Aug 2022 18:47:28 -0500 Subject: [PATCH 2/4] (nit) added contributing requirements --- AUTHORS.rst | 4 +++- changelog.d/pr-1543.build | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 changelog.d/pr-1543.build diff --git a/AUTHORS.rst b/AUTHORS.rst index 53843f77fb..e83e9e8945 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -45,4 +45,6 @@ Pierre Dubois John Flanagan * PR #463 Fix compatibility with Swift 4.0 (issue #393) * PR #465 SwiftMatrixSDK: Enum cleanup - \ No newline at end of file + +Michael Redig + * PR ### (refactor) project settings update diff --git a/changelog.d/pr-1543.build b/changelog.d/pr-1543.build new file mode 100644 index 0000000000..d4937593bc --- /dev/null +++ b/changelog.d/pr-1543.build @@ -0,0 +1 @@ +Xcode project(s) updated via Xcode recommended setting \ No newline at end of file From f62d688450dca0b8391ec851ed051f0509c271e5 Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 5 Aug 2022 19:04:13 -0500 Subject: [PATCH 3/4] Update AUTHORS.rst --- AUTHORS.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AUTHORS.rst b/AUTHORS.rst index e83e9e8945..8e67d14de0 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -47,4 +47,4 @@ John Flanagan * PR #465 SwiftMatrixSDK: Enum cleanup Michael Redig - * PR ### (refactor) project settings update + * PR #1543 (refactor) project settings update From 7a15828bf80a782bf18e1f53edbabe50c2b65b29 Mon Sep 17 00:00:00 2001 From: Michael Redig Date: Tue, 9 Aug 2022 22:03:37 -0500 Subject: [PATCH 4/4] (revert) ios build target --- MatrixSDK.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MatrixSDK.xcodeproj/project.pbxproj b/MatrixSDK.xcodeproj/project.pbxproj index 0f3921aa59..a63193f18c 100644 --- a/MatrixSDK.xcodeproj/project.pbxproj +++ b/MatrixSDK.xcodeproj/project.pbxproj @@ -7322,7 +7322,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; @@ -7379,7 +7379,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = "";