Merge pull request #1 from oversizedev/develop

Update CI and delete CloudKit services

.github/workflows/ci.yml

@@ -1,31 +1,51 @@
-name: CI - Push
+name: CI
 
 on:
   push:
-    branches: ["main"]
+    branches:
+      - '**'
   workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
 
   build-swiftpm:
-    name: Build packages
+    name: Build SwiftPM
     uses: oversizedev/GithubWorkflows/.github/workflows/build-swiftpm.yml@main
     strategy:
       matrix:
-        packages: [OversizeServices, OversizeHealthService, OversizeCloudKitService, OversizeStoreService, OversizeLocationService, OversizeCalendarService, OversizeContactsService, OversizeNotificationService, OversizeFileManagerService]
+        packages:
+          - OversizeServices
+          - OversizeStoreService
+          - OversizeLocationService
+          - OversizeCalendarService
+          - OversizeContactsService
+          - OversizeNotificationService
+          - OversizeFileManagerService
+        destination:
+          - platform=iOS Simulator,name=iPhone 16,OS=18.1
+          - platform=watchOS Simulator,name=Apple Watch SE (40mm) (2nd generation),OS=11.1
+          - platform=tvOS Simulator,name=Apple TV 4K (3rd generation) (at 1080p),OS=18.1
+          - platform=macOS,arch=arm64
+
     with:
       package: ${{ matrix.packages }}
+      destination: ${{ matrix.destination }}
     secrets: inherit
 
-  # tests:
-  #   name: Test
-  #   needs: build-swiftpm
-  #   uses: oversizedev/GithubWorkflows/.github/workflows/test.yml@main
-  #   secrets: inherit
+#  tests:
+#    name: Test
+#    needs: build-swiftpm
+#    uses: oversizedev/GithubWorkflows/.github/workflows/test.yml@main
+#    secrets: inherit
 
   bump:
     name: Bump version
     needs: build-swiftpm
+    if: github.ref == 'refs/heads/main'
     uses: oversizedev/GithubWorkflows/.github/workflows/bump.yml@main
     secrets: inherit
 

Package.swift

@@ -18,10 +18,10 @@ let developmentDependencies: [PackageDescription.Package.Dependency] = [
     .package(url: "https://github.com/hmlongco/Factory.git", .upToNextMajor(from: "2.1.3")),
 ]
 
-var dependencies: [PackageDescription.Package.Dependency] = developmentDependencies
+var dependencies: [PackageDescription.Package.Dependency] = remoteDependencies
 
-if ProcessInfo.processInfo.environment["BUILD_MODE"] == "PRODUCTION" {
-    dependencies = remoteDependencies
+if ProcessInfo.processInfo.environment["BUILD_MODE"] == "DEV" {
+    dependencies = developmentDependencies
 }
 
 let package = Package(
@@ -35,7 +35,6 @@ let package = Package(
     ],
     products: [
         .library(name: "OversizeHealthService", targets: ["OversizeHealthService"]),
-        .library(name: "OversizeCloudKitService", targets: ["OversizeCloudKitService"]),
         .library(name: "OversizeServices", targets: ["OversizeServices"]),
         .library(name: "OversizeStoreService", targets: ["OversizeStoreService"]),
         .library(name: "OversizeLocationService", targets: ["OversizeLocationService"]),
@@ -44,7 +43,7 @@ let package = Package(
         .library(name: "OversizeNotificationService", targets: ["OversizeNotificationService"]),
         .library(name: "OversizeFileManagerService", targets: ["OversizeFileManagerService"]),
     ],
-    dependencies: dependencies,
+    dependencies: remoteDependencies,
     targets: [
         .target(
             name: "OversizeServices",
@@ -94,14 +93,6 @@ let package = Package(
                 .product(name: "Factory", package: "Factory"),
             ]
         ),
-        .target(
-            name: "OversizeCloudKitService",
-            dependencies: [
-                .product(name: "OversizeCore", package: "OversizeCore"),
-                .product(name: "OversizeModels", package: "OversizeModels"),
-                .product(name: "Factory", package: "Factory"),
-            ]
-        ),
         .target(
             name: "OversizeStoreService",
             dependencies: [