Merge pull request #70 from uhooi/release/1.1.0

Release/1.1.0

.github/workflows/main.yml

@@ -4,9 +4,7 @@ on:
   push:
     branches:
       - master
-      # - release/**
       - develop
-      # - feature/**
     paths-ignore:
       - Docs/**
       - README.md
@@ -22,7 +20,7 @@ on:
       - Rambafile
 
 env:
-  DEVELOPER_DIR: /Applications/Xcode_11.3.1.app/Contents/Developer
+  DEVELOPER_DIR: /Applications/Xcode_11.6.app/Contents/Developer
 
 jobs:
   test:
@@ -35,43 +33,43 @@ jobs:
     # チェックアウト
     - uses: actions/checkout@v2
 
-    # Xcodeの一覧出力
-    - name: Show Xcode list
-      run: ls /Applications | grep 'Xcode'
-
     # Xcodeのバージョン出力
     - name: Show Xcode version
       run: xcodebuild -version
 
-    # Bundlerで管理しているライブラリのキャッシュ復元
+    # Makeのバージョン出力
+    - name: Show Make version
+      run: make --version
+
+    # Bundlerで管理しているライブラリのキャッシュ
     - name: Cache Gems
-      uses: actions/cache@v1
+      uses: actions/cache@v2
       with:
         path: vendor/bundle
-        key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }}
+        key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
         restore-keys: |
-          ${{ runner.os }}-gem-
+          ${{ runner.os }}-gems-
 
     # Bundlerで管理しているライブラリのインストール
-    - name: Bundle install
+    - name: Install Bundled Gems
       run: make install-bundler
 
     # Mintのインストール
     - name: Install Mint
       run: brew install mint
 
-    # Mintで管理しているライブラリのキャッシュ復元
+    # Mintで管理しているライブラリのキャッシュ
     - name: Cache Mint packages
-      uses: actions/cache@v1
+      uses: actions/cache@v2
       with:
         path: mint
         key: ${{ runner.os }}-mint-${{ hashFiles('**/Mintfile') }}
         restore-keys: |
           ${{ runner.os }}-mint-
 
-    # Carthageで管理しているライブラリのキャッシュ復元
+    # Carthageで管理しているライブラリのキャッシュ
     - name: Cache Carthage packages
-      uses: actions/cache@v1
+      uses: actions/cache@v2
       with:
         path: Carthage
         key: ${{ runner.os }}-carthage-${{ hashFiles('**/Cartfile.resolved') }}
@@ -84,17 +82,17 @@ jobs:
       env:
         GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-    # CocoaPodsで管理しているライブラリのキャッシュ復元
+    # CocoaPodsで管理しているライブラリのキャッシュ
     - name: Cache Pods
-      uses: actions/cache@v1
+      uses: actions/cache@v2
       with:
         path: Pods
         key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
         restore-keys: |
           ${{ runner.os }}-pods-
 
     # ライセンス情報の生成、プロジェクトファイルの生成、CocoaPodsで管理しているライブラリのインストール
-    - name: Generate licenses, Xcode project, And Pod install
+    - name: Generate licenses, Xcode project, and install Pods
       run: make generate-licenses
 
     # ビルド
@@ -105,3 +103,18 @@ jobs:
     - name: Xcode test
       run: make test
 
+  info:
+    runs-on: macOS-latest
+
+    steps:
+    # チェックアウト
+    - uses: actions/checkout@v2
+
+    # Xcodeの一覧出力
+    - name: Show Xcode list
+      run: ls /Applications | grep 'Xcode'
+
+    # 端末の一覧出力
+    - name: Show devices
+      run: make show-devices
+

.github/workflows/opened-issue.yml

@@ -9,8 +9,9 @@ jobs:
   comment:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/github-script@v1
+      - uses: actions/github-script@v2
         with:
