diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 105a4e4..ea34857 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -33,10 +33,27 @@ jobs: java-version: '11' distribution: 'adopt' cache: gradle + - name: cache gradle + id: cache-gradle + uses: actions/cache@v2 + with: +# path: ~/.gradle +# key: ${{ runner.os }}-${{ hashFiles('build.gradle') }}-${{ hashFiles('app/build.gradle') }} + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} + restore-keys: | + ${{ runner.os }}-gradle- - name: Grant execute permission for gradlew run: chmod +x gradlew + - name: Prepare google-service.json + env: + GOOGLE_SERVICE_JSON: ${{secrets.GOOGLE_SERVICE_JSON}} + run: echo $GOOGLE_SERVICE_JSON | base64 -d > app/google-services.json + # 依存関係の出力 - name: Displays the Android dependencies of the project env: @@ -58,9 +75,9 @@ jobs: - name: Compile Release APK run: ./gradlew assembleRelease # AABをコンパイル - - name: Compile Debug APK + - name: Compile Debug AAB run: ./gradlew bundleDebug - - name: Compile Release APK + - name: Compile Release AAB run: ./gradlew bundleRelease # リリースAPKに署名 diff --git a/.gitignore b/.gitignore index aa724b7..7327870 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,23 @@ .externalNativeBuild .cxx local.properties + +# Android Studio Navigation editor temp files +.navigation/ + +# Android Studio captures folder +captures/ + +# IntelliJ +*.iml +.idea/workspace.xml +.idea/tasks.xml +.idea/gradle.xml +.idea/assetWizardSettings.xml +.idea/dictionaries +.idea/libraries +.idea/jarRepositories.xml +# Android Studio 3 in .gitignore file. +.idea/caches +.idea/modules.xml +.idea/discord.xml diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..1bec35e --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,10 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..79ee123 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 4e3844e..526b4c2 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -1,5 +1,6 @@ +