SPM Support (#29)

* Initial support for SPM

* Commit ETTrace prebuilt

* Added CocoaPods podspec

* Fixed Crashlytics imports for SPM support

* Fixed Crashlytics imports for SPM support

* Add Package.swift configuration

* Update ETTraceRunner for SPM

* Update build script and Readme

* Fix exclude

* Added EMG prefix to Dummy class

* Removed prebuild folder

* Use SPM to build everything

* Run github action on this branch

* Fix build script

* Log destinations

* Use generic destination

* Use C++17

* Add scripts to autorelease on tag creation

* Chmod build runner

* Add C++ version to build script

* Use ObjetiveC JSONWrapper due to performance issues

* Remove comment

.github/workflows/build.yml

@@ -0,0 +1,22 @@
+name: Pull Request Build
+
+on:
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  build:
+    runs-on: macos-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Show destinations
+        run: xcodebuild -scheme ETTrace -showdestinations
+      - name: Build ETTrace for iOS Simulator
+        run: xcodebuild build -scheme ETTrace -sdk iphonesimulator -destination 'generic/platform=iOS Simulator' CLANG_CXX_LANGUAGE_STANDARD=c++17
+      - name: Build ETTrace for iOS
+        run: xcodebuild build -scheme ETTrace -sdk iphoneos -destination 'generic/platform=iOS' CLANG_CXX_LANGUAGE_STANDARD=c++17
+      - name: Build ETTrace for macOS
+        run: xcodebuild build -scheme ETTraceRunner -sdk macosx -destination 'generic/platform=macOS' ONLY_ACTIVE_ARCH=NO

.github/workflows/release.yml

@@ -0,0 +1,37 @@
+name: Release Workflow
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  release:
+    runs-on: macos-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Setup Signing Certificate
+        uses: apple-actions/import-codesign-certs@v2
+        with: 
+          p12-file-base64: ${{ secrets.CERTIFICATES_P12 }}
+          p12-password: ${{ secrets.CERTIFICATES_P12_PASSWORD }}
+      - name: Build ETTrace xcframework
+        run: sh build.sh
+      - name: Zip xcframework
+        run: zip -r ETTrace.xcframework.zip ETTrace.xcframework
+      - name: Build ETTraceRunner
+        run: sh build_runner.sh
+        env:
+          SIGNING_IDENTITY: ${{ secrets.SIGNING_IDENTITY }}
+      - name: Upload Artifact
+        uses: softprops/action-gh-release@v1
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          files: |
+            ETTrace.xcframework.zip
+            ETTraceRunner
+          body:
+            Release ${{ github.ref }}
+            Automated release created by GitHub Actions.

.gitignore

@@ -4,6 +4,7 @@
 **/*.xcodeproj/xcshareddata/
 ETTrace-iphonesimulator.xcarchive/
 ETTrace-iphoneos.xcarchive/
-ETTrace.xcframework/
+./ETTrace.xcframework/
 output.json
 output.folded
+.swiftpm

ETTrace/CommunicationFrame/EMGDummyEmptyClass.h

@@ -0,0 +1,18 @@
+//
+//  DummyEmptyClass.h
+//  
+//
+//  Created by Itay Brenner on 2/6/23.
+//
+
+#import <Foundation/Foundation.h>
+
+// This class is required becasue SPM doesn't support header only targets
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface EMGDummyEmptyClass : NSObject
+
+@end
+
+NS_ASSUME_NONNULL_END

ETTrace/CommunicationFrame/EMGDummyEmptyClass.m

@@ -0,0 +1,14 @@
+//
+//  DummyEmptyClass.m
+//  
+//
+//  Created by Itay Brenner on 2/6/23.
+//
+
+#import "EMGDummyEmptyClass.h"
+
+// This class is required becasue SPM doesn't support header only targets
+
+@implementation EMGDummyEmptyClass
+
+@end

ETTrace/ETTrace/EMGChannelListener.m

@@ -6,9 +6,9 @@
 //
 
 #import "EMGChannelListener.h"
-#import <PeerTalk/PTChannel.h>
-#import <CommunicationFrame/CommunicationFrame.h>
 #import "EMGPerfAnalysis_Private.h"
+#import <Peertalk.h>
+#import <CommunicationFrame.h>
 
 @interface EMGChannelListener () <PTChannelDelegate>
 @property (nonatomic, weak) PTChannel *serverChannel;

ETTrace/ETTrace/EMGPerfAnalysis.mm

@@ -14,7 +14,7 @@
 #import <sys/sysctl.h>
 #import <mach-o/arch.h>
 #import "EMGChannelListener.h"
-
+#import <QuartzCore/QuartzCore.h>
 #import "PerfAnalysis.h"
 
 @implementation EMGPerfAnalysis

ETTrace/ETTraceRunner/Devices/CommunicationChannel.swift

@@ -7,7 +7,7 @@
 
 import Foundation
 import CommunicationFrame
-import PeerTalk
+import Peertalk
 
 class CommunicationChannel: NSObject {
 

ETTrace/ETTraceRunner/Devices/DeviceManager.swift

@@ -7,7 +7,7 @@
 
 import Foundation
 import CommunicationFrame
-import PeerTalk
+import Peertalk
 
 protocol DeviceManager {
     var communicationChannel: CommunicationChannel { get }

ETTrace/ETTraceRunner/Devices/PhysicalDeviceManager.swift

@@ -6,7 +6,7 @@
 //
 
 import Foundation
-import PeerTalk
+import Peertalk
 import CommunicationFrame
 
 enum ConnectionError: Error {

ETTrace/ETTraceRunner/Devices/SimulatorDeviceManager.swift

@@ -6,7 +6,7 @@
 //
 
 import Foundation
-import PeerTalk
+import Peertalk
 import CommunicationFrame
 
 struct SimulatorDeviceManager: DeviceManager {

ETTrace/ETTraceRunner/PerfAnalysisRunner.swift

@@ -8,7 +8,6 @@
 import Foundation
 import ArgumentParser
 
-@main
 struct PerfAnalysisRunner: ParsableCommand {
     @Option(name: .shortAndLong, help: "Directory with dSYMs")
     var dsyms: String? = nil

ETTrace/ETTraceRunner/RunnerHelper.swift

@@ -5,10 +5,12 @@
 //  Created by Itay Brenner on 8/3/23.
 //
 
+import AppKit
 import Foundation
-import PeerTalk
+import Peertalk
 import CommunicationFrame
 import Swifter
+import JSONWrapper
 
 class RunnerHelper {
     let dsyms: String?

ETTrace/ETTraceRunner/Utils/Utils.swift

@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import AppKit
 
 func safeShell(_ command: String) throws {
     let task = Process()

ETTrace/ETTraceRunner/main.swift

@@ -0,0 +1,8 @@
+//
+//  main.swift
+//  
+//
+//  Created by Itay Brenner on 6/6/23.
+//
+
+PerfAnalysisRunner.main()

ETTrace/ETTraceRunner/JSONWrapper.m → ETTrace/JSONWrapper/JSONWrapper.m

@@ -7,10 +7,13 @@
 
 #import <Foundation/Foundation.h>
 #import "JSONWrapper.h"
+@import ETModels;
 
 @implementation JSONWrapper
 
-+ (NSDictionary *)toDictionary:(FlameNode *)node {
++ (NSDictionary *)toDictionary:(NSObject *)anyObject {
+  FlameNode *node = (FlameNode *)anyObject;
+
   NSObject *children;
   if (node.children.count == 1) {
     children = [JSONWrapper toDictionary:node.children[0]];
@@ -30,7 +33,9 @@ + (NSDictionary *)toDictionary:(FlameNode *)node {
   };
 }
 
-+ (NSData *)toData:(FlameNode *)input {
++ (NSData *)toData:(NSObject *)anyInput {
+  FlameNode *input = (FlameNode *)anyInput;
+
   return [NSJSONSerialization dataWithJSONObject:[JSONWrapper toDictionary:input] options:NSJSONWritingWithoutEscapingSlashes error:nil];
 }
 

ETTrace/JSONWrapper/Public/JSONWrapper.h

@@ -0,0 +1,22 @@
+//
+//  TestClass.h
+//  ETTrace
+//
+//  Created by Noah Martin on 4/13/23.
+//
+
+#ifndef TestClass_h
+#define TestClass_h
+
+@import Foundation;
+
+@interface JSONWrapper : NSObject
+
+// Use NSObject here because we cannot import Swift packages from the public header to avoid circular dependencies
++ (NSDictionary *)toDictionary:(NSObject *)dictionary;
++ (NSData *)toData:(NSObject *)input;
+
+@end
+
+
+#endif /* TestClass_h */