Merge pull request #22 from adevinta/develop

Removed brands from project and split SparkCore and Spark in two

.github/workflows/build-and-test.yml

@@ -3,32 +3,18 @@ on:
   pull_request:
     types: [ opened, edited, synchronize ]
 jobs:
-  build_Leboncoin:
+  core_build:
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v3
       - uses: xavierLowmiller/[email protected]
         with:
           spec: project.yml
           version: '2.33.0'
-      - name: run install swiftgen
-        run: brew install swiftgen
-      - name: run fastlane build_framework TARGET_NAME:LeboncoinSpark
-        run: fastlane build_framework TARGET_NAME:LeboncoinSpark
-  build_Kleinanzeigen:
-    runs-on: macos-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: xavierLowmiller/[email protected]
-        with:
-          spec: project.yml
-          version: '2.33.0'
-      - name: run install swiftgen
-        run: brew install swiftgen
-      - name: run fastlane build_framework TARGET_NAME:LeboncoinSpark
-        run: fastlane build_framework TARGET_NAME:LeboncoinSpark
-  unit_tests_Leboncoin:
-    needs: [ build_Kleinanzeigen, build_Leboncoin ]
+      - name: run fastlane build_framework TARGET_NAME:SparkCore
+        run: fastlane build_framework TARGET_NAME:SparkCore
+  core_unit_tests:
+    needs: [ core_build ]
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v3
@@ -40,36 +26,42 @@ jobs:
         with:
           spec: project.yml
           version: '2.33.0'
-      - name: run install swiftgen
-        run: brew install swiftgen
-      - name: run fastlane lane unit_tests
-        run: fastlane unit_tests TARGET_NAME:LeboncoinSpark
+      - name: fastlane unit_tests TARGET_NAME:SparkCore
+        run: fastlane unit_tests TARGET_NAME:SparkCore
       - name: Tar files
-        run: tar -cvf xcresult.tar out/Spark.xcresult
+        run: tar -cvf xcresult.tar out/SparkCore.xcresult
         continue-on-error: true
       - name: Archive xcresult
         uses: actions/upload-artifact@v3
         with:
           name: xcresult
           path: xcresult.tar
           retention-days: 15
-  unit_tests_Kleinanzeigen:
-    needs: [ build_Kleinanzeigen, build_Leboncoin ]
+
+  build:
+    needs: [ core_build ]
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/checkout@v3
-        with:
-          repository: adevinta/spark-ios-snapshots
-          path: spark-ios-snapshots
       - uses: xavierLowmiller/[email protected]
         with:
           spec: project.yml
           version: '2.33.0'
       - name: run install swiftgen
         run: brew install swiftgen
-      - name: run fastlane lane unit_tests
-        run: fastlane unit_tests TARGET_NAME:KleinanzeigenSpark
+      - name: run fastlane build_framework TARGET_NAME:Spark
+        run: fastlane build_framework TARGET_NAME:Spark
+  unit_tests:
+    needs: [ build ]
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: xavierLowmiller/[email protected]
+        with:
+          spec: project.yml
+          version: '2.33.0'
+      - name: run fastlane lane unit_tests TARGET_NAME:Spark
+        run: fastlane unit_tests TARGET_NAME:Spark
       - name: Tar files
         run: tar -cvf xcresult.tar out/Spark.xcresult
         continue-on-error: true

Spark.yml

