feat(pdfx): add Swift Package Manager support

packages/pdfx/CHANGELOG.md

@@ -1,3 +1,7 @@
+## NEXT
+
+* Added Swift Package Manager support for iOS and macOS, consolidating the duplicated Apple implementation into shared Darwin sources while retaining CocoaPods compatibility [pull#623](https://github.com/ScerIO/packages.flutter/pull/623)
+
 ## 2.10.0
 
 * Supported AGP 9 built-in Kotlin [pull#624](https://github.com/ScerIO/packages.flutter/pull/624)

packages/pdfx/ios/pdfx.podspec → packages/pdfx/darwin/pdfx.podspec

@@ -1,24 +1,30 @@
-#
-# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html.
-# Run `pod lib lint pdfx.podspec` to validate before publishing.
-#
-Pod::Spec.new do |s|
-  s.name             = 'pdfx'
-  s.version          = '1.0.0'
-  s.summary          = 'Flutter Plugin to render a PDF file.'
-  s.description      = <<-DESC
-Flutter Plugin to render a PDF file.
-Downloaded by pub (not CocoaPods).
-                       DESC
-  s.homepage         = 'https://github.com/ScerIO/packages.flutter/tree/main/packages/pdfx'
-  s.license          = { :type => 'MIT', :file => '../LICENSE' }
-  s.author           = { 'Serge Shkurko' => 'sergeshkurko@outlook.com' }
-  s.source           = { :http => 'https://github.com/ScerIO/packages.flutter/tree/main/packages/pdfx' }
-  s.source_files = 'Classes/**/*'
-  s.dependency 'Flutter'
-  s.platform = :ios, '8.0'
-
-  # Flutter.framework does not contain a i386 slice.
-  s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'VALID_ARCHS[sdk=iphonesimulator*]' => 'x86_64' }
-  s.swift_version = '5.0'
-end
+#
+# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html.
+# Run `pod lib lint pdfx.podspec` to validate before publishing.
+#
+Pod::Spec.new do |s|
+  s.name             = 'pdfx'
+  s.version          = '1.0.0'
+  s.summary          = 'Flutter Plugin to render a PDF file.'
+  s.description      = <<-DESC
+Flutter Plugin to render a PDF file.
+Downloaded by pub (not CocoaPods).
+                       DESC
+  s.homepage         = 'https://github.com/ScerIO/packages.flutter/tree/main/packages/pdfx'
+  s.license          = { :type => 'MIT', :file => '../LICENSE' }
+  s.author           = { 'Serge Shkurko' => 'sergeshkurko@outlook.com' }
+  s.source           = { :path => '.' }
+  s.source_files     = 'pdfx/Sources/**/*.{h,m,swift}'
+  s.public_header_files = 'pdfx/Sources/**/include/**/*.h'
+
+  s.ios.deployment_target = '13.0'
+  s.osx.deployment_target = '10.15'
+
+  s.ios.dependency 'Flutter'
+  s.osx.dependency 'FlutterMacOS'
+
+  s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }
+  # Flutter.framework does not contain an i386 slice.
+  s.ios.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386' }
+  s.swift_version = '5.0'
+end

packages/pdfx/darwin/pdfx/Package.swift

@@ -0,0 +1,46 @@
+// swift-tools-version: 5.9
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let flutterFramework: Target.Dependency = .product(
+    name: "FlutterFramework",
+    package: "FlutterFramework"
+)
+
+let package = Package(
+    name: "pdfx",
+    platforms: [
+        .iOS("13.0"),
+        .macOS("10.15")
+    ],
+    products: [
+        .library(name: "pdfx", targets: ["pdfx"])
+    ],
+    dependencies: [
+        .package(name: "FlutterFramework", path: "../FlutterFramework")
+    ],
+    targets: [
+        // Swift Package Manager does not support mixing Objective-C and Swift
+        // sources in one target, so the generated Pigeon bridge is separate
+        // from the Swift plugin implementation.
+        .target(
+            name: "pdfx_messages",
+            dependencies: [flutterFramework],
+            path: "Sources/pdfx/messages",
+            publicHeadersPath: "include",
+            cSettings: [
+                .headerSearchPath("include/pdfx_messages")
+            ]
+        ),
+        .target(
+            name: "pdfx",
+            dependencies: [
+                flutterFramework,
+                "pdfx_messages"
+            ],
+            path: "Sources/pdfx",
+            exclude: ["messages"]
+        )
+    ]
+)

