Timetable 2025 (#72)

Author: d-date

.gitignore

@@ -2,6 +2,9 @@
 #
 # gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
 
+## macOS
+.DS_Store
+
 ## User settings
 xcuserdata/
 

MyLibrary/Package.resolved

@@ -5,35 +5,35 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/combine-schedulers",
       "state" : {
-        "revision" : "9dc9cbe4bc45c65164fa653a563d8d8db61b09bb",
-        "version" : "1.0.0"
+        "revision" : "5928286acce13def418ec36d05a001a9641086f2",
+        "version" : "1.0.3"
       }
     },
     {
-      "identity" : "licenseprovider",
+      "identity" : "licensesplugin",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/zunda-pixel/LicenseProvider",
+      "location" : "https://github.com/maiyama18/LicensesPlugin",
       "state" : {
-        "revision" : "39cd5f269955fc961630f970c370f9182fe56911",
-        "version" : "1.1.1"
+        "revision" : "3061787a7eca7ba801d7a3abccfc077053e79d73",
+        "version" : "0.2.0"
       }
     },
     {
       "identity" : "swift-case-paths",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-case-paths",
       "state" : {
-        "revision" : "551150d5e60e3be78972607d89cd69069cca3e7c",
-        "version" : "1.2.4"
+        "revision" : "19b7263bacb9751f151ec0c93ec816fe1ef67c7b",
+        "version" : "1.6.1"
       }
     },
     {
       "identity" : "swift-clocks",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-clocks",
       "state" : {
-        "revision" : "a8421d68068d8f45fbceb418fbf22c5dad4afd33",
-        "version" : "1.0.2"
+        "revision" : "cc46202b53476d64e824e0b6612da09d84ffde8e",
+        "version" : "1.0.6"
       }
     },
     {
@@ -50,80 +50,89 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-composable-architecture",
       "state" : {
-        "revision" : "687e27795a99ee90cb149c2446673f07ad02f394",
-        "version" : "1.9.1"
+        "revision" : "76c4411e02cc7768a3f27ca058bd2143c342e5b2",
+        "version" : "1.18.0"
       }
     },
     {
       "identity" : "swift-concurrency-extras",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-concurrency-extras",
       "state" : {
-        "revision" : "bb5059bde9022d69ac516803f4f227d8ac967f71",
-        "version" : "1.1.0"
+        "revision" : "82a4ae7170d98d8538ec77238b7eb8e7199ef2e8",
+        "version" : "1.3.1"
       }
     },
     {
       "identity" : "swift-custom-dump",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-custom-dump",
       "state" : {
-        "revision" : "3ce83179e5f0c83ad54c305779c6b438e82aaf1d",
-        "version" : "1.2.1"
+        "revision" : "82645ec760917961cfa08c9c0c7104a57a0fa4b1",
+        "version" : "1.3.3"
       }
     },
     {
       "identity" : "swift-dependencies",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-dependencies",
       "state" : {
-        "revision" : "09e49dd46932adfe80ce672b4b3772d79ee6c21a",
-        "version" : "1.2.1"
+        "revision" : "ec2862d1364536fc22ec56a3094e7a034bbc7da8",
+        "version" : "1.8.1"
       }
     },
     {
       "identity" : "swift-identified-collections",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-identified-collections",
       "state" : {
-        "revision" : "d1e45f3e1eee2c9193f5369fa9d70a6ddad635e8",
-        "version" : "1.0.0"
+        "revision" : "322d9ffeeba85c9f7c4984b39422ec7cc3c56597",
+        "version" : "1.1.1"
+      }
+    },
+    {
+      "identity" : "swift-navigation",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/swift-navigation",
+      "state" : {
+        "revision" : "db6bc9dbfed001f21e6728fd36413d9342c235b4",
+        "version" : "2.3.0"
       }
     },
     {
       "identity" : "swift-perception",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-perception",
       "state" : {
-        "revision" : "42240120b2a8797595433288ab4118f8042214c3",
-        "version" : "1.1.1"
+        "revision" : "671fa54b279fd73933b4a8b34782ebf6c8869145",
+        "version" : "1.5.1"
       }
     },
     {
-      "identity" : "swift-syntax",
+      "identity" : "swift-sharing",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-syntax",
+      "location" : "https://github.com/pointfreeco/swift-sharing",
       "state" : {
-        "revision" : "64889f0c732f210a935a0ad7cda38f77f876262d",
-        "version" : "509.1.1"
+        "revision" : "2c840cf2ae0526ad6090e7796c4e13d9a2339f4a",
+        "version" : "2.3.3"
       }
     },
     {
-      "identity" : "swiftui-navigation",
+      "identity" : "swift-syntax",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/pointfreeco/swiftui-navigation",
+      "location" : "https://github.com/swiftlang/swift-syntax",
       "state" : {
-        "revision" : "d9e72f3083c08375794afa216fb2f89c0114f303",
-        "version" : "1.2.1"
+        "revision" : "64889f0c732f210a935a0ad7cda38f77f876262d",
+        "version" : "509.1.1"
       }
     },
     {
       "identity" : "xctest-dynamic-overlay",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/xctest-dynamic-overlay",
       "state" : {
-        "revision" : "b58e6627149808b40634c4552fcf2f44d0b3ca87",
-        "version" : "1.1.0"
+        "revision" : "39de59b2d47f7ef3ca88a039dff3084688fe27f4",
+        "version" : "1.5.2"
       }
     }
   ],

MyLibrary/Package.swift

