Merge pull request #44 from jellyfish-dev/jellyfish

Jellyfish refactor

.github/workflows/publish_docs.yaml

@@ -3,7 +3,7 @@ name: Deploy Docs
 on:
   push:
     tags:
-      - "*"
+        - "*"
 
 jobs:
   build:
@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Build Docs
-        run: mkdir MembraneRTC/docs && xcodebuild docbuild -scheme MembraneRTC -destination generic/platform=iOS OTHER_DOCC_FLAGS="--transform-for-static-hosting --output-path docs --hosting-base-path membrane-webrtc-ios"
+        run: mkdir docs && rm -rf MembraneVideoroomDemo.xcodeproj MembraneVideoroomDemo.xcworkspace MembraneVideoroomDemo && xcodebuild docbuild -scheme MembraneRTC -destination generic/platform=iOS OTHER_DOCC_FLAGS="--transform-for-static-hosting --output-path docs --hosting-base-path membrane-webrtc-ios"
 
       - name: Install coreutils
         run: brew install coreutils
@@ -25,5 +25,5 @@ jobs:
         env:
           REPO: self
           BRANCH: gh-pages
-          FOLDER: MembraneRTC/docs
+          FOLDER: docs
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/run_lint_and_tests.yaml

@@ -15,10 +15,10 @@ jobs:
         run: cp Release.xcconfig Debug.xcconfig
 
       - name: Run formatter
-        run: swift-format format -i -r ./MembraneRTC/Sources/**/*.swift --configuration swift-format-config.json
+        run: swift-format format -i -r ./Sources/**/*.swift --configuration swift-format-config.json
 
       - name: Run lint
-        run: swift-format lint -r ./MembraneRTC/Sources/**/*.swift --configuration swift-format-config.json
+        run: swift-format lint -r ./Sources/**/*.swift --configuration swift-format-config.json
 
       - name: Run tests
         run: set -o pipefail && xcodebuild test -scheme MembraneVideoroomDemo -destination 'platform=iOS Simulator,name=iPhone 13,OS=16.2' -workspace 'MembraneVideoroomDemo.xcworkspace' -sdk iphonesimulator | xcbeautify

.gitignore

@@ -4,4 +4,8 @@ node_modules
 build
 docs
 xcuserdata
-Debug.xcconfig
+Debug.xcconfig
+.swiftpm
+/.build
+/Packages
+DerivedData/

.release-it.json

@@ -6,8 +6,8 @@
     }
   },
   "hooks": {
-    "after:bump": "pod lib lint --allow-warnings",
-    "before:github:release": "pod trunk push --allow-warnings"
+    "after:bump": "pod lib lint",
+    "before:github:release": "pod trunk push"
   },
   "github": {
     "release": true

MembraneRTC.podspec

@@ -20,16 +20,15 @@ Pod::Spec.new do |s|
   s.ios.deployment_target = '13.0'
   s.swift_version = '5.0'
 
-  s.source_files = 'MembraneRTC/Sources/MembraneRTC/**/*'
+  s.source_files = 'Sources/MembraneRTC/**/*'
   s.dependency 'WebRTC-SDK', '104.5112.15'
   s.dependency 'SwiftProtobuf'
   s.dependency 'PromisesSwift'
   s.dependency 'SwiftPhoenixClient', '~> 4.0.0'
-  s.dependency 'Logging'
-  s.dependency 'SwiftCollection'
+  s.dependency 'SwiftLogJellyfish', '1.5.2'
   s.pod_target_xcconfig = { 'ENABLE_BITCODE' => 'NO' }
 
   s.subspec "Broadcast" do |spec|
-    spec.source_files = "MembraneRTC/Sources/MembraneRTC/Media/BroadcastSampleSource.swift", "MembraneRTC/Sources/MembraneRTC/IPC/**/*.{h,m,mm,swift}"
+    spec.source_files = "Sources/MembraneRTC/Media/BroadcastSampleSource.swift", "Sources/MembraneRTC/IPC/**/*.{h,m,mm,swift}"
   end
 end