Merge pull request #1133 from Automattic/merge/2.20-final-into-trunk

Merge 2.20 final into trunk
Automattic · Feb 8, 2024 · 736709a · 736709a
2 parents e8a6d75 + a11757f
commit 736709a
Show file tree

Hide file tree

Showing 16 changed files with 121 additions and 1,385 deletions.
diff --git a/.buildkite/commands/build-and-test-app-store.sh b/.buildkite/commands/build-and-test-app-store.sh
@@ -1,6 +1,4 @@
-#! /bin/bash
-
-set -eu
+#! /bin/bash -eu
 
 echo "--- :rubygems: Setting up Gems"
 install_gems

diff --git a/.buildkite/commands/build-and-test.sh b/.buildkite/commands/build-and-test.sh
@@ -1,6 +1,4 @@
-#! /bin/bash
-
-set -eu
+#! /bin/bash -eu
 
 echo "--- :rubygems: Setting up Gems"
 install_gems

diff --git a/.buildkite/commands/build-and-upload-release.sh b/.buildkite/commands/build-and-upload-release.sh
@@ -1,6 +1,4 @@
-#! /bin/bash
-
-set -eu
+#! /bin/bash -eu
 
 echo "--- :rubygems: Setting up Gems"
 install_gems

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -2,10 +2,10 @@
 common_params:
   # Common plugin settings to use with the `plugins` key.
   - &common_plugins
-    - automattic/a8c-ci-toolkit#2.15.0
+    - automattic/a8c-ci-toolkit#3.0.1
   # Common environment values to use with the `env` key.
   - &common_env
-    IMAGE_ID: xcode-14.3.1
+    IMAGE_ID: xcode-15.2-xl
 
 # This is the default pipeline – it will build and test the app
 steps:

diff --git a/.buildkite/release-builds.yml b/.buildkite/release-builds.yml
@@ -2,10 +2,10 @@
 common_params:
   # Common plugin settings to use with the `plugins` key.
   - &common_plugins
-    - automattic/a8c-ci-toolkit#2.15.0
+    - automattic/a8c-ci-toolkit#3.0.1
   # Common environment values to use with the `env` key.
   - &common_env
-    IMAGE_ID: xcode-14.3.1
+    IMAGE_ID: xcode-15.2-xl
 
 # This is the default pipeline – it will build and test the app
 steps:

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -1,3 +1,7 @@
+2.21
+-----
+
+
 2.20
 -----
 - [Internal] Updated release-toolkit to 9.1.0

diff --git a/Simplenote.xcodeproj/project.pbxproj b/Simplenote.xcodeproj/project.pbxproj
@@ -21,7 +21,8 @@
 /* End PBXAggregateTarget section */
 
 /* Begin PBXBuildFile section */
-		1E077730C2108B885911E3B5 /* Pods_Automattic_Simplenote_AppStore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 86F72E095CFE66DE228AE8CA /* Pods_Automattic_Simplenote_AppStore.framework */; };
+		24CB911B2B75601F00C9490F /* Pods_Automattic_Simplenote_AppStore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 86F72E095CFE66DE228AE8CA /* Pods_Automattic_Simplenote_AppStore.framework */; };
+		24CB911C2B75601F00C9490F /* Pods_Automattic_Simplenote_AppStore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 86F72E095CFE66DE228AE8CA /* Pods_Automattic_Simplenote_AppStore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		2614F1DF1405A0B10031AE94 /* Note.m in Sources */ = {isa = PBXBuildFile; fileRef = 2614F1DC1405A0B10031AE94 /* Note.m */; };
 		2614F1E01405A0B10031AE94 /* Tag.m in Sources */ = {isa = PBXBuildFile; fileRef = 2614F1DE1405A0B10031AE94 /* Tag.m */; };
 		2614F1E51405A0C60031AE94 /* Simplenote.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 2614F1E21405A0C60031AE94 /* Simplenote.xcdatamodeld */; };
