Merge pull request #18 from Recouse/ci-improvements

CI improvements

.github/workflows/ci.yml

@@ -0,0 +1,38 @@
+name: CI
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  macos-14:
+    name: Build macOS 14 (Swift 5.10)
+    runs-on: macos-14
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+    - name: Build
+      run: swift build -v
+  macos-15:
+    name: Build macOS 15 (Swift 6.0)
+    runs-on: macos-15
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+    - name: Build
+      run: swift build -v
+    - name: Run tests
+      run: swift test -v
+  ubuntu:
+    name: Build Linux
+    runs-on: ubuntu-latest
+    container:
+      image: swift:latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Build
+      run: swift build -v
+    - name: Run tests
+      run: swift test -v

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version: 5.7
+// swift-tools-version: 5.10
 
 import PackageDescription
 
@@ -9,6 +9,7 @@ let package = Package(
         .iOS(.v13),
         .tvOS(.v13),
         .watchOS(.v6),
+        .visionOS(.v1)
     ],
     products: [
         .library(

Package@swift-5.9.swift → Package@swift-6.0.swift

@@ -1,4 +1,4 @@
-// swift-tools-version: 5.9
+// swift-tools-version: 6.0
 
 import PackageDescription
 
@@ -18,8 +18,7 @@ let package = Package(
     ],
     targets: [
         .target(
-            name: "EventSource",
-            swiftSettings: [.enableExperimentalFeature("StrictConcurrency")]),
+            name: "EventSource"),
         .testTarget(
             name: "EventSourceTests",
             dependencies: ["EventSource"]),

README.md

@@ -1,7 +1,6 @@
 # EventSource
 
-[![Build macOS](https://github.com/Recouse/EventSource/actions/workflows/macos.yml/badge.svg)](https://github.com/Recouse/EventSource/actions/workflows/macos.yml)
-[![Build Linux](https://github.com/Recouse/EventSource/actions/workflows/linux.yml/badge.svg)](https://github.com/Recouse/EventSource/actions/workflows/linux.yml)
+[![CI](https://github.com/Recouse/EventSource/actions/workflows/ci.yml/badge.svg)](https://github.com/Recouse/EventSource/actions/workflows/ci.yml)
 [![](https://img.shields.io/endpoint?url=https%3A%2F%2Fswiftpackageindex.com%2Fapi%2Fpackages%2FRecouse%2FEventSource%2Fbadge%3Ftype%3Dplatforms)](https://swiftpackageindex.com/Recouse/EventSource)
 [![](https://img.shields.io/endpoint?url=https%3A%2F%2Fswiftpackageindex.com%2Fapi%2Fpackages%2FRecouse%2FEventSource%2Fbadge%3Ftype%3Dswift-versions)](https://swiftpackageindex.com/Recouse/EventSource)
 
@@ -104,7 +103,7 @@ var response: String = ""
 for await event in await dataTask.events() {
     switch event {
     case .event(let event):
-        if let eventData = event.data, let data = eventData.data(using: .utf8) {
+        if let data = eventDevent.data?ata.data(using: .utf8) {
             let chunk = try? JSONDecoder().decode(ChatCompletionChunk.self, from: data)
             let string = chunk?.choices.first?.delta.content ?? ""
             response += string

Sources/EventSource/EventSource.swift

@@ -151,10 +151,19 @@ public extension EventSource {
                     }
                 }
 
+                #if compiler(>=6.0)
                 continuation.onTermination = { @Sendable [weak self] _ in
                     sesstionDelegateTask.cancel()
                     Task { await self?.close() }
                 }
+                #else
+                continuation.onTermination = { @Sendable _ in
+                    sesstionDelegateTask.cancel()
+                    Task { [weak self] in
+                        await self?.close()
+                    }
+                }
+                #endif
 
                 self.continuation = continuation