chore: convert WireLinkPreview to Swift Package - WPB-10570

.github/workflows/_reusable_app_release.yml

@@ -118,8 +118,7 @@ jobs:
       SLACK_WEBHOOK_URL: ${{ secrets.WIRE_IOS_CI_WEBHOOK }}
       SKIP_SECURITY_TESTS: ${{ inputs.skip_security_tests }}
       SEND_TO_EXTERNALS: ${{ inputs.distribute_externals }}
-
-
+
     steps:
       - name: Add Masks
         run: |
@@ -162,6 +161,8 @@ jobs:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           aws-region: eu-west-1
+      - name: Trim unused localizations from string catalogs
+        run: find . -name "*.xcstrings" | xargs xcrun swift run --package-path ./scripts TrimStringCatalogs
       - name: Trigger build
         run: bundle exec fastlane ${{ inputs.fastlane_action }}
       - name: Archiving Logs

.github/workflows/_reusable_run_tests.yml

@@ -9,7 +9,7 @@ on:
         type: boolean
         default: false
         required: false
-      wire-ui-base:
+      wire-ui-foundation:
         type: boolean
         default: false
         required: false
@@ -77,7 +77,7 @@ on:
         type: boolean
         default: false
         required: false
-      wire-ios-link-preview:
+      wire-link-preview:
         type: boolean
         default: false
         required: false
@@ -93,7 +93,11 @@ on:
         type: boolean
         default: false
         required: false
-      wire-testing:
+      wire-foundation:
+        type: boolean
+        default: false
+        required: false
+      scripts:
         type: boolean
         default: false
         required: false
@@ -167,27 +171,36 @@ jobs:
         run: |
           bundle exec fastlane prepare_for_tests
 
-      # WireSystem
+      # Scripts
 
-      - name: Build WireSystem
-        if: ${{ inputs.wire-system || inputs.all }}
+      - name: Test Scripts
+        if: ${{ inputs.scripts || inputs.all }}
         run: |
-          echo "WireSystem has changes"
-          echo "Building WireSystem..."
-          xcodebuild build-for-testing -workspace wire-ios-mono.xcworkspace -scheme WireSystemPackage -resultBundlePath xcodebuild-wire-system.xcresult -destination 'platform=iOS Simulator,OS=${{ env.IOS_VERSION }},name=${{ env.IPHONE_MODEL }}' | tee xcodebuild-wire-system.log | bundle exec xcpretty
+          echo "Scripts has changes"
+          echo "Testing Scripts..."
+          xcrun swift test --package-path ./scripts
+
+      # WireFoundation
+
+      - name: Build WireFoundation
+        if: ${{ inputs.wire-foundation || inputs.all }}
+        run: |
+          echo "WireFoundation has changes"
+          echo "Building WireFoundation..."
+          xcodebuild build-for-testing -workspace wire-ios-mono.xcworkspace -scheme WireFoundation -resultBundlePath xcodebuild-wire-foundation.xcresult -destination 'platform=iOS Simulator,OS=${{ env.IOS_VERSION }},name=${{ env.IPHONE_MODEL }}' | tee xcodebuild-wire-foundation.log | bundle exec xcpretty
 
       - uses: kronenthaler/[email protected]
-        if: ${{ inputs.wire-system || inputs.all }}
+        if: ${{ inputs.wire-foundation || inputs.all }}
         with:
-          results: xcodebuild-wire-system.xcresult
+          results: xcodebuild-wire-foundation.xcresult
           warningAnnotations: true
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Test WireSystem
-        if: ${{ inputs.wire-system || inputs.all }}
+      - name: Test WireFoundation
+        if: ${{ inputs.wire-foundation || inputs.all }}
         run: |
-          echo "Testing WireSystem..."
-          xcodebuild test -workspace wire-ios-mono.xcworkspace -scheme WireSystemPackage -destination 'platform=iOS Simulator,OS=${{ env.IOS_VERSION }},name=${{ env.IPHONE_MODEL }}' | tee -a xcodebuild-wire-system.log | bundle exec xcpretty --report junit --output build/reports/WireSystem.junit
+          echo "Testing WireFoundation..."
+          xcodebuild test -workspace wire-ios-mono.xcworkspace -scheme WireFoundation -destination 'platform=iOS Simulator,OS=${{ env.IOS_VERSION }},name=${{ env.IPHONE_MODEL }}' | tee -a xcodebuild-wire-foundation.log | bundle exec xcpretty --report junit --output build/reports/WireFoundation.junit
           exit ${PIPESTATUS[0]}
 
       # WireSystem Project
