From 82f195b076f4f0fc2f75fe441fe192a6a219b411 Mon Sep 17 00:00:00 2001 From: Daniel LaCosse <3759828+daniellacosse@users.noreply.github.com> Date: Mon, 9 Dec 2024 17:25:57 -0500 Subject: [PATCH 1/2] fix(client): switch to mwc textfield for older versions of iOS (#2302) * fix(client): switch to mwc textfeild for older versions of iOS * Update client/src/www/views/servers_view/server_list_item/server_card/server_rename_dialog/index.ts Co-authored-by: Vinicius Fortuna --------- Co-authored-by: Vinicius Fortuna --- .../server_card/server_rename_dialog/index.ts | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/client/src/www/views/servers_view/server_list_item/server_card/server_rename_dialog/index.ts b/client/src/www/views/servers_view/server_list_item/server_card/server_rename_dialog/index.ts index d418e87781..cb4f64f242 100644 --- a/client/src/www/views/servers_view/server_list_item/server_card/server_rename_dialog/index.ts +++ b/client/src/www/views/servers_view/server_list_item/server_card/server_rename_dialog/index.ts @@ -13,6 +13,8 @@ import type {MdFilledTextField} from '@material/web/all.js'; +import '@material/mwc-textfield'; + import {LitElement, html, css} from 'lit'; import {customElement, property, state, query} from 'lit/decorators.js'; import '@material/web/all.js'; @@ -54,14 +56,18 @@ export class ServerRenameDialog extends LitElement { return html`
${this.localize('server-rename')}
- + { this.internalServerName = (e.target as HTMLInputElement).value; }} - > + >
${this.localize('cancel')} Date: Tue, 10 Dec 2024 10:43:46 -0500 Subject: [PATCH 2/2] fix(client/macos): update minimum deployment target to `12.0` (#2307) * fix(client/macos): update minimum deployment target to `12.0` * Update deployment target in more places. --- client/go/Taskfile.yml | 2 +- client/src/cordova/apple/OutlineAppleLib/Package.swift | 2 +- .../apple/OutlineLib/OutlineLib.xcodeproj/project.pbxproj | 4 ++-- .../apple/xcode/macos/Outline.xcodeproj/project.pbxproj | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/client/go/Taskfile.yml b/client/go/Taskfile.yml index d100d225eb..5994e02e1d 100644 --- a/client/go/Taskfile.yml +++ b/client/go/Taskfile.yml @@ -87,7 +87,7 @@ tasks: vars: TARGET_DIR: '{{.OUT_DIR}}/apple' # MACOSX_DEPLOYMENT_TARGET must match the version the version set in the XCode project. - MACOSX_DEPLOYMENT_TARGET: 10.14 + MACOSX_DEPLOYMENT_TARGET: 12.0 # TARGET_IOS_VERSION must be at least 13.1 for macCatalyst and match the version set in the XCode project. TARGET_IOS_VERSION: 13.1 cmds: diff --git a/client/src/cordova/apple/OutlineAppleLib/Package.swift b/client/src/cordova/apple/OutlineAppleLib/Package.swift index 57adc0ecfa..20f122e5ee 100644 --- a/client/src/cordova/apple/OutlineAppleLib/Package.swift +++ b/client/src/cordova/apple/OutlineAppleLib/Package.swift @@ -25,7 +25,7 @@ let package = Package( // See https://github.com/CocoaLumberjack/CocoaLumberjack/releases/tag/3.8.0. // These cannot be upgraded without also upgrading the entire project. .iOS(.v13), - .macOS(.v10_15), + .macOS(.v12), ], products: [ .library( diff --git a/client/src/cordova/apple/OutlineLib/OutlineLib.xcodeproj/project.pbxproj b/client/src/cordova/apple/OutlineLib/OutlineLib.xcodeproj/project.pbxproj index 6ef359b724..e25ad25802 100644 --- a/client/src/cordova/apple/OutlineLib/OutlineLib.xcodeproj/project.pbxproj +++ b/client/src/cordova/apple/OutlineLib/OutlineLib.xcodeproj/project.pbxproj @@ -418,7 +418,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 13.1; LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MACOSX_DEPLOYMENT_TARGET = 10.15; + MACOSX_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -478,7 +478,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 13.1; LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MACOSX_DEPLOYMENT_TARGET = 10.15; + MACOSX_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SWIFT_COMPILATION_MODE = wholemodule; diff --git a/client/src/cordova/apple/xcode/macos/Outline.xcodeproj/project.pbxproj b/client/src/cordova/apple/xcode/macos/Outline.xcodeproj/project.pbxproj index b775e440b6..ae678ebcd5 100644 --- a/client/src/cordova/apple/xcode/macos/Outline.xcodeproj/project.pbxproj +++ b/client/src/cordova/apple/xcode/macos/Outline.xcodeproj/project.pbxproj @@ -484,7 +484,7 @@ /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, "\"$(BUILD_ROOT)/../IntermediateBuildFilesPath/UninstalledProducts/include\"", ); - MACOSX_DEPLOYMENT_TARGET = 10.15; + MACOSX_DEPLOYMENT_TARGET = 12.0; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = "-ObjC"; SDKROOT = macosx; @@ -537,7 +537,7 @@ /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, "\"$(BUILD_ROOT)/../IntermediateBuildFilesPath/UninstalledProducts/include\"", ); - MACOSX_DEPLOYMENT_TARGET = 10.15; + MACOSX_DEPLOYMENT_TARGET = 12.0; OTHER_LDFLAGS = "-ObjC"; SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule;