Merge pull request #53 from justeat/fix-package

Fix package and use SPM in demo app
justeat · Jun 27, 2022 · 10eec07 · 10eec07
2 parents c6c005f + 0f79d9c
commit 10eec07
Show file tree

Hide file tree

Showing 73 changed files with 773 additions and 1,633 deletions.
diff --git a/.github/workflows/pull-request-workflow.yml b/.github/workflows/pull-request-workflow.yml
@@ -22,14 +22,17 @@ jobs:
       uses: ruby/[email protected]
       with:
         bundler-cache: true
-    - name: Run pod install
+    - name: Build for testing
       run: |
-        set -eo pipefail
-        export LIB_VERSION=$(git describe --tags `git rev-list --tags --max-count=1`)
-        bundle exec pod install --project-directory=Example
-    - name: Run tests
-      run: bundle exec fastlane unit_tests device:'iPhone 11'
-    - name: Validate lib
+        xcodebuild build-for-testing \
+        -scheme Shock \
+        -destination "platform=iOS Simulator,OS=15.2,name=iPhone 13"
+    - name: Test without building
+      run: |
+        xcodebuild test-without-building \
+        -scheme Shock \
+        -destination "platform=iOS Simulator,OS=15.2,name=iPhone 13"
+    - name: Validate pod
       run: |
         set -eo pipefail
         export LIB_VERSION=$(git describe --tags `git rev-list --tags --max-count=1`)

diff --git a/.ruby-version b/.ruby-version
@@ -1,2 +1 @@
-2.5.3
-
+3.0.2
diff --git a/...ject.xcworkspace/contents.xcworkspacedata → ...kage.xcworkspace/contents.xcworkspacedata b/...ject.xcworkspace/contents.xcworkspacedata → ...kage.xcworkspace/contents.xcworkspacedata
diff --git a/...areddata/xcschemes/Shock-Example.xcscheme → ...ode/xcshareddata/xcschemes/Shock.xcscheme b/...areddata/xcschemes/Shock-Example.xcscheme → ...ode/xcshareddata/xcschemes/Shock.xcscheme
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
-   version = "1.7">
+   LastUpgradeVersion = "1340"
+   version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
@@ -14,10 +14,24 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "607FACCF1AFB9204008FA782"
-               BuildableName = "Shock_Example.app"
-               BlueprintName = "Shock_Example"
-               ReferencedContainer = "container:Shock.xcodeproj">
+               BlueprintIdentifier = "Shock_UnitTests"
+               BuildableName = "Shock_UnitTests"
+               BlueprintName = "Shock_UnitTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "Shock"
+               BuildableName = "Shock"
+               BlueprintName = "Shock"
+               ReferencedContainer = "container:">
             </BuildableReference>
          </BuildActionEntry>
          <BuildActionEntry
@@ -28,10 +42,10 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "607FACE41AFB9204008FA782"
-               BuildableName = "Shock_Tests.xctest"
-               BlueprintName = "Shock_Tests"
-               ReferencedContainer = "container:Shock.xcodeproj">
+               BlueprintIdentifier = "UnitTests"
+               BuildableName = "UnitTests"
+               BlueprintName = "UnitTests"
+               ReferencedContainer = "container:">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -40,33 +54,16 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "607FACCF1AFB9204008FA782"
-            BuildableName = "Shock_Example.app"
-            BlueprintName = "Shock_Example"
-            ReferencedContainer = "container:Shock.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <TestPlans>
-         <TestPlanReference
-            reference = "container:Tests/UnitTests.xctestplan"
-            default = "YES">
-         </TestPlanReference>
-      </TestPlans>
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
-            skipped = "NO"
-            parallelizable = "YES">
+            skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "607FACE41AFB9204008FA782"
-               BuildableName = "Shock_Tests.xctest"
-               BlueprintName = "Shock_Tests"
-               ReferencedContainer = "container:Shock.xcodeproj">
+               BlueprintIdentifier = "UnitTests"
+               BuildableName = "UnitTests"
+               BlueprintName = "UnitTests"
+               ReferencedContainer = "container:">
             </BuildableReference>
          </TestableReference>
       </Testables>
@@ -81,33 +78,22 @@
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "607FACCF1AFB9204008FA782"
-            BuildableName = "Shock_Example.app"
-            BlueprintName = "Shock_Example"
-            ReferencedContainer = "container:Shock.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
+      <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "607FACCF1AFB9204008FA782"
-            BuildableName = "Shock_Example.app"
-            BlueprintName = "Shock_Example"
-            ReferencedContainer = "container:Shock.xcodeproj">
+            BlueprintIdentifier = "Shock_UnitTests"
+            BuildableName = "Shock_UnitTests"
+            BlueprintName = "Shock_UnitTests"
+            ReferencedContainer = "container:">
          </BuildableReference>
-      </BuildableProductRunnable>
+      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">