@@ -213,29 +226,6 @@ jobs:
           xcodebuild test -retry-tests-on-failure -workspace wire-ios-mono.xcworkspace -scheme WireSystem -destination 'platform=iOS Simulator,OS=${{ env.IOS_VERSION }},name=${{ env.IPHONE_MODEL }}' | tee -a xcodebuild-wire-ios-system.log | bundle exec xcpretty --report junit --output build/reports/WireSystemProject.junit
           exit ${PIPESTATUS[0]}
 
-      # WireTesting
-
-      - name: Build WireTesting
-        if: ${{ inputs.wire-testing || inputs.all }}
-        run: |
-          echo "WireTesting has changes"
-          echo "Building WireTesting..."
-          xcodebuild build-for-testing -workspace wire-ios-mono.xcworkspace -scheme WireTestingPackage -resultBundlePath xcodebuild-wire-testing.xcresult -destination 'platform=iOS Simulator,OS=${{ env.IOS_VERSION }},name=${{ env.IPHONE_MODEL }}' | tee xcodebuild-wire-testing.log | bundle exec xcpretty
-
-      - uses: kronenthaler/[email protected]
-        if: ${{ inputs.wire-testing || inputs.all }}
-        with:
-          results: xcodebuild-wire-testing.xcresult
-          warningAnnotations: true
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Test WireTesting
-        if: ${{ inputs.wire-testing || inputs.all }}
-        run: |
-          echo "Testing WireTesting..."
-          xcodebuild test -workspace wire-ios-mono.xcworkspace -scheme WireTestingPackage -destination 'platform=iOS Simulator,OS=${{ env.IOS_VERSION }},name=${{ env.IPHONE_MODEL }}' | tee -a xcodebuild-wire-testing.log | bundle exec xcpretty --report junit --output build/reports/WireTesting.junit
-          exit ${PIPESTATUS[0]}
-
       # WireTesting Project
 
       - name: Build WireTesting Project
@@ -259,29 +249,6 @@ jobs:
           xcodebuild test -retry-tests-on-failure -workspace wire-ios-mono.xcworkspace -scheme WireTesting -destination 'platform=iOS Simulator,OS=${{ env.IOS_VERSION }},name=${{ env.IPHONE_MODEL }}' | tee -a xcodebuild-wire-ios-testing.log | bundle exec xcpretty --report junit --output build/reports/WireTestingProject.junit
           exit ${PIPESTATUS[0]}
 
-      # WireUtilities
-
-      - name: Build WireUtilities
-        if: ${{ inputs.wire-utilities || inputs.all }}
-        run: |
-          echo "WireUtilities has changes"
-          echo "Building WireUtilities..."
-          xcodebuild build-for-testing -workspace wire-ios-mono.xcworkspace -scheme WireUtilitiesPackage -resultBundlePath xcodebuild-wire-utilities.xcresult -destination 'platform=iOS Simulator,OS=${{ env.IOS_VERSION }},name=${{ env.IPHONE_MODEL }}' | tee xcodebuild-wire-utilities.log | bundle exec xcpretty
-
-      - uses: kronenthaler/[email protected]
-        if: ${{ inputs.wire-utilities || inputs.all }}
-        with:
-          results: xcodebuild-wire-utilities.xcresult
-          warningAnnotations: true
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Test WireUtilities
-        if: ${{ inputs.wire-utilities || inputs.all }}
-        run: |
-          echo "Testing WireUtilities..."
-          xcodebuild test -workspace wire-ios-mono.xcworkspace -scheme WireUtilitiesPackage -destination 'platform=iOS Simulator,OS=${{ env.IOS_VERSION }},name=${{ env.IPHONE_MODEL }}' | tee -a xcodebuild-wire-utilities.log | bundle exec xcpretty --report junit --output build/reports/WireUtilities.junit
-          exit ${PIPESTATUS[0]}
-
       # WireUtilities Project
 
       - name: Build WireUtilities Project
@@ -354,24 +321,24 @@ jobs:
       # WireLinkPreview
 
       - name: Build WireLinkPreview
