Merge pull request #1158 from Automattic/charlie/drop-beta-target

Drop beta target

.buildkite/pipeline.yml

@@ -5,7 +5,7 @@ common_params:
     - automattic/a8c-ci-toolkit#3.1.0
   # Common environment values to use with the `env` key.
   - &common_env
-    IMAGE_ID: xcode-15.2-xl
+    IMAGE_ID: xcode-15.4
 
 # This is the default pipeline – it will build and test the app
 steps:

.buildkite/release-builds.yml

@@ -5,7 +5,7 @@ common_params:
     - automattic/a8c-ci-toolkit#3.1.0
   # Common environment values to use with the `env` key.
   - &common_env
-    IMAGE_ID: xcode-15.2-xl
+    IMAGE_ID: xcode-15.4
 
 # This is the default pipeline – it will build and test the app
 steps:

Podfile

@@ -34,7 +34,6 @@ abstract_target 'Automattic' do
   # Main Target
   #
   target 'Simplenote'
-  target 'Simplenote-AppStore'
 
   # Testing Target
   #

Podfile.lock

@@ -25,6 +25,6 @@ SPEC CHECKSUMS:
   Simperium-OSX: bc465c8830e5b731e2489085459acc96160104d6
   SwiftLint: c1de071d9d08c8aba837545f6254315bc900e211
 
-PODFILE CHECKSUM: 0c6e1eaa48de269bee6c152747e29ea455cb1e74
+PODFILE CHECKSUM: 140e8361cb81c6afb2b16d5514e4d7e21625c066
 
 COCOAPODS: 1.14.1

Simplenote.xcodeproj/xcshareddata/xcschemes/Simplenote.xcscheme

@@ -14,7 +14,7 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "26F72A8714032D2A00A7935E"
+               BlueprintIdentifier = "466FFEA617CC10A800399652"
                BuildableName = "Simplenote.app"
                BlueprintName = "Simplenote"
                ReferencedContainer = "container:Simplenote.xcodeproj">
@@ -27,10 +27,19 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "466FFEA617CC10A800399652"
+            BuildableName = "Simplenote.app"
+            BlueprintName = "Simplenote"
+            ReferencedContainer = "container:Simplenote.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO"
-            testExecutionOrdering = "random">
+            parallelizable = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "B5CBB068241976230003C271"
@@ -55,7 +64,7 @@
          runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "26F72A8714032D2A00A7935E"
+            BlueprintIdentifier = "466FFEA617CC10A800399652"
             BuildableName = "Simplenote.app"
             BlueprintName = "Simplenote"
             ReferencedContainer = "container:Simplenote.xcodeproj">
@@ -72,7 +81,7 @@
          runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "26F72A8714032D2A00A7935E"
+            BlueprintIdentifier = "466FFEA617CC10A800399652"
             BuildableName = "Simplenote.app"
             BlueprintName = "Simplenote"
             ReferencedContainer = "container:Simplenote.xcodeproj">

Simplenote.xcodeproj/xcshareddata/xcschemes/SimplenoteTests.xcscheme

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1540"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "B5CBB068241976230003C271"
+               BuildableName = "SimplenoteTests.xctest"
+               BlueprintName = "SimplenoteTests"
+               ReferencedContainer = "container:Simplenote.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

Simplenote.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,21 +1,22 @@
 {
+  "originHash" : "1f66ac352dc04da5870abacba5f42306bd560111ad295c7c60a13a7af5c25ec8",
   "pins" : [
     {
       "identity" : "automattic-tracks-ios",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/Automattic/Automattic-Tracks-iOS",
       "state" : {
-        "revision" : "b6979ef69b4b094c8809ba83661222dcd0d7667e",
-        "version" : "3.2.0"
+        "revision" : "cc3200463d9b97d2c58d839d1534e77e5bfa66c3",
+        "version" : "3.4.1"
       }
     },
     {
       "identity" : "sentry-cocoa",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/getsentry/sentry-cocoa",
       "state" : {
-        "revision" : "3b9a8e69ca296bd8cd0e317ad7a448e5daf4a342",
-        "version" : "8.18.0"
+        "revision" : "7fc7ca43967e2980d8691a8e017c118a84133aac",
+        "version" : "8.26.0"
       }
     },
     {
@@ -64,5 +65,5 @@
       }
     }
   ],
-  "version" : 2
+  "version" : 3
 }