Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions .github/actions/setup-build-env/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Setup build environment
description: Android のビルドに必要な JDK・Android SDK・Gradle を用意する。

runs:
using: composite
steps:
- uses: actions/setup-java@v6
with:
distribution: temurin
java-version: '25.0.4+101.0.LTS'

- uses: android-actions/setup-android@v4
with:
# 既定値に含まれる旧 `tools` は SDK リポジトリから削除済みで sdkmanager が失敗するため、
# 必要なパッケージだけを明示する。
packages: platform-tools

- uses: gradle/actions/setup-gradle@v6
9 changes: 1 addition & 8 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,7 @@ jobs:
steps:
- uses: actions/checkout@v7

- uses: actions/setup-java@v6
with:
distribution: temurin
java-version: '17'

- uses: android-actions/setup-android@v4

- uses: gradle/actions/setup-gradle@v6
- uses: ./.github/actions/setup-build-env

# 署名鍵が登録されていればリリース署名を行う。未登録なら未署名APKになる。
- name: Decode keystore
Expand Down
18 changes: 2 additions & 16 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,7 @@ jobs:
steps:
- uses: actions/checkout@v7

- uses: actions/setup-java@v6
with:
distribution: temurin
java-version: '17'

- uses: android-actions/setup-android@v4

- uses: gradle/actions/setup-gradle@v6
- uses: ./.github/actions/setup-build-env

# ユニットテストに加え、リソースやマニフェストの不整合を拾うためビルドと lint も通す。
- name: Test and build
Expand All @@ -35,14 +28,7 @@ jobs:
steps:
- uses: actions/checkout@v7

- uses: actions/setup-java@v6
with:
distribution: temurin
java-version: '17'

- uses: android-actions/setup-android@v4

- uses: gradle/actions/setup-gradle@v6
- uses: ./.github/actions/setup-build-env

# エミュレータのハードウェアアクセラレーションを有効にする。
- name: Enable KVM
Expand Down
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ android {
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
}
}

Expand Down