Merge pull request #201 from tokudai0000/196-remove-multi-module

マルチモジュールの削除

Podfile

@@ -8,7 +8,9 @@ abstract_target 'All' do
   # Comment the next line if you don't want to use dynamic frameworks
   use_frameworks!
   inhibit_all_warnings!
-
+
+  pod 'APIKit' , '~> 5'
+  pod 'Kanna' , '~> 5'
   pod 'R.swift' , '~> 7'
   pod 'RxCocoa' , '~> 6'
   pod 'RxGesture' , '~> 4'
@@ -19,11 +21,6 @@ abstract_target 'All' do
   target 'univIP' do
   end
 
-  target 'Features' do
-    pod 'APIKit' , '~> 5'
-    pod 'Kanna' , '~> 5'
-  end
-
   target  'univIPTests' do
     inherit! :search_paths
   end

Podfile.lock

@@ -51,6 +51,6 @@ SPEC CHECKSUMS:
   RxRelay: 45eaa5db8ee4fb50e5ebd57deec0159e97fa51e6
   RxSwift: a4b44f7d24599f674deebd1818eab82e58410632
 
-PODFILE CHECKSUM: 887c7c6b279b9fdab6afb1b01f895f53c8c33205
+PODFILE CHECKSUM: 04058d42c6658d2f7c18cb436a43b85af1415adf
 
-COCOAPODS: 1.14.3
+COCOAPODS: 1.15.2

AkidonComponents/AKLibrary.swift → univIP/AkidonComponents/AKLibrary.swift

@@ -7,7 +7,7 @@
 
 import Foundation
 