@@ -27,9 +27,8 @@ let package = Package(
       targets: ["trySwiftFeature"]),
   ],
   dependencies: [
-    .package(url: "https://github.com/pointfreeco/swift-composable-architecture", from: "1.9.1"),
-    .package(url: "https://github.com/pointfreeco/swift-dependencies", from: "1.2.0"),
-    .package(url: "https://github.com/zunda-pixel/LicenseProvider", from: "1.1.1"),
+    .package(url: "https://github.com/pointfreeco/swift-composable-architecture", from: "1.18.0"),
+    .package(url: "https://github.com/maiyama18/LicensesPlugin", from: "0.2.0"),
   ],
   targets: [
     .target(
@@ -54,7 +53,7 @@ let package = Package(
     .target(
       name: "DependencyExtra",
       dependencies: [
-        .product(name: "Dependencies", package: "swift-dependencies")
+        .product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
       ]
     ),
     .target(
@@ -97,7 +96,7 @@ let package = Package(
         .product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
       ],
       plugins: [
-        .plugin(name: "LicenseProviderPlugin", package: "LicenseProvider")
+        .plugin(name: "LicensesPlugin", package: "LicensesPlugin"),
       ]
     ),
     .testTarget(

MyLibrary/Sources/DataClient/Client.swift

@@ -1,13 +1,14 @@
 import Dependencies
 import DependenciesMacros
 import Foundation
+import os.log
 import SharedModels
 
 @DependencyClient
 public struct DataClient {
   public var fetchDay1: @Sendable () throws -> Conference
   public var fetchDay2: @Sendable () throws -> Conference
-  public var fetchWorkshop: @Sendable () throws -> Conference
+  public var fetchDay3: @Sendable () throws -> Conference
   public var fetchSponsors: @Sendable () throws -> Sponsors
   public var fetchOrganizers: @Sendable () throws -> [Organizer]
   public var fetchSpeakers: @Sendable () throws -> [Speaker]
@@ -17,17 +18,20 @@ extension DataClient: DependencyKey {
 
   static public var liveValue: DataClient = .init(
     fetchDay1: {
-      let data = loadDataFromBundle(fileName: "day1")
+      Logger().log(level: .info, "loading day 1")
+      let data = loadDataFromBundle(fileName: "2025-day1")
       let response = try jsonDecoder.decode(Conference.self, from: data)
       return response
     },
     fetchDay2: {
-      let data = loadDataFromBundle(fileName: "day2")
+      Logger().log(level: .info, "loading day 2")
+      let data = loadDataFromBundle(fileName: "2025-day2")
       let response = try jsonDecoder.decode(Conference.self, from: data)
       return response
     },
-    fetchWorkshop: {
-      let data = loadDataFromBundle(fileName: "workshop")
+    fetchDay3: {
+      Logger().log(level: .info, "loading day 3")
+      let data = loadDataFromBundle(fileName: "2025-day3")
       let response = try jsonDecoder.decode(Conference.self, from: data)
       return response
     },
@@ -49,6 +53,7 @@ extension DataClient: DependencyKey {
   )
 
   static func loadDataFromBundle(fileName: String) -> Data {
+    
     let filePath = Bundle.module.path(forResource: fileName, ofType: "json")!
     let fileURL = URL(fileURLWithPath: filePath)
     let data = try! Data(contentsOf: fileURL)

MyLibrary/Sources/DataClient/Resources/day1.json renamed to MyLibrary/Sources/DataClient/Resources/2024-day1.json

@@ -211,6 +211,50 @@
         }
       ]
     },
+    {
+      "id": 11,
+      "time": "2025-04-11T13:10:00+09:00",
+      "sessions": [
+        {
+          "id": 21,
+          "title": "Swift over Coffee Live",
+          "place": "Hall",
+          "description": "Join us for a live recording of the popular podcast \"Swift over Coffee,\" where the latest Swift news and practical techniques are discussed. Hosted by Paul Hudson and Mikaela Caron, the show dives into new Swift features, community trends, and coding tips that prove invaluable in everyday development. In addition to the standard recording session, the event features a Q&A with the audience—offering a unique chance to hear exclusive behind-the-scenes stories and up-to-the-minute development insights. This is an ideal opportunity for Swift developers to catch up on cutting-edge trends and strengthen their ties within the community.",
+          "speakers": [
+            {
+              "id": 89,
+              "name": "Paul Hudson",
+              "image_name": "paul_hudson",
+              "bio": "Paul is the author of Hacking with Swift, Pro Swift, Swift Design Patterns, Testing Swift, Swift Interview Challenges, and more. Suffice it to say, he quite likes Swift. And coffee. (But mostly Swift.) (And coffee.)",
+              "job_title": "Creator at Hacking with Swift",
+              "links": [
+                {
+                  "name": "@twostraws",
+                  "url": "https://x.com/twostraws"
+                },
+                {
+                  "name": "@twostraws",
+                  "url": "https://github.com/twostraws"
+                }
+              ]
+            },
+            {
+              "id": 90,
+              "name": "Mikaela Caron",
+              "image_name": "mikaela_caron",
+              "bio": "Mikaela Caron is an independent iOS Engineer who actively shares her expertise on social media, focusing on iOS development, building apps in public, and freelancing. She’s continuing to work on her indie app Fruitful, which helps people connect with others at conferences, while also traveling as much as she can. She’s also an organizer for iOSDevHappyHour and loves giving back to the community.",
+              "job_title": "Indie iOS Developer",
+              "links": [
+                {
+                  "url": "https://mikaelacaron.com",
+                  "name": "mikaelacaron.com"
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    },
     {
       "id": 28,
       "time": "2024-03-23T14:15:00+09:00",