Custom Package.swift for Apple

Author: abnegate

.github/workflows/tests.yml

@@ -13,7 +13,7 @@ jobs:
       fail-fast: false
       matrix:
         php-version: ['8.2']
-        sdk: [Android5Java17, Android14Java17, CLINode16, CLINode18, DartBeta, DartStable, Deno1193, Deno1303, DotNet60, DotNet70, FlutterStable, FlutterBeta, Go112, Go118, KotlinJava8, KotlinJava11, KotlinJava17, Node16, Node18, Node20, PHP74, PHP80, Python38, Python39, Python310, Ruby27, Ruby30, Ruby31, AppleSwift55, Swift55, WebChromium, WebNode]
+        sdk: [Android5Java17, Android14Java17, CLINode16, CLINode18, DartBeta, DartStable, Deno1193, Deno1303, DotNet60, DotNet70, FlutterStable, FlutterBeta, Go112, Go118, KotlinJava8, KotlinJava11, KotlinJava17, Node16, Node18, Node20, PHP74, PHP80, Python38, Python39, Python310, Ruby27, Ruby30, Ruby31, AppleSwift56, Swift56, WebChromium, WebNode]
 
     steps:
       - name: Checkout repository

src/SDK/Language/Apple.php

@@ -33,7 +33,7 @@ public function getFiles(): array
             [
                 'scope'         => 'default',
                 'destination'   => 'Package.swift',
-                'template'      => 'swift/Package.swift.twig',
+                'template'      => 'apple/Package.swift.twig',
             ],
             [
                 'scope'         => 'method',

templates/apple/Package.swift.twig

@@ -0,0 +1,69 @@
+// swift-tools-version:5.1
+
+import PackageDescription
+
+let package = Package(
+    name: "{{spec.title | caseUcfirst}}",
+    platforms: [
+        .iOS("15.0"),
+        .macOS("11.0"),
+        .watchOS("7.0"),
+        .tvOS("13.0"),
+    ],
+    products: [
+        .library(
+            name: "{{spec.title | caseUcfirst}}",
+            targets: [
+                "{{spec.title | caseUcfirst}}",
+                "{{spec.title | caseUcfirst}}Enums",
+                "{{spec.title | caseUcfirst}}Models",
+                "JSONCodable"
+            ]
+        ),
+    ],
+    dependencies: [
+        .package(url: "https://github.com/swift-server/async-http-client.git", from: "1.9.0"),
+        .package(url: "https://github.com/apple/swift-nio.git", from: "2.32.0"),
+        .package(url: "https://github.com/firebase/firebase-ios-sdk.git", from: "10.4.0")
+    ],
+    targets: [
+        .target(
+            name: "{{spec.title | caseUcfirst}}",
+            dependencies: [
+                .product(name: "AsyncHTTPClient", package: "async-http-client"),
+                .product(name: "NIOWebSocket", package: "swift-nio"),
+                .product(name: "FirebaseMessaging", package: "firebase-ios-sdk"),
+                {%~ if spec.definitions is not empty %}
+                "{{spec.title | caseUcfirst}}Models",
+                {%~ endif %}
+                {%~ if spec.enums is not empty %}
+                "{{spec.title | caseUcfirst}}Enums",
+                {%~ endif %}
+                "JSONCodable"
+            ]
+        ),
+        {%~ if spec.definitions is not empty %}
+        .target(
+            name: "{{spec.title | caseUcfirst}}Models",
+            dependencies: [
+                "JSONCodable"
+            ]
+        ),
+        {%~ endif %}
+        {%~ if spec.enums is not empty %}
+        .target(
+            name: "{{spec.title | caseUcfirst}}Enums"
+        ),
+        {%~ endif %}
+        .target(
+            name: "JSONCodable"
+        ),
+        .testTarget(
+            name: "{{spec.title | caseUcfirst}}Tests",
+            dependencies: [
+                "{{ spec.title | caseUcfirst }}"
+            ]
+        )
+    ],
+    swiftLanguageVersions: [.v5]
+)

templates/swift/Package.swift.twig

@@ -24,15 +24,13 @@ let package = Package(
     dependencies: [
         .package(url: "https://github.com/swift-server/async-http-client.git", from: "1.9.0"),
         .package(url: "https://github.com/apple/swift-nio.git", from: "2.32.0"),
-        .package(url: "https://github.com/firebase/firebase-ios-sdk.git", from: "10.4.0")
     ],
     targets: [
         .target(
             name: "{{spec.title | caseUcfirst}}",
             dependencies: [
                 .product(name: "AsyncHTTPClient", package: "async-http-client"),
                 .product(name: "NIOWebSocket", package: "swift-nio"),
-                .product(name: "FirebaseMessaging", package: "firebase-ios-sdk"),
                 {%~ if spec.definitions is not empty %}
                 "{{spec.title | caseUcfirst}}Models",
                 {%~ endif %}

tests/AppleSwift55Test.php renamed to tests/AppleSwift56Test.php

@@ -2,7 +2,7 @@
 
 namespace Tests;
 
-class AppleSwift55Test extends Base
+class AppleSwift56Test extends Base
 {
     protected string $sdkName = 'swift';
     protected string $sdkPlatform = 'client';

tests/Swift55Test.php renamed to tests/Swift56Test.php

@@ -2,7 +2,7 @@
 
 namespace Tests;
 
-class Swift55Test extends Base
+class Swift56Test extends Base
 {
     protected string $sdkName = 'swift';
     protected string $sdkPlatform = 'server';
@@ -16,7 +16,7 @@ class Swift55Test extends Base
         'cp tests/languages/swift/Tests.swift tests/sdks/swift/Tests/AppwriteTests/Tests.swift',
     ];
     protected string $command =
-        'docker run --network="mockapi" --rm -v $(pwd):/app -w /app/tests/sdks/swift swiftarm/swift:5.5.2-focal-multi-arch swift test';
+        'docker run --network="mockapi" --rm -v $(pwd):/app -w /app/tests/sdks/swift swift:5.6 swift test';
 
     protected array $expectedOutput = [
         ...Base::FOO_RESPONSES,