-        if: ${{ inputs.wire-ios-link-preview || inputs.all }}
+        if: ${{ inputs.wire-link-preview || inputs.all }}
         run: |
           echo "WireLinkPreview has changes"
           echo "Building WireLinkPreview..."
-          xcodebuild build-for-testing -workspace wire-ios-mono.xcworkspace -scheme WireLinkPreview -resultBundlePath xcodebuild-wire-ios-link-preview.xcresult -destination 'platform=iOS Simulator,OS=${{ env.IOS_VERSION }},name=${{ env.IPHONE_MODEL }}' | tee xcodebuild-wire-ios-link-preview.log | bundle exec xcpretty
+          xcodebuild build-for-testing -workspace wire-ios-mono.xcworkspace -scheme WireLinkPreview -resultBundlePath xcodebuild-wire-link-preview.xcresult -destination 'platform=iOS Simulator,OS=${{ env.IOS_VERSION }},name=${{ env.IPHONE_MODEL }}' | tee xcodebuild-wire-link-preview.log | bundle exec xcpretty
 
       - uses: kronenthaler/[email protected]
-        if: ${{ inputs.wire-ios-link-preview || inputs.all }}
+        if: ${{ inputs.wire-link-preview || inputs.all }}
         with:
-          results: xcodebuild-wire-ios-link-preview.xcresult
+          results: xcodebuild-wire-link-preview.xcresult
           warningAnnotations: true
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Test WireLinkPreview
-        if: ${{ inputs.wire-ios-link-preview || inputs.all }}
+        if: ${{ inputs.wire-link-preview || inputs.all }}
         run: |
           echo "Testing WireLinkPreview..."
-          xcodebuild test -retry-tests-on-failure -workspace wire-ios-mono.xcworkspace -scheme WireLinkPreview -destination 'platform=iOS Simulator,OS=${{ env.IOS_VERSION }},name=${{ env.IPHONE_MODEL }}' | tee -a xcodebuild-wire-ios-link-preview.log | bundle exec xcpretty --report junit --output build/reports/WireLinkPreview.junit
+          xcodebuild test -workspace wire-ios-mono.xcworkspace -scheme WireLinkPreview -destination 'platform=iOS Simulator,OS=${{ env.IOS_VERSION }},name=${{ env.IPHONE_MODEL }}' | tee -a xcodebuild-wire-link-preview.log | bundle exec xcpretty --report junit --output build/reports/WireLinkPreview.junit
           exit ${PIPESTATUS[0]}
 
       # WireImages
@@ -626,27 +593,27 @@ jobs:
           xcodebuild test -workspace wire-ios-mono.xcworkspace -scheme WireDesign -destination 'platform=iOS Simulator,OS=${{ env.IOS_VERSION }},name=${{ env.IPHONE_MODEL }}' | tee -a xcodebuild-wire-design.log | bundle exec xcpretty --report junit --output build/reports/WireDesign.junit
           exit ${PIPESTATUS[0]}
 
-      # WireUIBase
+      # WireUIFoundation
 
-      - name: Test WireUIBase
-        if: ${{ inputs.wire-ui-base || inputs.all }}
+      - name: Test WireUIFoundation
+        if: ${{ inputs.wire-ui-foundation || inputs.all }}
         run: |
-          echo "WireUIBase has changes"
-          echo "Building WireUIBase..."
-          xcodebuild build-for-testing -workspace wire-ios-mono.xcworkspace -scheme WireUIBase -resultBundlePath xcodebuild-wire-ui-base.xcresult -destination 'platform=iOS Simulator,OS=${{ env.IOS_VERSION }},name=${{ env.IPHONE_MODEL }}' | tee xcodebuild-wire-ui-base.log | bundle exec xcpretty
+          echo "WireUIFoundation has changes"
+          echo "Building WireUIFoundation..."
+          xcodebuild build-for-testing -workspace wire-ios-mono.xcworkspace -scheme WireUIFoundation -resultBundlePath xcodebuild-wire-ui-foundation.xcresult -destination 'platform=iOS Simulator,OS=${{ env.IOS_VERSION }},name=${{ env.IPHONE_MODEL }}' | tee xcodebuild-wire-ui-foundation.log | bundle exec xcpretty
 
       - uses: kronenthaler/[email protected]
