Merge pull request #66 from DroidKaigi/MrSmart00/feature/lisence

Add LicenseList library and connect the View
DroidKaigi · Jun 23, 2024 · 870fcf0 · 870fcf0
2 parents e797c0b + 6425a2b
commit 870fcf0
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/app-ios/App/App.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/app-ios/App/App.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,5 +1,5 @@
 {
-  "originHash" : "f8cbec89e72afd3e8305b98d43e58a9e69ba7ccc12f6d0cc55ff743ff5373f8f",
+  "originHash" : "65e8a333b2fc3bb01c35d55d51ff325d4b6f5bcabdf6053eaff0b18ce8ef5f61",
   "pins" : [
     {
       "identity" : "abseil-cpp-binary",
@@ -100,6 +100,15 @@
         "version" : "1.22.5"
       }
     },
+    {
+      "identity" : "licenselist",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/cybozu/LicenseList.git",
+      "state" : {
+        "revision" : "0828b88c1a6130d56ede2cc6c41ec50068a7ebd6",
+        "version" : "0.7.0"
+      }
+    },
     {
       "identity" : "nanopb",
       "kind" : "remoteSourceControl",

diff --git a/app-ios/Package.swift b/app-ios/Package.swift
@@ -34,6 +34,7 @@ let package = Package(
     dependencies: [
         .package(url: "https://github.com/pointfreeco/swift-composable-architecture.git", exact: "1.10.2"),
         .package(url: "https://github.com/firebase/firebase-ios-sdk.git", exact: "10.26.0"),
+        .package(url: "https://github.com/cybozu/LicenseList.git", exact: "0.7.0"),
     ],
     targets: [
         .target(
@@ -98,7 +99,8 @@ let package = Package(
         .target(
             name: "AboutFeature",
             dependencies: [
-                .tca
+                .tca,
+                .product(name: "LicenseList", package: "LicenseList")
             ]
         ),
         .testTarget(

diff --git a/app-ios/Sources/AboutFeature/AboutView.swift b/app-ios/Sources/AboutFeature/AboutView.swift
@@ -1,5 +1,6 @@
 import ComposableArchitecture
 import SwiftUI
+import LicenseList
 
 @ViewAction(for: AboutReducer.self)
 public struct AboutView: View {
@@ -25,7 +26,7 @@ public struct AboutView: View {
             case .sponsors:
                 Text("Sponsors")
             case .acknowledgements:
-                Text("Acknowledgements")
+                LicenseListView()
             }
         }
         .sheet(item: $store.scope(state: \.destination?.codeOfConduct, action: \.presentation.codeOfConduct), content: { _ in