diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c3b9805..6e91f25 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,13 +33,8 @@ jobs: distribution: 'temurin' java-version: '17' - - name: Cache - uses: actions/cache@v4 - with: - path: | - ~/.gradle/caches/ - ~/.gradle/wrapper/ - key: ${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }} + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v3 - name: Set environments run: | @@ -60,17 +55,17 @@ jobs: if: github.event.inputs.release == 'true' run: | if [ "${{ secrets.STORE_FILE }}" == "" ]; then - echo -e "\nERROR!\nリリースするには、 署名鍵を設定する必要があります。\n" - echo "STORE_FILE: JKS形式の署名鍵をBase64でエンコードした文字列" - echo "STORE_PASSWORD: キーストアのパスワード" - echo "KEY_ALIAS: 署名のエイリアス" - echo "KEY_PASSWORD: 署名のパスワード" + echo -e "\nERROR!\nTo release, you need to set up a signing key!\n" + echo "STORE_FILE: A Base64 encoded string of the signing key in JKS format" + echo "STORE_PASSWORD: Key store password" + echo "KEY_ALIAS: Key alias" + echo "KEY_PASSWORD: Key password" echo "" exit 1 fi if [ "${{ steps.check-tag.outputs.exists }}" == "true" ]; then - echo -e "\nERROR!\n既に同じタグが存在します。\n" - echo "build.gradle の versionName を変更してください" + echo -e "\nERROR!\nThe same tag already exists!\n" + echo "Please change versionName in build.gradle" echo "" exit 1 fi @@ -82,11 +77,11 @@ jobs: export STORE_PASSWORD="${{ secrets.STORE_PASSWORD }}" export KEY_ALIAS="${{ secrets.KEY_ALIAS }}" export KEY_PASSWORD="${{ secrets.KEY_PASSWORD }}" - ./gradlew aR bR + ./gradlew assembleRelease bundleRelease cp -f app/build/outputs/apk/release/app-release.apk ${{ env.repo }}-${{ env.version }}.apk cp -f app/build/outputs/bundle/release/app-release.aab ${{ env.repo }}-${{ env.version }}.aab else - ./gradlew asD bunD + ./gradlew assembleDebug bundleDebug cp -f app/build/outputs/apk/debug/app-debug.apk ${{ env.repo }}-${{ env.version }}@${{ env.commit }}.apk cp -f app/build/outputs/bundle/debug/app-debug.aab ${{ env.repo }}-${{ env.version }}@${{ env.commit }}.aab fi diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d64cd49..e644113 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a80b22c..381baa9 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionSha256Sum=544c35d6bd849ae8a5ed0bcea39ba677dc40f49df7d1835561582da2009b961d +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle b/settings.gradle index 7875f49..7a4ce03 100644 --- a/settings.gradle +++ b/settings.gradle @@ -4,7 +4,7 @@ pluginManagement { mavenCentral() } plugins { - id 'com.android.application' version '8.3.1' apply false + id 'com.android.application' version '8.4.0' apply false } } dependencyResolutionManagement { @@ -15,4 +15,4 @@ dependencyResolutionManagement { } rootProject.name = 'BenesseExtension Tester' -include 'app' \ No newline at end of file +include 'app'