-        if: ${{ inputs.wire-ui-base || inputs.all }}
+        if: ${{ inputs.wire-ui-foundation || inputs.all }}
         with:
-          results: xcodebuild-wire-ui-base.xcresult
+          results: xcodebuild-wire-ui-foundation.xcresult
           warningAnnotations: true
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Test WireUIBase
-        if: ${{ inputs.wire-ui-base || inputs.all }}
+      - name: Test WireUIFoundation
+        if: ${{ inputs.wire-ui-foundation || inputs.all }}
         run: |
-          echo "Testing WireUIBase..."
-          xcodebuild test -workspace wire-ios-mono.xcworkspace -scheme WireUIBase -destination 'platform=iOS Simulator,OS=${{ env.IOS_VERSION }},name=${{ env.IPHONE_MODEL }}' | tee -a xcodebuild-wire-ui-base.log | bundle exec xcpretty --report junit --output build/reports/WireUIBase.junit
+          echo "Testing WireUIFoundation..."
+          xcodebuild test -workspace wire-ios-mono.xcworkspace -scheme WireUIFoundation -destination 'platform=iOS Simulator,OS=${{ env.IOS_VERSION }},name=${{ env.IPHONE_MODEL }}' | tee -a xcodebuild-wire-ui-foundation.log | bundle exec xcpretty --report junit --output build/reports/WireUIFoundation.junit
           exit ${PIPESTATUS[0]}
 
       # WireReusableUIComponents

.github/workflows/swiftformat.yml

@@ -26,9 +26,9 @@ jobs:
           ./WireAPI
           ./WireAnalytics
           ./WireDomain
-          ./WireSystem
-          ./WireTesting
+          ./WireFoundation
+          ./WireLinkPreview
           ./WireUI
-          ./WireUtilities
+          ./scripts
           --reporter github-actions-log
           --config .swiftformat

.github/workflows/test_pr_changes.yml

@@ -21,12 +21,11 @@ jobs:
     outputs:
       wire-ios: ${{ steps.filter.outputs.wire-ios == 'true' || steps.filter.outputs.carthage == 'true' }}
       wire-reusable-ui-components: ${{ steps.filter.outputs.wire-reusable-ui-components }}
-      wire-ui-base: ${{ steps.filter.outputs.wire-ui-base }}
+      wire-ui-foundation: ${{ steps.filter.outputs.wire-ui-foundation }}
       wire-design: ${{ steps.filter.outputs.wire-design }}
       wire-ios-sync-engine: ${{ steps.filter.outputs.wire-ios-sync-engine }}
       wire-ios-data-model: ${{ steps.filter.outputs.wire-ios-data-model }}
       wire-ios-system: ${{ steps.filter.outputs.wire-ios-system }}
-      wire-system: ${{ steps.filter.outputs.wire-system }}
       wire-ios-request-strategy: ${{ steps.filter.outputs.wire-ios-request-strategy }}
       wire-api: ${{ steps.filter.outputs.wire-api }}
       wire-domain-project: ${{ steps.filter.outputs.wire-domain-project }}
@@ -38,11 +37,11 @@ jobs:
       wire-ios-notification-engine: ${{ steps.filter.outputs.wire-ios-notification-engine }}
       wire-ios-protos: ${{ steps.filter.outputs.wire-ios-protos }}
       wire-ios-images: ${{ steps.filter.outputs.wire-ios-images }}
-      wire-ios-link-preview : ${{ steps.filter.outputs.wire-ios-link-preview }}
+      wire-link-preview : ${{ steps.filter.outputs.wire-link-preview }}
       wire-ios-utilities: ${{ steps.filter.outputs.wire-ios-utilities }}
-      wire-utilitiess: ${{ steps.filter.outputs.wire-utilitiess }}
       wire-ios-testing: ${{ steps.filter.outputs.wire-ios-testing }}
-      wire-testing: ${{ steps.filter.outputs.wire-testing }}
+      wire-foundation: ${{ steps.filter.outputs.wire-foundation }}
+      scripts: ${{ steps.filter.outputs.scripts }}
 
     steps:
       - uses: actions/checkout@v4
@@ -55,9 +54,9 @@ jobs:
             wire-reusable-ui-components:
               - 'WireUI/Sources/WireReusableUIComponents/**'
               - 'WireUI/Tests/WireReusableUIComponentsTests/**'