@@ -512,6 +513,17 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
+		24CB911D2B75601F00C9490F /* Embed Frameworks */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				24CB911C2B75601F00C9490F /* Pods_Automattic_Simplenote_AppStore.framework in Embed Frameworks */,
+			);
+			name = "Embed Frameworks";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		71881504155F487D001F2E30 /* CopyFiles */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
@@ -900,9 +912,9 @@
 				466FFEE117CC10A800399652 /* Cocoa.framework in Frameworks */,
 				B55E98FD1BE03E3F0087CA48 /* Security.framework in Frameworks */,
 				B5609AE824EEC9860097777A /* SimplenoteSearch in Frameworks */,
+				24CB911B2B75601F00C9490F /* Pods_Automattic_Simplenote_AppStore.framework in Frameworks */,
 				BA78AF712B5B2BC300DCF896 /* AutomatticTracks in Frameworks */,
 				B5609AF024EF171D0097777A /* SimplenoteFoundation in Frameworks */,
-				1E077730C2108B885911E3B5 /* Pods_Automattic_Simplenote_AppStore.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1714,8 +1726,8 @@
 				466FFEA717CC10A800399652 /* Sources */,
 				466FFEDC17CC10A800399652 /* Frameworks */,
 				466FFEE517CC10A800399652 /* Resources */,
-				B51D44821945EF7900496889 /* Set copyright year */,
 				4E51756AEE6CFE89EAD49829 /* [CP] Embed Pods Frameworks */,
+				24CB911D2B75601F00C9490F /* Embed Frameworks */,
 			);
 			buildRules = (
 			);
@@ -2000,20 +2012,6 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		B51D44821945EF7900496889 /* Set copyright year */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Set copyright year";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "# Set the copyright year to the current year in the Info.plist\nplist=\"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\nyear=$(date \"+%Y\")\ncopyright=\"Copyright © $year Automattic. All rights reserved.\"\n\n/usr/libexec/PlistBuddy -c \"Set :NSHumanReadableCopyright $copyright\" $plist\n";
-		};
 		B51D44911945FEFD00496889 /* Sparkle XPC Code Sign For Sandbox */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
@@ -2809,12 +2807,13 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Simplenote.entitlements;
 				CODE_SIGN_IDENTITY = "Mac Developer";
-				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Mac Developer";
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = PZYM8XX95Q;
+				"DEVELOPMENT_TEAM[sdk=macosx*]" = "";
 				ENABLE_HARDENED_RUNTIME = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2836,7 +2835,6 @@
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				MACOSX_DEPLOYMENT_TARGET = 12.0;
 				OTHER_CFLAGS = "${inherited}";