+          github-token: ${{secrets.GITHUB_TOKEN}}
           script: |
             github.issues.createComment({
               issue_number: context.issue.number,
@@ -22,8 +23,9 @@ jobs:
   apply-label:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/github-script@v1
+      - uses: actions/github-script@v2
         with:
+          github-token: ${{secrets.GITHUB_TOKEN}}
           script: |
             github.issues.addLabels({
               issue_number: context.issue.number,

Gemfile.lock

@@ -2,20 +2,20 @@ GEM
   remote: https://rubygems.org/
   specs:
     CFPropertyList (3.0.2)
-    activesupport (4.2.11.1)
+    activesupport (4.2.11.3)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    algoliasearch (1.27.1)
+    algoliasearch (1.27.3)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
     atomos (0.1.3)
     claide (1.0.3)
-    cocoapods (1.9.1)
+    cocoapods (1.9.3)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.9.1)
+      cocoapods-core (= 1.9.3)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 1.2.2, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -31,7 +31,7 @@ GEM
       nap (~> 1.0)
       ruby-macho (~> 1.4)
       xcodeproj (>= 1.14.0, < 2.0)
-    cocoapods-core (1.9.1)
+    cocoapods-core (1.9.3)
       activesupport (>= 4.0.2, < 6)
       algoliasearch (~> 1.0)
       concurrent-ruby (~> 1.1)
@@ -40,21 +40,21 @@ GEM
       netrc (~> 0.11)
       typhoeus (~> 1.0)
     cocoapods-deintegrate (1.0.4)
-    cocoapods-downloader (1.3.0)
+    cocoapods-downloader (1.4.0)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
     cocoapods-stats (1.1.0)
-    cocoapods-trunk (1.4.1)
+    cocoapods-trunk (1.5.0)
       nap (>= 0.8, < 2.0)
       netrc (~> 0.11)
-    cocoapods-try (1.1.0)
+    cocoapods-try (1.2.0)
     colored2 (3.1.2)
     concurrent-ruby (1.1.6)
     escape (0.0.4)
     ethon (0.12.0)
       ffi (>= 1.3.0)
-    ffi (1.12.2)
+    ffi (1.13.1)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     generamba (1.5.0)
@@ -69,28 +69,28 @@ GEM
     httpclient (2.8.3)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    json (2.3.0)
+    json (2.3.1)
     liquid (4.0.0)
-    minitest (5.14.0)
+    minitest (5.14.1)
     molinillo (0.6.6)
-    nanaimo (0.2.6)
+    nanaimo (0.3.0)
     nap (1.1.0)
     netrc (0.11.0)
     rouge (2.0.7)
     ruby-macho (1.4.0)
     terminal-table (1.4.5)
     thor (0.19.1)
     thread_safe (0.3.6)
-    typhoeus (1.3.1)
+    typhoeus (1.4.0)
       ethon (>= 0.9.0)
     tzinfo (1.2.7)
       thread_safe (~> 0.1)
-    xcodeproj (1.15.0)
+    xcodeproj (1.17.1)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.2.6)
+      nanaimo (~> 0.3.0)
     xcpretty (0.3.0)
       rouge (~> 2.0.7)
 

Makefile

@@ -1,24 +1,27 @@
+# Variables
+
 PRODUCT_NAME := UhooiPicBook
-SCHEME_NAME := ${PRODUCT_NAME}
 WORKSPACE_NAME := ${PRODUCT_NAME}.xcworkspace
+SCHEME_NAME := ${PRODUCT_NAME}
 UI_TESTS_TARGET_NAME := ${PRODUCT_NAME}UITests
 
 TEST_SDK := iphonesimulator
 TEST_CONFIGURATION := Debug
 TEST_PLATFORM := iOS Simulator
-TEST_DEVICE := iPhone 11 Pro Max
-TEST_DESTINATION := 'platform=${TEST_PLATFORM},name=${TEST_DEVICE}'
-
-SDK := iphoneos
-CONFIGURATION := Release
+TEST_DEVICE ?= iPhone 11 Pro Max
+TEST_OS ?= 13.6
+TEST_DESTINATION := 'platform=${TEST_PLATFORM},name=${TEST_DEVICE},OS=${TEST_OS}'
+COVERAGE_OUTPUT := html_report
 
 MODULE_TEMPLATE_NAME ?= uhooi_viper
 
 .DEFAULT_GOAL := help
 
+# Targets
+
 .PHONY: help
 help:
-	@grep -E '^[a-zA-Z_-]+:.*?# .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":[^#]*? #| #"}; {printf "%-42s%s\n", $$1 $$3, $$2}'
+	@grep -E '^[a-zA-Z_-]+:.*?# .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":[^#]*? #| #"}; {printf "%-42s%s\n", $$1 $$3, $$2}'
 
 .PHONY: setup
 setup: # Install dependencies and prepared development configuration
@@ -33,6 +36,11 @@ install-bundler: # Install Bundler dependencies
 	bundle config path vendor/bundle
 	bundle install --jobs 4 --retry 3
 
+.PHONY: update-bundler
+update-bundler: # Update Bundler dependencies
+	bundle config path vendor/bundle
+	bundle update --jobs 4 --retry 3
+
 .PHONY: install-mint
 install-mint: # Install Mint dependencies
 	mint bootstrap
@@ -82,7 +90,7 @@ generate-xcodeproj: # Generate project with XcodeGen
 
 .PHONY: open
 open: # Open workspace in Xcode
-	open ./${PRODUCT_NAME}.xcworkspace
+	open ./${WORKSPACE_NAME}
 
 .PHONY: clean
 clean: # Delete cache
@@ -104,7 +112,7 @@ build \
 | bundle exec xcpretty
 
 .PHONY: test
-test: # Xcode test
+test: # Xcode test # TEST_DEVICE=[device] TEST_OS=[OS]
 	set -o pipefail && \
 xcodebuild \
 -sdk ${TEST_SDK} \
@@ -114,5 +122,13 @@ xcodebuild \
 -destination ${TEST_DESTINATION} \
 -skip-testing:${UI_TESTS_TARGET_NAME} \
 clean test \
-| bundle exec xcpretty
+| bundle exec xcpretty --report html
+
+.PHONY: get-coverage
+get-coverage: # Get code coverage
+	bundle exec slather coverage --html --output-directory ${COVERAGE_OUTPUT}
+
+.PHONY: show-devices
+show-devices: # Show devices
+	instruments -s devices
 

Mintfile

@@ -1,7 +1,7 @@
-Carthage/Carthage@0.34.0
-yonaskolb/xcodegen@2.13.1
-realm/[email protected].1
+Carthage/Carthage@0.35.0
+yonaskolb/xcodegen@2.16.0
+realm/[email protected].2
 fromkk/[email protected]
-uber/[email protected].0
-mono0926/LicensePlist@2.13.0
+uber/[email protected].4
+mono0926/LicensePlist@2.16.0
 

Podfile.lock

@@ -1,8 +1,8 @@
 PODS:
-  - Gedatsu (0.0.7)
-  - R.swift (5.1.0):
-    - R.swift.Library (~> 5.1.0)
-  - R.swift.Library (5.1.0)
+  - Gedatsu (1.2.0)
+  - R.swift (5.2.2):
+    - R.swift.Library (~> 5.2.0)
+  - R.swift.Library (5.2.0)
   - SwiftPrettyPrint (1.0.0)
 
 DEPENDENCIES:
@@ -18,11 +18,11 @@ SPEC REPOS:
     - SwiftPrettyPrint
 
 SPEC CHECKSUMS:
-  Gedatsu: 9b721389f5857f954451d1072287ada5ced48b83
-  R.swift: 8cbc4fc69b740305b6a17c8a8ed968eb788962d9
-  R.swift.Library: fa85ce1e0d0b7e818cd9e080df910ba54d2776cc
+  Gedatsu: 13a21a3cbf7978f9ff671eca5715b94a4309d9a8
+  R.swift: 7c52cdc57a66840ffe6cbd8a823d732059d42a32
+  R.swift.Library: 5ba4f1631300caf9a4d890186930da85d540769d
   SwiftPrettyPrint: 02010eb68c416300eb9d0d0dccafa82b5856466a
 
 PODFILE CHECKSUM: 8736f02f2c9ee6c21a8d66b07287d51f6d13f861
 
-COCOAPODS: 1.9.1
+COCOAPODS: 1.9.3