wireapp · caldrian · Nov 28, 2024 · Nov 28, 2024 · Nov 28, 2024 · Nov 28, 2024
diff --git a/.github/workflows/_reusable_run_tests.yml b/.github/workflows/_reusable_run_tests.yml
@@ -37,10 +37,6 @@ on:
         type: boolean
         default: false
         required: false
-      wire-datadog:
-        type: boolean
-        default: false
-        required: false
       wire-domain-project:
         type: boolean
         default: false
@@ -456,7 +452,7 @@ jobs:
         run: |
           echo "WireAPI has changes"
           echo "Building WireAPI..."
-          xcodebuild build-for-testing -workspace wire-ios-mono.xcworkspace -scheme WireAPI -resultBundlePath xcodebuild-wire-api.xcresult -destination 'platform=iOS Simulator,OS=${{ env.IOS_VERSION }},name=${{ env.IPHONE_MODEL }}' | tee xcodebuild-wire-api.log | bundle exec xcpretty
+          xcodebuild build-for-testing -workspace wire-ios-mono.xcworkspace -scheme WireAPI-Package -resultBundlePath xcodebuild-wire-api.xcresult -destination 'platform=iOS Simulator,OS=${{ env.IOS_VERSION }},name=${{ env.IPHONE_MODEL }}' | tee xcodebuild-wire-api.log | bundle exec xcpretty
 
       - uses: wireapp/analyze-xcoderesults-action@v1
         if: ${{ inputs.wire-api || inputs.all }}
@@ -469,35 +465,17 @@ jobs:
         if: ${{ inputs.wire-api || inputs.all }}
         run: |
           echo "Testing WireAPI..."
-          xcodebuild test -workspace wire-ios-mono.xcworkspace -scheme WireAPI -destination 'platform=iOS Simulator,OS=${{ env.IOS_VERSION }},name=${{ env.IPHONE_MODEL }}' | tee -a xcodebuild-wire-api.log | bundle exec xcpretty --report junit --output build/reports/WireAPI.junit
+          xcodebuild test -workspace wire-ios-mono.xcworkspace -scheme WireAPI-Package -destination 'platform=iOS Simulator,OS=${{ env.IOS_VERSION }},name=${{ env.IPHONE_MODEL }}' | tee -a xcodebuild-wire-api.log | bundle exec xcpretty --report junit --output build/reports/WireAPI.junit
           exit ${PIPESTATUS[0]}
 
-      # WireDatadog
-
-      - name: Build WireDatadog
-        if: ${{ inputs.wire-datadog || inputs.all }}
-        run: |
-          echo "WireDatadog has changes"
-          echo "Building WireDatadog..."
-          xcodebuild build-for-testing -workspace wire-ios-mono.xcworkspace -scheme WireDatadog -resultBundlePath xcodebuild-wire-datadog.xcresult -destination 'platform=iOS Simulator,OS=${{ env.IOS_VERSION }},name=${{ env.IPHONE_MODEL }}' | tee xcodebuild-wire-datadog.log | bundle exec xcpretty
-
-      - uses: wireapp/analyze-xcoderesults-action@v1
-        if: ${{ inputs.wire-datadog || inputs.all }}
-        with:
-          results: xcodebuild-wire-datadog.xcresult
-          warningAnnotations: true
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      # No tests exist for WireDatadog currently
-
       # WireAnalytics
 
       - name: Build WireAnalytics
         if: ${{ inputs.wire-analytics || inputs.all }}
         run: |
           echo "WireAnalytics has changes"
           echo "Building WireAnalytics..."
-          xcodebuild build-for-testing -workspace wire-ios-mono.xcworkspace -scheme WireAnalytics -resultBundlePath xcodebuild-wire-analytics.xcresult -destination 'platform=iOS Simulator,OS=${{ env.IOS_VERSION }},name=${{ env.IPHONE_MODEL }}' | tee xcodebuild-wire-analytics.log | bundle exec xcpretty
+          xcodebuild build-for-testing -workspace wire-ios-mono.xcworkspace -scheme WireAnalytics-Package -resultBundlePath xcodebuild-wire-analytics.xcresult -destination 'platform=iOS Simulator,OS=${{ env.IOS_VERSION }},name=${{ env.IPHONE_MODEL }}' | tee xcodebuild-wire-analytics.log | bundle exec xcpretty
 
       - uses: wireapp/analyze-xcoderesults-action@v1
         if: ${{ inputs.wire-analytics || inputs.all }}
