feat(SCREO-12675): Removed xcodegen & carthage (#34)

* feat: removed carthage * feat: removed carthage * feat: removed carthage * feat: build & run test on macOS & iOS * feat: build & run test on macOS & iOS * feat: build & run test on macOS & iOS
sky-uk · Oct 26, 2022 · 8ee82f7 · 8ee82f7
1 parent 930fb2a
commit 8ee82f7
Show file tree

Hide file tree

Showing 17 changed files with 8 additions and 1,560 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -7,26 +7,12 @@ aliases:
       command: |
         rm ~/.ssh/id_rsa
         for ip in $(dig @8.8.8.8 github.com +short); do ssh-keyscan github.com,$ip; ssh-keyscan $ip; done 2>/dev/null >> ~/.ssh/known_hosts || true
-  - &carthage_bootstrap
-      name: Bootstrap iOS dependencies
-      command: |
-        ./bootstrap
-  - &unittest_reactive_api
-      name: Run ReactiveAPI Unit Tests
-      command: >
-        xcodebuild test
-        -scheme ReactiveAPI
-        -clonedSourcePackagesDirPath SourcePackages
-        -destination 'platform=iOS Simulator,name=iPhone 11'
-        | xcpretty
-  - &unittest_reactive_api_ext
-      name: Run ReactiveAPIExt Unit Tests
-      command: >
-        xcodebuild test
-        -scheme ReactiveAPIExt
-        -clonedSourcePackagesDirPath SourcePackages
-        -destination 'platform=iOS Simulator,name=iPhone 11'
-        | xcpretty
+  - &run_swift_test
+      name: Run Tests on macOS
+      command: swift test 
+  - &run_xcodebuld_test
+      name: Run tests on iOS 
+      command: xcodebuild test -scheme ReactiveAPI-Package -destination 'platform=iOS Simulator,name=iPhone 13'
   - &swiftlint
       name: Run Swiftlint
       command: swiftlint lint
@@ -36,10 +22,9 @@ jobs:
     shell: /bin/bash --login -eo pipefail
     steps:
       - checkout
-      - run: *carthage_bootstrap
       - run: *ssh_fix
-      - run: *unittest_reactive_api
-      - run: *unittest_reactive_api_ext
+      - run: *run_swift_test
+      - run: *run_xcodebuld_test
   swiftlint:
     docker:
       - image: dantoml/swiftlint:latest

diff --git a/Cartfile b/Cartfile
diff --git a/Cartfile.private b/Cartfile.private
diff --git a/Cartfile.resolved b/Cartfile.resolved
diff --git a/ReactiveAPI.plist b/ReactiveAPI.plist
diff --git a/ReactiveAPI.xcodeproj/project.pbxproj b/ReactiveAPI.xcodeproj/project.pbxproj
diff --git a/ReactiveAPI.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ReactiveAPI.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/ReactiveAPI.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ReactiveAPI.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
diff --git a/ReactiveAPI.xcodeproj/xcshareddata/xcschemes/ReactiveAPI-Tests.xcscheme b/ReactiveAPI.xcodeproj/xcshareddata/xcschemes/ReactiveAPI-Tests.xcscheme
diff --git a/ReactiveAPI.xcodeproj/xcshareddata/xcschemes/ReactiveAPI.xcscheme b/ReactiveAPI.xcodeproj/xcshareddata/xcschemes/ReactiveAPI.xcscheme
diff --git a/ReactiveAPI.xcodeproj/xcshareddata/xcschemes/ReactiveAPIExt-Tests.xcscheme b/ReactiveAPI.xcodeproj/xcshareddata/xcschemes/ReactiveAPIExt-Tests.xcscheme