Fixed SPM support (#110)

rajdeep · Mar 23, 2021 · 5f8ae49 · 5f8ae49
1 parent 84feef9
commit 5f8ae49
Show file tree

Hide file tree

Showing 84 changed files with 380 additions and 782 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -17,17 +17,13 @@ jobs:
 
     steps:
     - name: Select Xcode
-      run: sudo xcode-select -switch /Applications/Xcode_12.2.app
+      run: sudo xcode-select -switch /Applications/Xcode_12.4.app
     - name: Xcode version
       run: /usr/bin/xcodebuild -version    
     - uses: actions/checkout@v2
     - name: Build and Test Proton
       run: xcodebuild build test -destination "name=iPhone 11 Pro" -scheme "Proton"
     - name: Capture Proton Code Coverage
       uses: codecov/[email protected]
-    - name: Build and Test Proton Extensions
-      run: xcodebuild build test -destination "name=iPhone 11 Pro" -scheme "ProtonExtensions"
-    - name: Capture ProtonExtensions Code Coverage
-      uses: codecov/[email protected]
     - name: Build Example App
       run: xcodebuild build -destination "name=iPhone 11 Pro" -scheme "ExampleApp"
diff --git a/ExampleApp/ExampleApp.xcodeproj/project.pbxproj b/ExampleApp/ExampleApp.xcodeproj/project.pbxproj
@@ -30,7 +30,6 @@
 		1B2DA74D23F0C39B00F7EC52 /* DummyCollabCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1B2DA74C23F0C39B00F7EC52 /* DummyCollabCommand.swift */; };
 		1B45CD8B23BDD3E9001EB196 /* AutogrowingEditorViewExampleViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1B45CD8A23BDD3E9001EB196 /* AutogrowingEditorViewExampleViewController.swift */; };
 		1B45CD8D23BDD5FC001EB196 /* ExamplesBaseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1B45CD8C23BDD5FC001EB196 /* ExamplesBaseViewController.swift */; };
-		1B6BC524243FFA5D002276B6 /* ProtonExtensions.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 1B8D81FF243F3221009AD38A /* ProtonExtensions.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		1B6D2FD123BD46ED0019CE40 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1B6D2FD023BD46ED0019CE40 /* AppDelegate.swift */; };
 		1B6D2FD323BD46ED0019CE40 /* MasterViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1B6D2FD223BD46ED0019CE40 /* MasterViewController.swift */; };
 		1B6D2FD823BD46ED0019CE40 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 1B6D2FD623BD46ED0019CE40 /* Main.storyboard */; };
@@ -41,7 +40,6 @@
 		1B6DE9DE23C598F1007F9859 /* CommandsExampleViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1B6DE9DD23C598F1007F9859 /* CommandsExampleViewController.swift */; };
 		1B6DE9E123C59A16007F9859 /* PanelCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1B6DE9E023C59A16007F9859 /* PanelCommand.swift */; };
 		1B872B9F23EE73170070A92A /* UIViewExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1B872B9E23EE73170070A92A /* UIViewExtensions.swift */; };
-		1B8D8200243F3221009AD38A /* ProtonExtensions.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1B8D81FF243F3221009AD38A /* ProtonExtensions.framework */; };
 		1B91F4B623C73D01003F9B55 /* TypeaheadTextProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1B91F4B523C73D01003F9B55 /* TypeaheadTextProcessor.swift */; };
 		1B91F4B823C73D3C003F9B55 /* MarkupTextProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1B91F4B723C73D3C003F9B55 /* MarkupTextProcessor.swift */; };
 		1B91F4BA23C73D96003F9B55 /* TextProcessorExampleViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1B91F4B923C73D96003F9B55 /* TextProcessorExampleViewController.swift */; };
@@ -82,7 +80,6 @@
 			dstSubfolderSpec = 10;
 			files = (
 				1BB8904223C5A74700F087AE /* Proton.framework in Copy Frameworks */,
-				1B6BC524243FFA5D002276B6 /* ProtonExtensions.framework in Copy Frameworks */,
 			);
 			name = "Copy Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -150,7 +147,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				1B8D8200243F3221009AD38A /* ProtonExtensions.framework in Frameworks */,
 				1BFFEF0323C3048E00D2BA35 /* Proton.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

diff --git a/ExampleApp/ExampleApp/AdvancedFeatures/CommandsExampleViewController.swift b/ExampleApp/ExampleApp/AdvancedFeatures/CommandsExampleViewController.swift
@@ -22,7 +22,6 @@ import Foundation
 import UIKit
 
 import Proton
-import ProtonExtensions
 
 class EditorCommandButton: UIButton {
     let command: EditorCommand

diff --git a/ExampleApp/ExampleApp/Miscellaneous/MenuExampleViewController.swift b/ExampleApp/ExampleApp/Miscellaneous/MenuExampleViewController.swift
@@ -23,7 +23,6 @@ import Foundation
 import UIKit
 
 import Proton
-import ProtonExtensions
 
 class MenuExampleViewController: ExamplesBaseViewController {
 

diff --git a/ExampleApp/ExampleApp/Renderer/RendererCommandExampleViewController.swift b/ExampleApp/ExampleApp/Renderer/RendererCommandExampleViewController.swift
@@ -21,8 +21,7 @@
 import Foundation
 import UIKit
 
-import Proton
-import ProtonExtensions
+@testable import Proton
 
 class RendererCommandButton: UIButton {
     var command: RendererCommand!

diff --git a/Package.swift b/Package.swift
@@ -30,9 +30,14 @@ let package = Package(
     ],
     targets: [
         .target(
-            name: "Proton",
+            name: "ProtonCore",
             dependencies: [],
-            path: "Proton/Sources"
+            path: "Proton/Sources/ObjC"         
+        ),
+        .target(
+            name: "Proton",
+            dependencies: ["ProtonCore"],
+            path: "Proton/Sources/Swift"
         ),
         .testTarget(
             name: "ProtonTests",

diff --git a/Proton.xcworkspace/contents.xcworkspacedata b/Proton.xcworkspace/contents.xcworkspacedata