@@ -506,7 +484,12 @@ jobs:
           warningAnnotations: true
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      # No tests exist for WireAnalytics currently
+      - name: Test WireAnalytics
+        if: ${{ inputs.wire-analytics || inputs.all }}
+        run: |
+          echo "Testing WireAnalytics..."
+          xcodebuild test -workspace wire-ios-mono.xcworkspace -scheme WireAnalytics-Package -destination 'platform=iOS Simulator,OS=${{ env.IOS_VERSION }},name=${{ env.IPHONE_MODEL }}' | tee -a xcodebuild-wire-analytics.log | bundle exec xcpretty --report junit --output build/reports/WireAnalytics.junit
+          exit ${PIPESTATUS[0]}
 
       # WireDomain
 
@@ -515,7 +498,7 @@ jobs:
         run: |
           echo "WireDomain has changes"
           echo "Building WireDomain..."
-          xcodebuild build-for-testing -workspace wire-ios-mono.xcworkspace -scheme WireDomainPackage -resultBundlePath xcodebuild-wire-domain.xcresult -destination 'platform=iOS Simulator,OS=${{ env.IOS_VERSION }},name=${{ env.IPHONE_MODEL }}' | tee xcodebuild-wire-domain.log | bundle exec xcpretty
+          xcodebuild build-for-testing -workspace wire-ios-mono.xcworkspace -scheme WireDomain-Package -resultBundlePath xcodebuild-wire-domain.xcresult -destination 'platform=iOS Simulator,OS=${{ env.IOS_VERSION }},name=${{ env.IPHONE_MODEL }}' | tee xcodebuild-wire-domain.log | bundle exec xcpretty
 
       - uses: wireapp/analyze-xcoderesults-action@v1
         if: ${{ inputs.wire-domain || inputs.all }}
@@ -528,7 +511,7 @@ jobs:
         if: ${{ inputs.wire-domain || inputs.all }}
         run: |
           echo "Testing WireDomain..."
-          xcodebuild test -workspace wire-ios-mono.xcworkspace -scheme WireDomainPackage -destination 'platform=iOS Simulator,OS=${{ env.IOS_VERSION }},name=${{ env.IPHONE_MODEL }}' | tee -a xcodebuild-wire-domain.log | bundle exec xcpretty --report junit --output build/reports/WireDomain.junit
+          xcodebuild test -workspace wire-ios-mono.xcworkspace -scheme WireDomain-Package -destination 'platform=iOS Simulator,OS=${{ env.IOS_VERSION }},name=${{ env.IPHONE_MODEL }}' | tee -a xcodebuild-wire-domain.log | bundle exec xcpretty --report junit --output build/reports/WireDomain.junit
           exit ${PIPESTATUS[0]}
 
       # WireDomain Project
@@ -625,7 +608,7 @@ jobs:
 
       # WireUI
 
-      - name: Test WireUI
+      - name: Build WireUI
         if: ${{ inputs.wire-ui || inputs.all }}
         run: |
           echo "WireUI has changes"

diff --git a/.github/workflows/test_pr_changes.yml b/.github/workflows/test_pr_changes.yml
@@ -34,7 +34,6 @@ jobs:
       wire-ios-request-strategy: ${{ steps.filter.outputs.wire-ios-request-strategy }}
       wire-api: ${{ steps.filter.outputs.wire-api }}
       wire-analytics: ${{ steps.filter.outputs.wire-analytics }}
-      wire-datadog: ${{ steps.filter.outputs.wire-datadog }}
       wire-domain-project: ${{ steps.filter.outputs.wire-domain-project }}
       wire-domain: ${{ steps.filter.outputs.wire-domain }}
       wire-ios-transport: ${{ steps.filter.outputs.wire-ios-transport }}
@@ -73,9 +72,7 @@ jobs:
             wire-api:
               - 'WireAPI/**'
             wire-analytics:
-              - 'WireAnalytics/Sources/WireAnalytics/**'
-            wire-datadog:
-              - 'WireAnalytics/Sources/WireDatadog/**'
+              - 'WireAnalytics/**'
             wire-domain-project:
               - 'WireDomain/Project/**'
               - 'WireDomain/Sources/WireDomain/**'
