Merge branch 'master' into fortuna-ws-config

Jigsaw-Code · Dec 10, 2024 · e3738e7 · e3738e7
2 parents 0aa3dbc + 9c8f10e
commit e3738e7
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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;

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
@@ -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`
       <md-dialog .open=${this.open} @close=${this.handleClose} quick>
         <header slot="headline">${this.localize('server-rename')}</header>
-        <md-filled-text-field
+        <!-- 
+          On older versions of iOS, md-textfield triggers itself indefinitely here,
+          so we must use mwc-textfield
+        -->
+        <mwc-textfield
           slot="content"
-          maxlength="100"
+          maxLength="100"
           value="${this.internalServerName}"
           @input=${(e: Event) => {
             this.internalServerName = (e.target as HTMLInputElement).value;
           }}
-        ></md-filled-text-field>
+        ></mwc-textfield>
         <fieldset slot="actions">
           <md-text-button @click=${this.handleClose}
             >${this.localize('cancel')}</md-text-button