Skip to content

Commit

Permalink
Merge branch 'Rewriting_to_Kotlin' into develop
Browse files Browse the repository at this point in the history
# Conflicts:
#	.idea/dataSources/648c6ef7-2bba-4e14-b21f-f6619a5657a5.xml
  • Loading branch information
kosugikun committed Jul 17, 2023
2 parents 21a3b3d + bbeb519 commit 3256add
Show file tree
Hide file tree
Showing 107 changed files with 5,066 additions and 5,195 deletions.
8 changes: 2 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,7 @@ jobs:
build:
docker:
# specify the version you desire here
- image: circleci/openjdk:8u171-jdk

# Specify service dependencies here if necessary
# CircleCI maintains a library of pre-built images
# documented at https://circleci.com/docs/2.0/circleci-images/
# - image: circleci/postgres:9.4
- image: cimg/openjdk:20.0.1

working_directory: ~/repo

Expand All @@ -19,6 +14,7 @@ jobs:

steps:
- checkout
- run: java --version

# Download and cache dependencies
- restore_cache:
Expand Down
4 changes: 3 additions & 1 deletion .github/ISSUE_TEMPLATE/---.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
---
name: その他 about: その他のIssueを立てたい場合はこちら title: ''
name: その他
about: その他のIssueを立てたい場合はこちら
title: ''
labels: ''
assignees: ''

Expand Down
4 changes: 3 additions & 1 deletion .github/ISSUE_TEMPLATE/bug-report.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
---
name: バグレポート about: バグや予期しない動作を報告する title: "[バグレポート] タイトルを入力"
name: バグレポート
about: バグや予期しない動作を報告する
title: "[バグレポート] タイトルを入力"
labels: ''
assignees: ''

Expand Down
4 changes: 3 additions & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
---
name: 機能リクエスト about: このプロジェクトにアイデアを提案 title: "[機能要求]タイトルを入力"
name: 機能リクエスト
about: このプロジェクトにアイデアを提案
title: "[機能要求]タイトルを入力"
labels: ''
assignees: ''

Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/code_quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@ on:
pull_request:
push:
branches:
- master
- develop
- 'releases/*'
- '*'

jobs:
qodana:
Expand Down
7 changes: 0 additions & 7 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .idea/codeStyles/codeStyleConfig.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions .idea/dataSources.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 3256add

Please sign in to comment.