feat: add Parchment and modified Makefile, project.yml and file struc…

…ture (#11)
KaoruMuta · Jul 14, 2020 · d3abb56 · d3abb56
1 parent 7b28453
commit d3abb56
Show file tree

Hide file tree

Showing 10 changed files with 131 additions and 88 deletions.
diff --git a/Cartfile b/Cartfile
@@ -1,2 +1,3 @@
 github "ReactiveX/RxSwift" == 5.0
 github "Alamofire/Alamofire" == 5.2
+github "rechsteiner/Parchment" == 2.4.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,2 +1,3 @@
 github "Alamofire/Alamofire" "5.2.0"
 github "ReactiveX/RxSwift" "5.0.0"
+github "rechsteiner/Parchment" "v2.4.0"
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 .PHONY: all
-all: bundle_install_force xcodegen pods_force carthage_if_needed;
+all: bundle_install_force xcodegen pods_force carthage_if_needed carthage_arrange_framework;
 
 .PHONY: clean
 clean: pods_cache_clear carthage_cache_clear carthage_derived_data_clear;
@@ -53,6 +53,12 @@ carthage:
 carthage_if_needed:
 	test `find ./Carthage/Build/ 2>/dev/null | wc -l` -ne 0 || carthage bootstrap --platform iOS --cache-builds --no-use-binaries
 
+# Consider Static library (RxSwift, etc.)
+.PHONY: carthage_arrange_framework
+carthage_arrange_framework:
+	mv ./Carthage/Build/iOS/Static/* ./Carthage/Build/iOS
+	rm -rf ./Carthage/Build/iOS/Static
+
 .PHONY: carthage_cache_clear
 carthage_cache_clear:
 	rm -rf ./Carthage

diff --git a/QiitaChecker.xcodeproj/project.pbxproj b/QiitaChecker.xcodeproj/project.pbxproj
diff --git a/QiitaChecker/AppDelegate.swift → ...cker/Common/Application/AppDelegate.swift b/QiitaChecker/AppDelegate.swift → ...cker/Common/Application/AppDelegate.swift
diff --git a/QiitaChecker/SceneDelegate.swift → ...er/Common/Application/SceneDelegate.swift b/QiitaChecker/SceneDelegate.swift → ...er/Common/Application/SceneDelegate.swift
diff --git a/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json b/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json
diff --git a/QiitaChecker/Assets.xcassets/Contents.json → ...on/Resource/Assets.xcassets/Contents.json b/QiitaChecker/Assets.xcassets/Contents.json → ...on/Resource/Assets.xcassets/Contents.json
diff --git a/QiitaChecker/Info.plist → QiitaChecker/Common/Resource/Info.plist b/QiitaChecker/Info.plist → QiitaChecker/Common/Resource/Info.plist
diff --git a/project.yml b/project.yml
@@ -10,16 +10,17 @@ targets:
         MARKETING_VERSIONS: 1.0.0
         CURRENT_PROJECT_VERSION: 1
         DEVELOPMENT_TEAM: Kaoru Muta
-        INFOPLIST_FILE: QiitaChecker/Info.plist
+        INFOPLIST_FILE: QiitaChecker/Common/Resource/Info.plist
         PRODUCT_BUNDLE_IDENTIFIER: com.muta.QiitaChecker
     dependencies:
-      - carthage: RxSwift.framework
+      - carthage: RxSwift
         linkType: static
-      - carthage: RxCocoa.framework
+      - carthage: RxCocoa
         linkType: static
-      - carthage: RxRelay.framework
+      - carthage: RxRelay
         linkType: static
       - carthage: Alamofire
+      - carthage: Parchment
     preBuildScripts:
       - script: |
           Pods/SwiftLint/swiftlint autocorrect