-				OTHER_CODE_SIGN_FLAGS = "--deep";
 				OTHER_LDFLAGS = (
 					"-ObjC",
 					"-all_load",
@@ -2847,6 +2845,7 @@
 				PRODUCT_NAME = Simplenote;
 				PROVISIONING_PROFILE = "";
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = "";
 				SDKROOT = macosx;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -2888,7 +2887,6 @@
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				MACOSX_DEPLOYMENT_TARGET = 12.0;
 				OTHER_CFLAGS = "${inherited}";
-				OTHER_CODE_SIGN_FLAGS = "--deep";
 				OTHER_LDFLAGS = (
 					"-ObjC",
 					"-all_load",

diff --git a/Simplenote.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Simplenote.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,34 +1,68 @@
 {
-  "object": {
-    "pins": [
-      {
-        "package": "SimplenoteFoundation",
-        "repositoryURL": "[email protected]:Automattic/SimplenoteFoundation-Swift.git",
-        "state": {
-          "branch": null,
-          "revision": "2731e4d28c42d394ddc62cd864d9f7ff96759228",
-          "version": "1.3.0"
-        }
-      },
-      {
-        "package": "SimplenoteInterlinks",
-        "repositoryURL": "[email protected]:Automattic/SimplenoteInterlinks-Swift.git",
-        "state": {
-          "branch": null,
-          "revision": "be3827a5bf05c5349ed62126c3e1dc60a2a6cee6",
-          "version": "1.1.0"
-        }
-      },
-      {
-        "package": "SimplenoteSearch",
-        "repositoryURL": "[email protected]:Automattic/SimplenoteSearch-Swift.git",
-        "state": {
-          "branch": null,
-          "revision": "499d2809d169fcbeb9ff75568d9f1f937f290ffc",
-          "version": "1.3.0"
-        }
+  "pins" : [
+    {
+      "identity" : "automattic-tracks-ios",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/Automattic/Automattic-Tracks-iOS",
+      "state" : {
+        "revision" : "b6979ef69b4b094c8809ba83661222dcd0d7667e",
+        "version" : "3.2.0"
       }
-    ]
-  },
-  "version": 1
+    },
+    {
+      "identity" : "sentry-cocoa",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/getsentry/sentry-cocoa",
+      "state" : {
+        "revision" : "b847a202a517a90763e8fd0656d8028aeee7b78d",
+        "version" : "8.20.0"
+      }
+    },
+    {
+      "identity" : "simplenotefoundation-swift",
+      "kind" : "remoteSourceControl",
+      "location" : "[email protected]:Automattic/SimplenoteFoundation-Swift.git",
+      "state" : {
+        "revision" : "2731e4d28c42d394ddc62cd864d9f7ff96759228",
+        "version" : "1.3.0"
+      }
+    },
+    {
+      "identity" : "simplenoteinterlinks-swift",
+      "kind" : "remoteSourceControl",
+      "location" : "[email protected]:Automattic/SimplenoteInterlinks-Swift.git",
+      "state" : {
+        "revision" : "be3827a5bf05c5349ed62126c3e1dc60a2a6cee6",
+        "version" : "1.1.0"
+      }
+    },
+    {
+      "identity" : "simplenotesearch-swift",
+      "kind" : "remoteSourceControl",
+      "location" : "[email protected]:Automattic/SimplenoteSearch-Swift.git",
+      "state" : {
+        "revision" : "499d2809d169fcbeb9ff75568d9f1f937f290ffc",
+        "version" : "1.3.0"
+      }
+    },
+    {
+      "identity" : "swift-sodium",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/jedisct1/swift-sodium",
+      "state" : {
+        "revision" : "4f9164a0a2c9a6a7ff53a2833d54a5c79c957342",
+        "version" : "0.9.1"
+      }
+    },
+    {
+      "identity" : "uideviceidentifier",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/squarefrog/UIDeviceIdentifier",
+      "state" : {
+        "revision" : "4699794b08bb79a4d77785edaba6ea739e298e4b",
+        "version" : "2.3.0"
+      }
+    }
+  ],
+  "version" : 2
 }
diff --git a/Simplenote/Resources/AppStoreStrings.pot b/Simplenote/Resources/AppStoreStrings.pot
@@ -46,9 +46,8 @@ msgctxt "app_store_keywords"
 msgid "simplenote,note,notes,sync,syncing,list,todo,simple,markdown,ideas"
 msgstr ""
 
-msgctxt "v2.19-whats-new"
+msgctxt "v2.20-whats-new"
 msgid ""
-"- Fixed an issue with horizontal clipping where the last character at the end of the line wasn't displayed completely\n"
-"- Font size step has been decreased to 1pt\n"
+"• Behind-the-scenes reliability improvements\n"
 msgstr ""
 
diff --git a/Simplenote/Resources/release_notes.txt b/Simplenote/Resources/release_notes.txt
@@ -1,2 +1 @@
-- Fixed an issue with horizontal clipping where the last character at the end of the line wasn't displayed completely
-- Font size step has been decreased to 1pt
+• Behind-the-scenes reliability improvements
-Original file line number
+Diff line change
@@ -1,3 +1,7 @@
+.21
+    -----
 .20
     -----
     - [Internal] Updated release-toolkit to 9.1.0
@@ Expand Down @@