Remove workspace file

.buildkite/commands/complete-code-freeze.sh

@@ -12,11 +12,7 @@ source use-bot-for-git
 
 .buildkite/commands/checkout-release-branch.sh "$RELEASE_NUMBER"
 
-echo '--- :ruby: Setup Ruby tools'
-install_gems
-
-echo "--- :swift: Set up Swift Packages"
-install_swiftpm_dependencies
+"$(dirname "${BASH_SOURCE[0]}")/shared-set-up.sh"
 
 echo '--- :closed_lock_with_key: Access secrets'
 bundle exec fastlane run configure_apply

.buildkite/commands/shared-set-up.sh

@@ -3,8 +3,12 @@
 echo "--- :rubygems: Setting up Gems"
 install_gems
 
+# The push/pop is workaround for tooling not supporting a Package.swift path.
+# Note that neither ours nor Apple's tooling does.
+pushd "$(dirname "${BASH_SOURCE[0]}")/../../Modules"
 echo "--- :swift: Setting up Swift Packages"
 install_swiftpm_dependencies
+popd
 
 echo "--- :xcode: Fetch XCFrameworks"
 rake dependencies

.gitignore

@@ -125,12 +125,6 @@ WordPress/InfoPlist-internal.h
 # and assume no local copy would have generated the Pods.
 Pods/
 
-# Modules — Where the Swift packages that make up the modular app live
-#
-# Ignore the Package.resolved file. The packages source of truth is the
-# resolved file generated by the Xcode workspace.
-Modules/Package.resolved
-
 # While we depend on gutenberg-mobile, we download its XCFrameworks in
 # WordPress/Frameworks
 WordPress/Frameworks/*.xcframework

Modules/Package.swift

@@ -48,12 +48,18 @@ let package = Package(
         .package(url: "https://github.com/wordpress-mobile/MediaEditor-iOS", branch: "task/spm-support"),
         .package(url: "https://github.com/wordpress-mobile/NSObject-SafeExpectations", from: "0.0.6"),
         .package(url: "https://github.com/wordpress-mobile/NSURL-IDN", revision: "b34794c9a3f32312e1593d4a3d120572afa0d010"),
-        .package(url: "https://github.com/wordpress-mobile/WordPressKit-iOS", branch: "wpios-edition"),
+        .package(
+            url: "https://github.com/wordpress-mobile/WordPressKit-iOS",
+            revision: "5bc08764d2025e21685816065f611e884c8672d1" // see wpios-edition branch
+        ),
         .package(url: "https://github.com/zendesk/support_sdk_ios", from: "8.0.3"),
         // We can't use wordpress-rs branches nor commits here. Only tags work.
         .package(url: "https://github.com/Automattic/wordpress-rs", revision: "alpha-20250505"),
         .package(url: "https://github.com/wordpress-mobile/GutenbergKit", from: "0.2.0"),
-        .package(url: "https://github.com/Automattic/color-studio", branch: "trunk"),
+        .package(
+            url: "https://github.com/Automattic/color-studio",
+            revision: "bf141adc75e2769eb469a3e095bdc93dc30be8de"
+        ),
         .package(url: "https://github.com/wordpress-mobile/AztecEditor-iOS", from: "1.20.0"),
     ],
     targets: XcodeSupport.targets + [
@@ -168,7 +174,12 @@ let package = Package(
         ),
         .testTarget(name: "JetpackStatsWidgetsCoreTests", dependencies: [.target(name: "JetpackStatsWidgetsCore")], swiftSettings: [.swiftLanguageMode(.v5)]),
         .testTarget(name: "DesignSystemTests", dependencies: [.target(name: "DesignSystem")], swiftSettings: [.swiftLanguageMode(.v5)]),
-        .testTarget(name: "WordPressFluxTests", dependencies: ["WordPressFlux"], swiftSettings: [.swiftLanguageMode(.v5)]),
+        .testTarget(
+            name: "WordPressFluxTests",
+            dependencies: ["WordPressFlux"],
+            exclude: ["WordPressFluxTests.xctestplan"],
+            swiftSettings: [.swiftLanguageMode(.v5)]
+        ),
         .testTarget(name: "AsyncImageKitTests", dependencies: [
             .target(name: "AsyncImageKit"),
             .target(name: "WordPressTesting"),

Modules/Tests/WordPressFluxTests/WordPressFluxTests.xctestplan

@@ -0,0 +1,24 @@
+{
+  "configurations" : [
+    {
+      "id" : "92A65F35-8051-4F5F-B68A-1802B2E06105",
+      "name" : "Test Scheme Action",
+      "options" : {
+
+      }
+    }
+  ],
+  "defaultOptions" : {
+    "codeCoverage" : false
+  },
+  "testTargets" : [
+    {
+      "target" : {
+        "containerPath" : "container:",
+        "identifier" : "WordPressFluxTests",
+        "name" : "WordPressFluxTests"
+      }
+    }
+  ],
+  "version" : 1
+}

Scripts/BuildPhases/GenerateCredentials.xcfilelist

@@ -18,4 +18,4 @@ ${SRCROOT}/Credentials/Secrets-example.swift
 
 # Add the script that uses this file as a source, so that, if the script
 # changes, Xcode will run it again on the next build.
-${SRCROOT}/../Scripts/BuildPhases/ApplyConfiguration.sh
+${SRCROOT}/Scripts/BuildPhases/ApplyConfiguration.sh

Tests/KeystoneTests/WordPressUnitTests.xctestplan

@@ -32,15 +32,13 @@
   },
   "testTargets" : [
     {
-      "enabled" : false,
       "target" : {
         "containerPath" : "container:..\/Modules",
         "identifier" : "AsyncImageKitTests",
         "name" : "AsyncImageKitTests"
       }
     },
     {
-      "enabled" : false,
       "target" : {
         "containerPath" : "container:WordPress.xcodeproj",
         "identifier" : "4AD953BA2C21451700D0EEFA",
@@ -62,39 +60,34 @@
       }
     },
     {
-      "enabled" : false,
       "target" : {
         "containerPath" : "container:..\/Modules",
         "identifier" : "WordPressUIUnitTests",
         "name" : "WordPressUIUnitTests"
       }
     },
     {
-      "enabled" : false,
       "target" : {
         "containerPath" : "container:..\/Modules",
         "identifier" : "WordPressSharedTests",
         "name" : "WordPressSharedTests"
       }
     },
     {
-      "enabled" : false,
       "target" : {
         "containerPath" : "container:..\/Modules",
         "identifier" : "JetpackStatsWidgetsCoreTests",
         "name" : "JetpackStatsWidgetsCoreTests"
       }
     },
     {
-      "enabled" : false,
       "target" : {
         "containerPath" : "container:..\/Modules",
         "identifier" : "WordPressFluxTests",
         "name" : "WordPressFluxTests"
       }
     },
     {
-      "enabled" : false,
       "target" : {
         "containerPath" : "container:..\/Modules",
         "identifier" : "WordPressSharedObjCTests",