-public enum AKLogLevel {
+enum AKLogLevel {
     case DEBUG     // システムの動作状況に関する詳細な情報。
     case WARN      // 異常とは言い切れないが正常とも異なる何らかの問題。
     case ERROR     // 予期しないその他の実行時エラー。
@@ -22,27 +22,27 @@ public enum AKLogLevel {
 ///   - function: メソッド
 ///   - level: ログ・レベル
 ///   - message: メッセージ
-public func AKLog(file: String = #file,
+func AKLog(file: String = #file,
            line: Int = #line,
            function: String = #function,
            level: AKLogLevel,
            message: Any ){
 
-    #if DEBUG
+#if DEBUG
     let levelString: String
     switch level {
     case .DEBUG:    levelString = "DEBUG"
     case .WARN:     levelString = "WARN"
     case .ERROR:    levelString = "ERROR"
     case .FATAL:    levelString = "FATAL"
     }
-
+    
     let fileName = NSString(string: file).lastPathComponent
     let datetime = DateFormatter()
     datetime.dateFormat = "yyyy-MM-dd HH:mm:ss.SSS"
     let now = datetime.string(from: Date())
-
+    
     // コンソール出力
     print("AKLog: " + now + " \(levelString) \(fileName)(\(line)) \(function) \(message)")
-    #endif
+#endif
 }

AkidonComponents/CustomDuoButton.swift → univIP/AkidonComponents/CustomDuoButton.swift

@@ -7,19 +7,19 @@
 
 import UIKit
 
-public class CustomDuoButton: UIButton {
-    public var onTap: ((Int) -> Void)?
-
-    public init(title: String,
-                textColor: UIColor = .black,
-                backgroundColor: UIColor = .white,
-                borderColor: UIColor = .systemBlue,
-                fontSize: CGFloat = 18,
-                tag: Int = 0,
-                verticalMargin: CGFloat = 25,
-                horizontalMargin: CGFloat = 50) {
+class CustomDuoButton: UIButton {
+    var onTap: ((Int) -> Void)?
+    
+    init(title: String,
+         textColor: UIColor = .black,
+         backgroundColor: UIColor = .white,
+         borderColor: UIColor = .systemBlue,
+         fontSize: CGFloat = 18,
+         tag: Int = 0,
+         verticalMargin: CGFloat = 25,
+         horizontalMargin: CGFloat = 50) {
         super.init(frame: .zero)
-
+        
         self.setTitle(title, for: .normal)
         self.setTitleColor(textColor, for: .normal)
         self.titleLabel?.font = .systemFont(ofSize: fontSize, weight: .semibold)
@@ -34,35 +34,35 @@ public class CustomDuoButton: UIButton {
         self.layer.shadowOpacity = 1
         self.translatesAutoresizingMaskIntoConstraints = false
         self.sizeToFit()
-
+        
         NSLayoutConstraint.activate([
             self.widthAnchor.constraint(equalToConstant: self.frame.width + horizontalMargin),
             self.heightAnchor.constraint(equalToConstant: self.frame.height + verticalMargin),
         ])
-
+        
         self.addTarget(self, action: #selector(buttonPressed), for: .touchDown)
         self.addTarget(self, action: #selector(buttonReleased), for: [.touchUpInside, .touchUpOutside])
         self.addTarget(self, action: #selector(buttonTapped(_:)), for: .touchUpInside)
     }
-
+    
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
-
+    
     @objc private func buttonPressed() {
         UIView.animate(withDuration: 0.2) {
             self.layer.shadowOpacity = 0
             self.transform = CGAffineTransform(translationX: 0, y: 2)
         }
     }
-
+    
     @objc private func buttonReleased() {
         UIView.animate(withDuration: 0.2) {
             self.layer.shadowOpacity = 1
             self.transform = CGAffineTransform.identity
         }
     }
-
+    
     @objc func buttonTapped(_ sender: UIButton) {
         onTap?(sender.tag)
     }

univIP/Common/AppConstants.swift

@@ -5,8 +5,6 @@
 //  Created by Akihiro Matsuyama on 2023/09/17.
 //
 
-import Entity
-
 struct AppConstants {
 
     public let menuItems: [MenuItem]

Entity/ActivityIndicatorState.swift → univIP/Entity/ActivityIndicatorState.swift

@@ -5,7 +5,7 @@
 //  Created by Akihiro Matsuyama on 2023/08/22.
 //
 
-public enum ActivityIndicatorState {
+enum ActivityIndicatorState {
     case start
     case stop
 }

Entity/AdItem.swift → univIP/Entity/AdItem.swift

@@ -5,26 +5,26 @@
 //  Created by Akihiro Matsuyama on 2023/05/09.
 //
 
-public struct AdItem: Decodable {
-    public let id: Int
-    public let clientName: String
-    public let imageUrlStr: String
-    public let targetUrlStr: String
-    public let imageDescription: String
-
-    public init(id: Int, clientName: String, imageUrlStr: String, targetUrlStr: String, imageDescription: String) {
+struct AdItem: Decodable {
+    let id: Int
+    let clientName: String
+    let imageUrlStr: String
+    let targetUrlStr: String
+    let imageDescription: String
+    
+    init(id: Int, clientName: String, imageUrlStr: String, targetUrlStr: String, imageDescription: String) {
         self.id = id
         self.clientName = clientName
         self.imageUrlStr = imageUrlStr
         self.targetUrlStr = targetUrlStr
         self.imageDescription = imageDescription
     }
-
-    public enum ParsingError: Error {
+    
+    enum ParsingError: Error {
         case invalidData
     }
-
-    public init(dictionary: [String: Any]) throws {
+    
+    init(dictionary: [String: Any]) throws {
         guard let id = dictionary["id"] as? Int,
               let clientName = dictionary["clientName"] as? String,
               let imageUrlStr = dictionary["imageUrlStr"] as? String,

Entity/AdItems.swift → univIP/Entity/AdItems.swift

@@ -5,11 +5,11 @@
 //  Created by Akihiro Matsuyama on 2023/08/24.
 //
 
-public struct AdItems {
-    public var prItems:[AdItem]
-    public var univItems:[AdItem]
-
-    public init(prItems: [AdItem], univItems: [AdItem]) {
+struct AdItems {
+    var prItems:[AdItem]
+    var univItems:[AdItem]
+    
+    init(prItems: [AdItem], univItems: [AdItem]) {
         self.prItems = prItems
         self.univItems = univItems
     }

Entity/CreditItemModel.swift → univIP/Entity/CreditItemModel.swift

@@ -5,12 +5,12 @@
 //  Created by Akihiro Matsuyama on 2023/08/23.
 //
 
-public struct CreditItemModel: Equatable {
-    public let title: String
-    public let license: String
-    public let contentsText: String
-
-    public init(title: String, license: String, contentsText: String) {
+struct CreditItemModel: Equatable {
+    let title: String
+    let license: String
+    let contentsText: String
+    
+    init(title: String, license: String, contentsText: String) {
         self.title = title
         self.license = license
         self.contentsText = contentsText

Entity/HomeEventInfos.swift → univIP/Entity/HomeEventInfos.swift

@@ -5,33 +5,33 @@
 //  Created by Akihiro Matsuyama on 2023/08/29.
 //
 
-public struct HomeEventInfos: Decodable {
-    public let popupItems: [PopupItem]
-    public let buttonItems: [ButtonItem]
-
-    public init(popupItems: [PopupItem], buttonItems: [ButtonItem]) {
+struct HomeEventInfos: Decodable {
+    let popupItems: [PopupItem]
+    let buttonItems: [ButtonItem]
+    
+    init(popupItems: [PopupItem], buttonItems: [ButtonItem]) {
         self.popupItems = popupItems
         self.buttonItems = buttonItems
     }
-
-    public struct PopupItem: Decodable {
-        public let id: Int
-        public let clientName: String
-        public let titleName: String
-        public let description: String
-
-        public init(id: Int, clientName: String, titleName: String, description: String) {
+    
+    struct PopupItem: Decodable {
+        let id: Int
+        let clientName: String
+        let titleName: String
+        let description: String
+        
+        init(id: Int, clientName: String, titleName: String, description: String) {
             self.id = id
             self.clientName = clientName
             self.titleName = titleName
             self.description = description
         }
-
-        public enum ParsingError: Error {
+        
+        enum ParsingError: Error {
             case invalidData
         }
-
-        public init(dictionary: [String: Any]) throws {
+        
+        init(dictionary: [String: Any]) throws {
             guard let id = dictionary["id"] as? Int,
                   let clientName = dictionary["clientName"] as? String,
                   let titleName = dictionary["titleName"] as? String,
@@ -44,24 +44,24 @@ public struct HomeEventInfos: Decodable {
             self.description = description
         }
     }
-
-
-    public struct ButtonItem: Decodable {
-        public let id: Int
-        public let titleName: String
-        public let targetUrlStr: String
-
-        public init(id: Int, titleName: String, targetUrlStr: String) {
+    
+    
+    struct ButtonItem: Decodable {
+        let id: Int
+        let titleName: String
+        let targetUrlStr: String
+        
+        init(id: Int, titleName: String, targetUrlStr: String) {
             self.id = id
             self.titleName = titleName
             self.targetUrlStr = targetUrlStr
         }
-
-        public enum ParsingError: Error {
+        
+        enum ParsingError: Error {
             case invalidData
         }
-
-        public init(dictionary: [String: Any]) throws {
+        
+        init(dictionary: [String: Any]) throws {
             guard let id = dictionary["id"] as? Int,
                   let titleName = dictionary["titleName"] as? String,
                   let targetUrlStr = dictionary["targetUrlStr"] as? String else {
@@ -72,5 +72,5 @@ public struct HomeEventInfos: Decodable {
             self.targetUrlStr = targetUrlStr
         }
     }
-
+    
 }