-            wire-ui-base:
-              - 'WireUI/Sources/WireUIBase/**'
-              - 'WireUI/Tests/WireUIBaseTests/**'
+            wire-ui-foundation:
+              - 'WireUI/Sources/WireUIFoundation/**'
+              - 'WireUI/Tests/WireUIFoundationTests/**'
             wire-design:
               - 'WireUI/Sources/WireDesign/**'
               - 'WireUI/Tests/WireDesignTests/**'
@@ -91,20 +90,18 @@ jobs:
               -  'wire-ios-protos/**'
             wire-ios-images:
               - 'wire-ios-images/**'
-            wire-ios-link-preview:
-              - 'wire-ios-link-preview/**'
+            wire-link-preview:
+              - 'WireLinkPreview/**'
             wire-ios-utilities:
               - 'wire-ios-utilities/**'
-            wire-utilities:
-              - 'WireUtilities/**'
             wire-ios-testing:
               - 'wire-ios-testing/**'
-            wire-testing:
-              - 'WireTesting/**'
+            wire-foundation:
+              - 'WireFoundation/**'
             wire-ios-system:
               - 'wire-ios-system/**'
-            wire-system:
-              - 'WireSystem/**'
+            scripts:
+              - 'scripts/**'
             carthage:
               - 'Cartfile.resolved'
 
@@ -114,12 +111,11 @@ jobs:
     with:
       wire-ios: ${{ needs.detect-changes.outputs.wire-ios == 'true' }}
       wire-reusable-ui-components: ${{ needs.detect-changes.outputs.wire-reusable-ui-components == 'true' }}
-      wire-ui-base: ${{ needs.detect-changes.outputs.wire-ui-base == 'true' }}
+      wire-ui-foundation: ${{ needs.detect-changes.outputs.wire-ui-foundation == 'true' }}
       wire-design: ${{ needs.detect-changes.outputs.wire-design == 'true' }}
       wire-ios-sync-engine: ${{ needs.detect-changes.outputs.wire-ios-sync-engine == 'true' }}
       wire-ios-data-model: ${{ needs.detect-changes.outputs.wire-ios-data-model == 'true' }}
       wire-ios-system: ${{ needs.detect-changes.outputs.wire-ios-system == 'true' }}
-      wire-system: ${{ needs.detect-changes.outputs.wire-system == 'true' }}
       wire-ios-request-strategy: ${{ needs.detect-changes.outputs.wire-ios-request-strategy == 'true' }}
       wire-api: ${{ needs.detect-changes.outputs.wire-api == 'true' }}
       wire-domain-project: ${{ needs.detect-changes.outputs.wire-domain-project == 'true' }}
@@ -131,9 +127,9 @@ jobs:
       wire-ios-notification-engine: ${{ needs.detect-changes.outputs.wire-ios-notification-engine == 'true' }}
       wire-ios-protos: ${{ needs.detect-changes.outputs.wire-ios-protos == 'true' }}
       wire-ios-images: ${{ needs.detect-changes.outputs.wire-ios-images == 'true' }}
-      wire-ios-link-preview: ${{ needs.detect-changes.outputs.wire-ios-link-preview == 'true' }}
+      wire-link-preview: ${{ needs.detect-changes.outputs.wire-link-preview == 'true' }}
       wire-ios-utilities: ${{ needs.detect-changes.outputs.wire-ios-utilities == 'true' }}
-      wire-utilities: ${{ needs.detect-changes.outputs.wire-utilities == 'true' }}
       wire-ios-testing: ${{ needs.detect-changes.outputs.wire-ios-testing == 'true' }}
-      wire-testing: ${{ needs.detect-changes.outputs.wire-testing == 'true' }}
+      wire-foundation: ${{ needs.detect-changes.outputs.wire-foundation == 'true' }}
+      scripts: ${{ needs.detect-changes.outputs.scripts == 'true' }}
     secrets: inherit

SourceryPlugin/.swiftpm/xcode/package.xcworkspace/xcshareddata/IDETemplateMacros.plist

@@ -1 +1 @@
-../../../../wire-ios-mono.xcworkspace/xcshareddata/IDETemplateMacros.plist
+../../../../../wire-ios-mono.xcworkspace/xcshareddata/IDETemplateMacros.plist