From a93266df99767f9715ecd91e30aa93bd0d2ab9f5 Mon Sep 17 00:00:00 2001
From: Dan Federman <dfed@me.com>
Date: Fri, 3 Jan 2025 22:04:39 +1300
Subject: [PATCH] Pull CocoaPods config out into separate Package.swift, part 3

---
 CocoaPods/Package.swift | 1 -
 SafeDI.podspec          | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/CocoaPods/Package.swift b/CocoaPods/Package.swift
index b6024dfc..903f377d 100644
--- a/CocoaPods/Package.swift
+++ b/CocoaPods/Package.swift
@@ -1,7 +1,6 @@
 // swift-tools-version: 6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
-import CompilerPluginSupport
 import PackageDescription
 
 let package = Package(
diff --git a/SafeDI.podspec b/SafeDI.podspec
index ce532505..50cd0f35 100644
--- a/SafeDI.podspec
+++ b/SafeDI.podspec
@@ -14,14 +14,14 @@ Pod::Spec.new do |s|
   s.visionos.deployment_target = '1.0'
 
   s.source_files = 'Sources/SafeDI/**/*.{swift}'
-  s.preserve_paths = 'CocoaPods/', 'Sources/SafeDIMacros'
+  s.preserve_paths = 'CocoaPods/', 'Sources/SafeDIMacros', 'Sources/SafeDICore'
 
   # The below scripts and flags were inspired by https://soumyamahunt.medium.com/support-swift-macros-with-cocoapods-3911f9317042
   script = <<-SCRIPT.squish
   env -i PATH="$PATH" "$SHELL" -l -c
   "swift build --package-path CocoaPods -c $(echo ${CONFIGURATION} | tr '[:upper:]' '[:lower:]') --product SafeDIMacros
   --sdk \\"`xcrun --show-sdk-path`\\"
-  --package-path \\"$PODS_TARGET_SRCROOT\\"
+  --package-path \\"${PODS_TARGET_SRCROOT}/CocoaPods\\"
   --scratch-path \\"${PODS_BUILD_DIR}/Macros/SafeDIMacros\\""
   SCRIPT