@@ -0,0 +1,82 @@
+name: Spark
+include:
+  - SparkShared.yml
+
+targetTemplates:
+  SparkTemplate:
+    platform: iOS
+    type: framework
+    settings:
+      base:
+        PRODUCT_BUNDLE_IDENTIFIER: "com.adevinta.spark"
+        BUILD_LIBRARY_FOR_DISTRIBUTION: YES
+        SUPPORTED_PLATFORMS: "iphoneos iphonesimulator"
+        SUPPORTS_MACCATALYST: NO
+        SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD: NO
+        PRODUCT_NAME: Spark
+    info:
+      path: spark/Sources/Info.plist
+    sources:
+      - path: spark/Sources
+        excludes:
+        - "**/*Tests.swift"
+    scheme:
+      testTargets:
+        - name: SparkTests
+      gatherCoverageData: true
+
+  SparkTestsTemplate:
+    type: bundle.unit-test
+    platform: iOS
+    settings:
+      base:
+        PRODUCT_BUNDLE_IDENTIFIER: "com.adevinta.spark.tests"
+        SUPPORTED_PLATFORMS: "iphoneos iphonesimulator"
+        SUPPORTS_MACCATALYST: NO
+        SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD: NO
+    info:
+      path: spark/Unit-tests/Info.plist
+    sources:
+      - path: spark/Unit-tests
+      - path: spark/Sources
+        includes: # includes some files from theme folder
+        - "**/*Tests.swift"
+
+    dependencies:
+      - target: Spark
+
+  SparkDemoTemplate:
+    type: application
+    platform: iOS
+    settings:
+      base:
+        PRODUCT_BUNDLE_IDENTIFIER: "com.adevinta.spark.demo"
+        SUPPORTED_PLATFORMS: "iphoneos iphonesimulator"
+        SUPPORTS_MACCATALYST: NO
+        SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD: NO
+    info:
+      path: spark/Demo/Info.plist
+      properties:
+        UIApplicationSceneManifest:
+          UIApplicationSupportsMultipleScenes: false
+          UISceneConfigurations: {}
+    sources:
+      - path: spark/Demo
+    dependencies:
+      - target: Spark
+
+targets:
+  Spark:
+    templates:
+      - SparkTemplate
+    preBuildScripts:
+      - path: scripts/swiftgen.sh
+        name: SwiftGen
+
+  SparkTests:
+    templates:
+      - SparkTestsTemplate
+
+  SparkDemo:
+    templates:
+      - SparkDemoTemplate

SparkCore.yml

@@ -0,0 +1,88 @@
+name: Spark
+include:
+  - SparkShared.yml
+
+packages:
+  SnapshotTesting:
+    url: https://github.com/pointfreeco/swift-snapshot-testing
+    from: 1.11.0
+targetTemplates:
+  SparkCoreTemplate:
+    platform: iOS
+    type: framework
+    settings:
+      base:
+        PRODUCT_BUNDLE_IDENTIFIER: "com.adevinta.spark.core"
+        BUILD_LIBRARY_FOR_DISTRIBUTION: YES
+        SUPPORTED_PLATFORMS: "iphoneos iphonesimulator"
+        SUPPORTS_MACCATALYST: NO
+        SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD: NO
+        PRODUCT_NAME: SparkCore
+    info:
+      path: core/Sources/Info.plist
+    sources:
+      - path: core/Sources
+        excludes:
+        - "**/*Tests.swift"
+    scheme:
+      environmentVariables:
+        - variable: SNAPSHOT_REFERENCE_DIR
+          value: "$(SRCROOT)/spark-ios-snapshots"
+          isEnabled: true
+      testTargets:
+        - name: SparkCoreTests
+      gatherCoverageData: true
+
+  SparkCoreTestsTemplate:
+    type: bundle.unit-test
+    platform: iOS
+    settings:
+      base:
+        PRODUCT_BUNDLE_IDENTIFIER: "com.adevinta.spark.core.tests"
+        SUPPORTED_PLATFORMS: "iphoneos iphonesimulator"
+        SUPPORTS_MACCATALYST: NO
+        SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD: NO
+    info:
+      path: core/Unit-tests/Info.plist
+    sources:
+      - path: core/Unit-tests
+      - path: core/Sources
+        includes: # includes some files from theme folder
+        - "**/*Tests.swift"
+
+    dependencies:
+      - target: SparkCore
+      - package: SnapshotTesting
+
+  SparkCoreDemoTemplate:
+    type: application
+    platform: iOS
+    settings:
+      base:
+        PRODUCT_BUNDLE_IDENTIFIER: "com.adevinta.spark.core.demo"
+        SUPPORTED_PLATFORMS: "iphoneos iphonesimulator"
+        SUPPORTS_MACCATALYST: NO
+        SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD: NO
+    info:
+      path: core/Demo/Info.plist
+      properties:
+        UIApplicationSceneManifest:
+          UIApplicationSupportsMultipleScenes: false
+          UISceneConfigurations: {}
+    sources:
+      - path: core/Demo
+    dependencies:
+      - target: SparkCore
+
+targets:
+  SparkCore:
+    templates:
+      - SparkCoreTemplate
+
+  SparkCoreTests:
+    templates:
+      - SparkCoreTestsTemplate
+
+  SparkCoreDemo:
+    templates:
+      - SparkCoreDemoTemplate