@@ -123,7 +120,6 @@ jobs:
       wire-ios-request-strategy: ${{ needs.detect-changes.outputs.wire-ios-request-strategy == 'true' }}
       wire-api: ${{ needs.detect-changes.outputs.wire-api == 'true' }}
       wire-analytics: ${{ needs.detect-changes.outputs.wire-analytics == 'true' }}
-      wire-datadog: ${{ needs.detect-changes.outputs.wire-datadog == 'true' }}
       wire-domain-project: ${{ needs.detect-changes.outputs.wire-domain-project == 'true' }}
       wire-domain: ${{ needs.detect-changes.outputs.wire-domain == 'true' }}
       wire-ios-transport: ${{ needs.detect-changes.outputs.wire-ios-transport == 'true' }}

diff --git a/...e/xcshareddata/xcschemes/WireAPI.xcscheme → ...eddata/xcschemes/WireAPI-Package.xcscheme b/...e/xcshareddata/xcschemes/WireAPI.xcscheme → ...eddata/xcschemes/WireAPI-Package.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1530"
+   LastUpgradeVersion = "1610"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -21,6 +21,20 @@
                ReferencedContainer = "container:">
             </BuildableReference>
          </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "WireAPISupport"
+               BuildableName = "WireAPISupport"
+               BlueprintName = "WireAPISupport"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
@@ -30,14 +44,13 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <TestPlans>
          <TestPlanReference
-            reference = "container:.swiftpm/WireAPI.xctestplan"
+            reference = "container:Tests/TestPlans/AllTests.xctestplan"
             default = "YES">
          </TestPlanReference>
       </TestPlans>
       <Testables>
          <TestableReference
-            skipped = "NO"
-            parallelizable = "YES">
+            skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "WireAPITests"

diff --git a/WireAPI/.swiftpm/xcode/xcshareddata/xcschemes/WireAPISupport.xcscheme b/WireAPI/.swiftpm/xcode/xcshareddata/xcschemes/WireAPISupport.xcscheme
diff --git a/WireAPI/.swiftpm/WireAPI.xctestplan → WireAPI/Tests/TestPlans/AllTests.xctestplan b/WireAPI/.swiftpm/WireAPI.xctestplan → WireAPI/Tests/TestPlans/AllTests.xctestplan
@@ -1,14 +1,16 @@
 {
   "configurations" : [
     {
-      "id" : "CA909C45-1D66-4C47-BBFD-53CA3AB99A82",
-      "name" : "Test Scheme Action",
+      "id" : "FDB58F5E-9DC3-4935-B919-AA295F684D19",
+      "name" : "Configuration 1",
       "options" : {
 
       }
     }
   ],
   "defaultOptions" : {
+    "language" : "en",
+    "region" : "DE",
     "testExecutionOrdering" : "random"
   },
   "testTargets" : [

diff --git a/WireAnalytics/.swiftpm/WireAnalytics.xctestplan b/WireAnalytics/.swiftpm/WireAnalytics.xctestplan
diff --git a/...areddata/xcschemes/WireAnalytics.xcscheme → .../xcschemes/WireAnalytics-Package.xcscheme b/...areddata/xcschemes/WireAnalytics.xcscheme → .../xcschemes/WireAnalytics-Package.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1540"
+   LastUpgradeVersion = "1610"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -21,6 +21,34 @@
                ReferencedContainer = "container:">
             </BuildableReference>
          </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "WireAnalyticsSupport"
+               BuildableName = "WireAnalyticsSupport"
+               BlueprintName = "WireAnalyticsSupport"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "WireDatadog"
+               BuildableName = "WireDatadog"
+               BlueprintName = "WireDatadog"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
@@ -30,10 +58,22 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <TestPlans>
          <TestPlanReference
-            reference = "container:.swiftpm/WireAnalytics.xctestplan"
+            reference = "container:Tests/TestPlans/AllTests.xctestplan"
             default = "YES">
          </TestPlanReference>
       </TestPlans>
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "WireAnalyticsTests"
+               BuildableName = "WireAnalyticsTests"
+               BlueprintName = "WireAnalyticsTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"