サンプルプロジェクトをSwift Packageで管理 (#79)

* サンプルコードをSwiftPackageで管理する * 不要なファイルを消す * Entitlementsも消してみる * パッケージのパスが間違っていたのを修正 * nameをつける
pixiv · May 17, 2023 · 30d9fc1 · 30d9fc1
1 parent 6c7d295
commit 30d9fc1
Show file tree

Hide file tree

Showing 37 changed files with 406 additions and 749 deletions.
diff --git a/CharcoalSwiftUISample/.gitignore b/CharcoalSwiftUISample/.gitignore
@@ -0,0 +1,9 @@
+.DS_Store
+/.build
+/Packages
+/*.xcodeproj
+xcuserdata/
+DerivedData/
+.swiftpm/config/registries.json
+.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
+.netrc
diff --git a/CharcoalSwiftUISample/Package.swift b/CharcoalSwiftUISample/Package.swift
@@ -0,0 +1,29 @@
+// swift-tools-version: 5.7
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "CharcoalSwiftUISample",
+    platforms: [
+        .iOS(.v13),
+        .macOS(.v12)
+    ],
+    products: [
+        .library(
+            name: "CharcoalSwiftUISample",
+            targets: ["CharcoalSwiftUISample"]
+        )
+    ],
+    dependencies: [
+        .package(name: "charcoal-ios", path: "../")
+    ],
+    targets: [
+        .target(
+            name: "CharcoalSwiftUISample",
+            dependencies: [
+                .product(name: "Charcoal", package: "charcoal-ios")
+            ]
+        )
+    ]
+)
diff --git a/.../SwiftUISample/Contents/ButtonsView.swift → ...s/CharcoalSwiftUISample/ButtonsView.swift b/.../SwiftUISample/Contents/ButtonsView.swift → ...s/CharcoalSwiftUISample/ButtonsView.swift
diff --git a/...e/SwiftUISample/Contents/ColorsView.swift → ...es/CharcoalSwiftUISample/ColorsView.swift b/...e/SwiftUISample/Contents/ColorsView.swift → ...es/CharcoalSwiftUISample/ColorsView.swift
diff --git a/...tUISample/SwiftUISample/ContentView.swift → ...s/CharcoalSwiftUISample/ContentView.swift b/...tUISample/SwiftUISample/ContentView.swift → ...s/CharcoalSwiftUISample/ContentView.swift
@@ -1,10 +1,12 @@
 import Charcoal
 import SwiftUI
 
-struct ContentView: View {
+public struct ContentView: View {
     @State var isDarkModeOn = false
 
-    var body: some View {
+    public init() {}
+
+    public var body: some View {
         NavigationView {
             List {
                 Toggle("Dark Mode", isOn: $isDarkModeOn)

diff --git a/...iftUISample/Contents/SelectionsView.swift → ...harcoalSwiftUISample/SelectionsView.swift b/...iftUISample/Contents/SelectionsView.swift → ...harcoalSwiftUISample/SelectionsView.swift
diff --git a/...iftUISample/Contents/TextFieldsView.swift → ...harcoalSwiftUISample/TextFieldsView.swift b/...iftUISample/Contents/TextFieldsView.swift → ...harcoalSwiftUISample/TextFieldsView.swift
diff --git a/...tUISample/Contents/TypographiesView.swift → ...rcoalSwiftUISample/TypographiesView.swift b/...tUISample/Contents/TypographiesView.swift → ...rcoalSwiftUISample/TypographiesView.swift
diff --git a/CharcoalUIKitSample/.gitignore b/CharcoalUIKitSample/.gitignore
@@ -0,0 +1,9 @@
+.DS_Store
+/.build
+/Packages
+/*.xcodeproj
+xcuserdata/
+DerivedData/
+.swiftpm/config/registries.json
+.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
+.netrc
diff --git a/CharcoalUIKitSample/Package.swift b/CharcoalUIKitSample/Package.swift
@@ -0,0 +1,36 @@
+// swift-tools-version: 5.7
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "CharcoalUIKitSample",
+    platforms: [
+        .iOS(.v11)
+    ],
+    products: [
+        .library(
+            name: "CharcoalUIKitSample",
+            targets: ["CharcoalUIKitSample"]
+        )
+    ],
+    dependencies: [
+        .package(name: "charcoal-ios", path: "../")
+    ],
+    targets: [
+        .target(
+            name: "CharcoalUIKitSample",
+            dependencies: [
+                .product(name: "Charcoal", package: "charcoal-ios")
+            ],
+            resources: [
+                .copy("Storyboards/Buttons.storyboard"),
+                .copy("Storyboards/Colors.storyboard"),
+                .copy("Storyboards/Content.storyboard"),
+                .copy("Storyboards/Selections.storyboard"),
+                .copy("Storyboards/TextFields.storyboard"),
+                .copy("Storyboards/Typographies.storyboard")
+            ]
+        )
+    ]
+)
diff --git a/...itSample/UIKitSample/ViewController.swift → ...alUIKitSample/ContentViewController.swift b/...itSample/UIKitSample/ViewController.swift → ...alUIKitSample/ContentViewController.swift
@@ -1,9 +1,14 @@
 import UIKit
 
-final class ViewController: UITableViewController {
-    private let storyboardTitles = ["Buttons", "TextFields", "Selections", "Colors", "Typography"]
+public final class ContentViewController: UITableViewController {
+    public class func instantiate() -> UIViewController {
+        let viewController = UIStoryboard(name: "Content", bundle: .module).instantiateInitialViewController()!
+        return UINavigationController(rootViewController: viewController)
+    }
+
+    private let storyboardTitles = ["Buttons", "TextFields", "Selections", "Colors", "Typographies"]
 
-    override func viewDidLoad() {
+    override public func viewDidLoad() {
         super.viewDidLoad()
 
         setupNavigationBar()
@@ -28,15 +33,15 @@ final class ViewController: UITableViewController {
         }
     }
 
-    override func tableView(_: UITableView, numberOfRowsInSection _: Int) -> Int {
+    public override func tableView(_: UITableView, numberOfRowsInSection _: Int) -> Int {
         return storyboardTitles.count
     }
 
-    override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+    public override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         tableView.deselectRow(at: indexPath, animated: true)
 
         let title = storyboardTitles[indexPath.item]
-        guard let viewController = UIStoryboard(name: title, bundle: nil).instantiateInitialViewController() else {
+        guard let viewController = UIStoryboard(name: title, bundle: .module).instantiateInitialViewController() else {
             return
         }
         viewController.title = title

diff --git a/...IKitSample/Storyboards/Buttons.storyboard → ...IKitSample/Storyboards/Buttons.storyboard b/...IKitSample/Storyboards/Buttons.storyboard → ...IKitSample/Storyboards/Buttons.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21225" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Y6W-OH-hqX">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Y6W-OH-hqX">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21207"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -12,7 +12,7 @@
         <!--Buttons View Controller-->
         <scene sceneID="s0d-6b-0kx">
             <objects>
-                <viewController id="Y6W-OH-hqX" customClass="ButtonsViewController" customModule="UIKitSample" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController id="Y6W-OH-hqX" customClass="ButtonsViewController" customModule="CharcoalUIKitSample" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="5EZ-qb-Rvc">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>

diff --git a/...UIKitSample/Storyboards/Colors.storyboard → ...UIKitSample/Storyboards/Colors.storyboard b/...UIKitSample/Storyboards/Colors.storyboard → ...UIKitSample/Storyboards/Colors.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Y6W-OH-hqX">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Y6W-OH-hqX">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -12,7 +12,7 @@
         <!--Colors View Controller-->
         <scene sceneID="s0d-6b-0kx">
             <objects>
-                <viewController id="Y6W-OH-hqX" customClass="ColorsViewController" customModule="UIKitSample" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController id="Y6W-OH-hqX" customClass="ColorsViewController" customModule="CharcoalUIKitSample" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="5EZ-qb-Rvc">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>