From 37c16498366acf315e748db0a5aa247351ed7214 Mon Sep 17 00:00:00 2001 From: Djorkaeff Alexandre Date: Wed, 31 Jan 2024 16:39:18 -0300 Subject: [PATCH] Remove WatchOS 10 compat --- .circleci/config.yml | 2 +- .../Views/ChatScrollView.swift | 28 +++++++++++-------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d74e1e4b1..d84145f6d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,7 +6,7 @@ orbs: macos: &macos macos: - xcode: "15.2.0" + xcode: "14.2.0" resource_class: macos.m1.medium.gen1 bash-env: &bash-env diff --git a/ios/RocketChat Watch App/Views/ChatScrollView.swift b/ios/RocketChat Watch App/Views/ChatScrollView.swift index d500af706..bee358c3f 100644 --- a/ios/RocketChat Watch App/Views/ChatScrollView.swift +++ b/ios/RocketChat Watch App/Views/ChatScrollView.swift @@ -12,17 +12,23 @@ struct ChatScrollView: View { } var body: some View { - if #available(watchOS 10.0, *) { - ScrollView { - content() - } - .defaultScrollAnchor(.bottom) - } else { - ScrollView(showsIndicators: false) { - content() - .rotationEffect(.degrees(180)) - } - .rotationEffect(.degrees(180)) + ScrollView(showsIndicators: false) { + content() + .rotationEffect(.degrees(180)) } + .rotationEffect(.degrees(180)) } } + +// if #available(watchOS 10.0, *) { +// ScrollView { +// content() +// } +// .defaultScrollAnchor(.bottom) +// } else { +// ScrollView(showsIndicators: false) { +// content() +// .rotationEffect(.degrees(180)) +// } +// .rotationEffect(.degrees(180)) +// }