Merge pull request #174 from uhooi/release/1.4.0

Release/1.4.0
uhooi · Mar 2, 2021 · 24d177d · 24d177d
2 parents 5ab4bf2 + 991939c
commit 24d177d
Show file tree

Hide file tree

Showing 170 changed files with 1,628 additions and 828 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -21,15 +21,14 @@ on:
       - Rambafile
 
 env:
-  DEVELOPER_DIR: /Applications/Xcode_12.1.app
+  DEVELOPER_DIR: /Applications/Xcode_12.3.app
 
 jobs:
   test:
     runs-on: macOS-latest
     env:
       MINT_PATH: mint/lib
       MINT_LINK_PATH: mint/bin
-      XCODE_XCCONFIG_FILE: Configs/Carthage.xcconfig
 
     steps:
     # チェックアウト
@@ -69,42 +68,72 @@ jobs:
         restore-keys: |
           ${{ runner.os }}-mint-
 
-    # Carthageで管理しているライブラリのキャッシュ
-    - name: Cache Carthage packages
-      uses: actions/cache@v2
-      with:
-        path: Carthage
-        key: ${{ runner.os }}-carthage-${{ hashFiles('**/Cartfile.resolved') }}
-        restore-keys: |
-          ${{ runner.os }}-carthage-
-
-    # Carthageで管理しているライブラリのインストール
-    - name: Install Carthage frameworks
-      run: make install-carthage
-      env:
-        GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    # ライセンス情報の生成、プロジェクトファイルの生成
+    - name: Generate licenses and Xcode project
+      run: make generate-licenses
 
-    # CocoaPodsで管理しているライブラリのキャッシュ
-    - name: Cache Pods
+    # SwiftPMで管理しているライブラリのキャッシュ
+    - name: Cache SwiftPM packages
       uses: actions/cache@v2
       with:
-        path: Pods
-        key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
+        path: SourcePackages
+        key: ${{ runner.os }}-swiftpm-${{ hashFiles('**/UhooiPicBook.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved') }}
         restore-keys: |
-          ${{ runner.os }}-pods-
-
-    # ライセンス情報の生成、プロジェクトファイルの生成、CocoaPodsで管理しているライブラリのインストール
-    - name: Generate licenses, Xcode project, and install Pods
-      run: make generate-licenses
+          ${{ runner.os }}-swiftpm-
 
     # ビルド
     - name: Xcode build
       run: make build-debug
 
+    # ビルドログのアップロード
+    - name: Upload build log Artifact
+      uses: actions/upload-artifact@v2
+      if: failure()
+      with:
+        name: xcodebuild-logs
+        path: xcodebuild_build.log
+        if-no-files-found: ignore
+        retention-days: 14
+
     # 単体テストの実行
     - name: Xcode test
       run: make test
 
+    # 単体テストログのアップロード
+    - name: Upload test log Artifact
+      uses: actions/upload-artifact@v2
+      if: failure()
+      with:
+        name: xcodebuild-logs
+        path: xcodebuild_test.log
+        if-no-files-found: ignore
+        retention-days: 14
+
+    # コードカバレッジをHTML形式で取得
+    - name: Get code coverage for HTML
+      run: make get-coverage-html
+
+    # テスト結果とコードカバレッジのアップロード
+    - name: Upload test results and code coverage Artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: results
+        path: |
+          build/reports/**/*
+          html_report/**/*
+        if-no-files-found: warn
+        retention-days: 14
+
+    # コードカバレッジをCobertura形式で取得
+    - name: Get code coverage for Cobertura
+      run: make get-coverage-cobertura
+
+    # コードカバレッジをCodecovへアップロード
+    - name: Upload code coverage to Codecov
+      run: make upload-coverage
+      env:
+        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+
   info:
     runs-on: macOS-latest
 
@@ -119,4 +148,3 @@ jobs:
     # 端末の一覧出力
     - name: Show devices
       run: make show-devices
-
diff --git a/.github/workflows/swiftlint.yml b/.github/workflows/swiftlint.yml
@@ -2,8 +2,6 @@ name: SwiftLint
 
 on:
   pull_request:
-    branches:
-      - develop
     paths:
       - '.github/workflows/swiftlint.yml'
       - '.swiftlint.yml'
@@ -15,5 +13,5 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: GitHub Action for SwiftLint
-        uses: norio-nomura/action-swiftlint@3.1.0
+        uses: norio-nomura/action-swiftlint@3.2.1
 
diff --git a/.gitignore b/.gitignore
@@ -103,3 +103,14 @@ com.mono0926.LicensePlist.plist
 
 # GoogleService-Info.plist
 
+xcodebuild_*.log
+
+# SwiftLint Remote Config Cache
+.swiftlint/RemoteConfigCache
+
+# Slather
+xml_report/
+html_report/
+
+SourcePackages/
+
diff --git a/.iblinter.yml b/.iblinter.yml
@@ -0,0 +1,30 @@
+# デフォルト有効で無効にするルール
+disabled_rules:
+  #- enable_autolayout
+  #- duplicate_constraint
+  #- duplicate_id
+  #- custom_module
+  #- ambiguous
+
+# デフォルト無効で有効にするルール
+enabled_rules:
+  #- custom_class_name # ファイル名は末尾の `ViewController` を省略したいため
+  - relative_to_margin
+  - misplaced
+  #- storyboard_viewcontroller_id # IDは末尾の `ViewController` を省略したいため
+  - stackview_backgroundcolor
+  - image_resources
+  - use_base_class
+  - view_as_device
+  - reuse_identifier
+  - color_resources
+  - use_trait_collections
+
+# 対象外のファイル・フォルダ
+excluded:
+  - SourcePackages
+  - Generated
+
+view_as_device_rule:
+  device_id: retina6_1 # iPhone 11
+
diff --git a/.slather.yml b/.slather.yml
@@ -0,0 +1,16 @@
+coverage_service: cobertura_xml
+xcodeproj: UhooiPicBook.xcodeproj
+scheme: UhooiPicBook
+source_directory: UhooiPicBook
+output_directory: xml_report
+ignore:
+  - SourcePackages/*
+  - "**/AppDelegate.swift"
+  - "**/SceneDelegate.swift"
+  - "**/Generated/*"
+  - "**/Util/Debug.swift"
+  - "**/Extensions/UIKit/*"
+  - "**/UIParts/*"
+  - "**/Views/*"
+  - "**/Routers/*"
+