Move Aztec and WordPressEditor from CocoaPods to Modules

Author: mokagio

Modules/Package.resolved

@@ -51,6 +51,7 @@ let package = Package(
         .package(url: "https://github.com/squarefrog/UIDeviceIdentifier", from: "2.3.0"),
         .package(url: "https://github.com/stripe/stripe-terminal-ios", from: "4.2.0"),
         .package(url: "https://github.com/SVProgressHUD/SVProgressHUD", from: "2.2.5"),
+        .package(url: "https://github.com/wordpress-mobile/AztecEditor-iOS", from: "1.20.0"),
         .package(url: "https://github.com/wordpress-mobile/NSObject-SafeExpectations", from: "0.0.6"),
         .package(url: "https://github.com/wordpress-mobile/wpxmlrpc", from: "0.10.0"),
         .package(url: "https://github.com/zendesk/support_sdk_ios", from: "9.0.0"),
@@ -185,6 +186,7 @@ enum XcodeSupport {
                 dependencies: [
                     "Codegen",
                     .product(name: "Alamofire", package: "Alamofire"),
+                    .product(name: "Aztec", package: "AztecEditor-iOS"),
                     .product(name: "CocoaLumberjackSwift", package: "CocoaLumberjack"),
                     .product(name: "KeychainAccess", package: "KeychainAccess"),
                     XcodeTargetNames.wooFoundation.asDependency
@@ -248,6 +250,7 @@ enum XcodeSupport {
                     .product(name: "AutomatticAbout", package: "AutomatticAbout-swift"),
                     .product(name: "AutomatticTracks", package: "Automattic-Tracks-iOS"),
                     .product(name: "AutomatticEncryptedLogs", package: "Automattic-Tracks-iOS"),
+                    .product(name: "Aztec", package: "AztecEditor-iOS"),
                     .product(name: "CocoaLumberjackSwift", package: "CocoaLumberjack"),
                     .product(name: "ConfettiSwiftUI", package: "ConfettiSwiftUI"),
                     .product(name: "DGCharts", package: "Charts"),
@@ -258,6 +261,7 @@ enum XcodeSupport {
                     .product(name: "ScrollViewSectionKit", package: "ScrollViewSectionKit"),
                     .product(name: "Shimmer", package: "SwiftUI-Shimmer"),
                     .product(name: "StripeTerminal", package: "stripe-terminal-ios"),
+                    .product(name: "WordPressEditor", package: "AztecEditor-iOS"),
                     .product(name: "ZendeskSupportSDK", package: "support_sdk_ios"),
                 ]
             ),
@@ -274,9 +278,11 @@ enum XcodeSupport {
                 dependencies: [
                     "Codegen",
                     "TestKit",
+                    .product(name: "Aztec", package: "AztecEditor-iOS"),
                     .product(name: "BuildkiteTestCollector", package: "test-collector-swift"),
                     .product(name: "ViewControllerPresentationSpy", package: "ViewControllerPresentationSpy"),
                     .product(name: "ViewInspector", package: "ViewInspector"),
+                    .product(name: "WordPressEditor", package: "AztecEditor-iOS"),
                     XcodeTargetNames.wooCommerce.asDependency
                 ]
             ),
@@ -337,9 +343,11 @@ enum XcodeSupport {
                 dependencies: [
                     "Codegen",
                     .product(name: "Alamofire", package: "Alamofire"),
+                    .product(name: "Aztec", package: "AztecEditor-iOS"),
                     .product(name: "CocoaLumberjackSwift", package: "CocoaLumberjack"),
                     .product(name: "KeychainAccess", package: "KeychainAccess"),
-                    .product(name: "StripeTerminal", package: "stripe-terminal-ios")
+                    .product(name: "StripeTerminal", package: "stripe-terminal-ios"),
+                    .product(name: "WordPressEditor", package: "AztecEditor-iOS"),
                 ]
             ),
             .xcodeTarget(

Modules/Package.swift

@@ -22,21 +22,12 @@ workspace 'WooCommerce.xcworkspace'
 ## Pods shared between all the targets
 ## =====================================
 ##
-def aztec
-  pod 'WordPress-Editor-iOS', '~> 1.19'
-  # pod 'WordPress-Editor-iOS', git: 'https://github.com/wordpress-mobile/AztecEditor-iOS.git', commit: ''
-  # pod 'WordPress-Aztec-iOS', git: 'https://github.com/wordpress-mobile/AztecEditor-iOS.git', commit: ''
-end
-
 def wordpress_shared
   pod 'WordPressShared', '~> 2.1-beta'
 end
 
 def networking_pods
   wordpress_shared
-
-  # Used for HTML parsing
-  aztec
 end
 
 def wordpress_ui
@@ -57,8 +48,6 @@ target 'WooCommerce' do
   wordpress_shared
   wordpress_ui
 
-  aztec
-
   pod 'WPMediaPicker', '~> 1.8'
   # pod 'WPMediaPicker', git: 'https://github.com/wordpress-mobile/MediaPicker-iOS.git', commit: ''
 
@@ -80,8 +69,6 @@ end
 #
 def yosemite_pods
   networking_pods
-
-  aztec
 end
 
 # Yosemite Target:

Podfile

@@ -1,36 +1,28 @@
 PODS:
-  - WordPress-Aztec-iOS (1.19.10)
-  - WordPress-Editor-iOS (1.19.10):
-    - WordPress-Aztec-iOS (= 1.19.10)
   - WordPressShared (2.1.0)
   - WordPressUI (1.15.1)
   - Wormholy (1.6.6)
   - WPMediaPicker (1.8.12)
 
 DEPENDENCIES:
-  - WordPress-Editor-iOS (~> 1.19)
   - WordPressShared (~> 2.1-beta)
   - WordPressUI (~> 1.15)
   - Wormholy (~> 1.6.6)
   - WPMediaPicker (~> 1.8)
 
 SPEC REPOS:
   trunk:
-    - WordPress-Aztec-iOS
-    - WordPress-Editor-iOS
     - WordPressShared
     - WordPressUI
     - Wormholy
     - WPMediaPicker
 
 SPEC CHECKSUMS:
-  WordPress-Aztec-iOS: 8eaa928fb3a5694924ed3befac64beaae5656e12
-  WordPress-Editor-iOS: 98ce1fc542c3a09e48ddc9423405b1d1e48240f1
   WordPressShared: 0aa459e5257a77184db87805a998f447443c9706
   WordPressUI: 700e3ec5a9f77b6920c8104c338c85788036ab3c
   Wormholy: 09da0b876f9276031fd47383627cb75e194fc068
   WPMediaPicker: e9eaa804e1b0288d7969776608053ae0ea2941f2
 
-PODFILE CHECKSUM: a638f0872dc55648ed9f9dbbbafd7a7c1e8a50c2
+PODFILE CHECKSUM: bba16ee5a26e554750998f34114b2c9de00861a0
 
 COCOAPODS: 1.16.2