Resolved conflicts

Author: dmakarau

.github/workflows/ci.yml

@@ -18,9 +18,9 @@ jobs:
     - name: Install Swift
       shell: bash
       run: |
-        # Download and install Swift 6.0 using corrected official method
-        SWIFT_VERSION=6.0
-        SWIFT_RELEASE=6.0-RELEASE
+        # Download and install Swift 6.2 using corrected official method
+        SWIFT_VERSION=6.2
+        SWIFT_RELEASE=6.2-RELEASE
         wget https://download.swift.org/swift-${SWIFT_VERSION}-release/ubuntu2204/swift-${SWIFT_RELEASE}/swift-${SWIFT_RELEASE}-ubuntu22.04.tar.gz
         tar -xzf swift-${SWIFT_RELEASE}-ubuntu22.04.tar.gz
         export PATH=$PWD/swift-${SWIFT_RELEASE}-ubuntu22.04/usr/bin:$PATH
@@ -60,9 +60,9 @@ jobs:
     - name: Install Swift
       shell: bash
       run: |
-        # Download and install Swift 6.0 using corrected official method
-        SWIFT_VERSION=6.0
-        SWIFT_RELEASE=6.0-RELEASE
+        # Download and install Swift 6.2 using corrected official method
+        SWIFT_VERSION=6.2
+        SWIFT_RELEASE=6.2-RELEASE
         wget https://download.swift.org/swift-${SWIFT_VERSION}-release/ubuntu2204/swift-${SWIFT_RELEASE}/swift-${SWIFT_RELEASE}-ubuntu22.04.tar.gz
         tar -xzf swift-${SWIFT_RELEASE}-ubuntu22.04.tar.gz
         export PATH=$PWD/swift-${SWIFT_RELEASE}-ubuntu22.04/usr/bin:$PATH

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:6.0
+// swift-tools-version:6.2
 import PackageDescription
 
 let package = Package(

README.md

@@ -10,7 +10,7 @@ A Swift-based REST API server for habit tracking, built with the Vapor web frame
 - **Databases**:
   - PostgreSQL (production)
   - SQLite (development)
-- **Swift Version**: 6.0+
+- **Swift Version**: 6.2+
 - **Platform**: macOS 13+
 - **Shared DTOs**: GrowBitSharedDTO (external package)
 
@@ -59,7 +59,7 @@ A Swift-based REST API server for habit tracking, built with the Vapor web frame
 
 ### Prerequisites
 
-- Swift 6.0+ installed on your system
+- Swift 6.2+ installed on your system
 - Xcode (for macOS development)
 - Docker (optional, for containerized deployment)
 
@@ -195,7 +195,7 @@ This project serves as a learning experience for backend development with Vapor.
 - ✅ Database migration for users table
 - ✅ Category model with database migration
 - ✅ Category creation endpoint with JWT authentication
-- ✅ Swift 6.0 concurrency support (@Sendable)
+- ✅ Swift 6.2 concurrency support (@Sendable)
 - ✅ Shared DTO package integration with @retroactive conformance
 - ✅ Test suite for authentication endpoints
 - ✅ Test suite for category operations
@@ -216,4 +216,4 @@ This is a learning project. Feel free to explore the code and suggest improvemen
 
 ## License
 
-This project is available for educational purposes.
+This project is available for educational purposes.

Tests/GrowBitAppServerTests/GrowBitAppServerLoginTests.swift

@@ -10,6 +10,7 @@ import Foundation
 import GrowBitSharedDTO
 import VaporTesting
 import Testing
+import HabitTrackerAppSharedDTO
 
 @Suite("App Login Tests")
 struct GrowBitAppServerLoginTests {