packages/pdfx/ios/Classes/Document.swift → packages/pdfx/darwin/pdfx/Sources/pdfx/Document.swift

@@ -1,3 +1,11 @@
+import CoreGraphics
+import Foundation
+#if os(iOS)
+import UIKit
+#elseif os(macOS)
+import AppKit
+#endif
+
 class Document {
     let id: String
     let renderer: CGPDFDocument

packages/pdfx/ios/Classes/Hooks.swift → packages/pdfx/darwin/pdfx/Sources/pdfx/Hooks.swift

@@ -1,4 +1,7 @@
+import CoreGraphics
+import Foundation
 #if os(iOS)
+import UIKit
 
 extension UIColor {
     convenience init(hexString: String) {
@@ -21,6 +24,7 @@ extension UIColor {
 }
 
 #elseif os(macOS)
+import AppKit
 
 extension NSColor {
     convenience init(hexString: String) {

packages/pdfx/darwin/pdfx/Sources/pdfx/PdfxPlugin.swift

@@ -0,0 +1,13 @@
+#if os(iOS)
+import Flutter
+#elseif os(macOS)
+import FlutterMacOS
+#endif
+import Foundation
+
+/// Stable plugin entry point used by Flutter's generated registrants.
+public final class PdfxPlugin: NSObject, FlutterPlugin {
+    public static func register(with registrar: FlutterPluginRegistrar) {
+        SwiftPdfxPlugin.register(with: registrar)
+    }
+}

packages/pdfx/ios/Classes/Resources.swift → packages/pdfx/darwin/pdfx/Sources/pdfx/Resources.swift

@@ -1,3 +1,6 @@
+import CoreGraphics
+import Foundation
+
 enum RepositoryError: Error {
     case ItemNotFound
 }

packages/pdfx/ios/Classes/SwiftPdfxPlugin.swift → packages/pdfx/darwin/pdfx/Sources/pdfx/SwiftPdfxPlugin.swift

@@ -6,6 +6,9 @@ import Cocoa
 import FlutterMacOS
 #endif
 import CoreGraphics
+#if SWIFT_PACKAGE
+import pdfx_messages
+#endif
 
 public class SwiftPdfxPlugin: NSObject, FlutterPlugin, PdfxApi {
     let registrar: FlutterPluginRegistrar

packages/pdfx/ios/Classes/pdfx.h → packages/pdfx/darwin/pdfx/Sources/pdfx/messages/include/pdfx_messages/pdfx.h

@@ -1 +1 @@
-#import "messages.h"
+#import "messages.h"

packages/pdfx/pigeons/messages.dart

@@ -2,8 +2,9 @@ import 'package:pigeon/pigeon.dart';
 
 @ConfigurePigeon(PigeonOptions(
   dartOut: 'lib/src/renderer/io/pigeon.dart',
-  objcHeaderOut: './ios/Classes/messages.h',
-  objcSourceOut: './ios/Classes/messages.m',
+  objcHeaderOut:
+      './darwin/pdfx/Sources/pdfx/messages/include/pdfx_messages/messages.h',
+  objcSourceOut: './darwin/pdfx/Sources/pdfx/messages/messages.m',
   javaOut: './android/src/main/java/dev/flutter/pigeon/Pigeon.java',
   javaOptions: JavaOptions(
     package: 'dev.flutter.pigeon',

packages/pdfx/pubspec.yaml

@@ -37,8 +37,10 @@ flutter:
         pluginClass: PdfxPlugin
       ios:
         pluginClass: PdfxPlugin
+        sharedDarwinSource: true
       macos:
         pluginClass: PdfxPlugin
+        sharedDarwinSource: true
       windows:
         pluginClass: PdfxPlugin
       web:

packages/pdfx/scripts/pigeon.sh

@@ -11,12 +11,7 @@ echo "$Green Success$Color_Off"
 echo "$BBlue Replace import in generated iOS pigeon file for support macOS$Color_Off"
 to="#if TARGET_OS_IOS\n#import <Flutter\/Flutter.h>\n#else\n#import <FlutterMacOS\/FlutterMacOS.h>\n#endif"
 from="#import <Flutter\/Flutter.h>"
-sed -i "" "s/$from/$to/g" "ios/Classes/messages.m"
-echo "$Green Success$Color_Off"
-
-
-echo "$BBlue Link macOS to iOS (universal) codebase$Color_Off"
-sh ./scripts/link_macos.sh
+sed -i "" "s/$from/$to/g" "darwin/pdfx/Sources/pdfx/messages/messages.m"
 echo "$Green Success$Color_Off"