diff --git a/.github/workflows/buildCi.yml b/.github/workflows/buildCi.yml index e6996661..7c8ee6b1 100644 --- a/.github/workflows/buildCi.yml +++ b/.github/workflows/buildCi.yml @@ -22,20 +22,20 @@ jobs: - uses: nttld/setup-ndk@v1 with: - ndk-version: r26b + ndk-version: r27 - name: Get Commit Message id: commitMessage run: IN="${{ github.event.head_commit.message }}" && echo "message=${IN%%$'\n'*}" >> $GITHUB_OUTPUT - name: Setup JDK - uses: actions/setup-java@v4.0.0 + uses: actions/setup-java@v4 with: - java-version: 20 + java-version: 21 distribution: temurin - name: Cache Gradle dependencies - uses: actions/cache@v4.0.0 + uses: actions/cache@v4 with: path: | ~/.gradle/caches @@ -45,7 +45,7 @@ jobs: restore-keys: ${{ runner.os }}-gradle- - name: Cache build cache - uses: actions/cache@v4.0.0 + uses: actions/cache@v4 with: path: | ${{ github.workspace }}/.ccache @@ -66,7 +66,7 @@ jobs: - name: Build apk id: buildAllApks - uses: gradle/gradle-build-action@v3.0.0 + uses: gradle/gradle-build-action@v3 with: gradle-version: wrapper arguments: assembleDebug @@ -85,7 +85,7 @@ jobs: signingKey: ${{ secrets.SIGNING_KEY }} keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} keyPassword: ${{ secrets.KEY_PASSWORD }} - buildToolsVersion: 34.0.0 + buildToolsVersion: '35.0.0' - name: Delete old APK run: rm app/build/outputs/apk/debug/app-debug.apk @@ -94,7 +94,7 @@ jobs: run: mv app/build/outputs/apk/debug/app-debug-signed.apk app/build/outputs/apk/debug/app-debug.apk - name: Upload Artifact - uses: actions/upload-artifact@v4.3.0 + uses: actions/upload-artifact@v4 with: name: Debug Artifact path: app/build/outputs/apk/debug/app-debug.apk diff --git a/.github/workflows/buildPro.yml b/.github/workflows/buildPro.yml index a630b0c0..65b26fa2 100644 --- a/.github/workflows/buildPro.yml +++ b/.github/workflows/buildPro.yml @@ -18,13 +18,13 @@ jobs: run: IN="${{ github.event.head_commit.message }}" && echo "::set-output name=message::${IN%%$'\n'*}" - name: Setup JDK - uses: actions/setup-java@v4.0.0 + uses: actions/setup-java@v4 with: - java-version: 20 + java-version: 21 distribution: temurin - name: Cache Gradle dependencies - uses: actions/cache@v4.0.0 + uses: actions/cache@v4 with: path: | ~/.gradle/caches @@ -34,7 +34,7 @@ jobs: restore-keys: ${{ runner.os }}-gradle- - name: Cache build cache - uses: actions/cache@v4.0.0 + uses: actions/cache@v4 with: path: | ${{ github.workspace }}/.ccache @@ -47,7 +47,7 @@ jobs: - name: Build apk id: buildAllApks - uses: gradle/gradle-build-action@v3.0.0 + uses: gradle/gradle-build-action@v3 with: gradle-version: wrapper arguments: assemblePro @@ -74,7 +74,7 @@ jobs: keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} keyPassword: ${{ secrets.KEY_PASSWORD }} env: - BUILD_TOOLS_VERSION: 33.0.0 + buildToolsVersion: '35.0.0' - name: List files run: ls app/build/outputs/apk/pro @@ -83,7 +83,7 @@ jobs: run: mv app/build/outputs/apk/pro/app-pro-unsigned-signed.apk app/build/outputs/apk/pro/app-pro.apk - name: Upload Artifact - uses: actions/upload-artifact@v4.3.0 + uses: actions/upload-artifact@v4 with: name: Release Artifact path: app/build/outputs/apk/pro/app-pro.apk diff --git a/.github/workflows/buildRelease.yml b/.github/workflows/buildRelease.yml index 1a34c782..dc561d07 100644 --- a/.github/workflows/buildRelease.yml +++ b/.github/workflows/buildRelease.yml @@ -24,16 +24,16 @@ jobs: - uses: nttld/setup-ndk@v1 with: - ndk-version: r26b + ndk-version: r27 - name: Get Commit Message id: commitMessage run: IN="${{ github.event.head_commit.message }}" && echo "::set-output name=message::${IN%%$'\n'*}" - name: Setup JDK - uses: actions/setup-java@v4.0.0 + uses: actions/setup-java@v4 with: - java-version: 20 + java-version: 21 distribution: temurin - name: Cache Gradle dependencies @@ -63,7 +63,7 @@ jobs: - name: Build apk id: buildAllApks - uses: gradle/gradle-build-action@v3.0.0 + uses: gradle/gradle-build-action@v3 with: gradle-version: wrapper arguments: assembleRelease @@ -89,7 +89,7 @@ jobs: signingKey: ${{ secrets.SIGNING_KEY }} keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} keyPassword: ${{ secrets.KEY_PASSWORD }} - buildToolsVersion: 34.0.0 + buildToolsVersion: '35.0.0' - name: List files run: ls app/build/outputs/apk/release @@ -98,7 +98,7 @@ jobs: run: mv app/build/outputs/apk/release/app-release-unsigned-signed.apk app/build/outputs/apk/release/app-release.apk - name: Upload Artifact - uses: actions/upload-artifact@v4.3.0 + uses: actions/upload-artifact@v4 with: name: Release Artifact path: app/build/outputs/apk/release/app-release.apk diff --git a/.github/workflows/clearCache.yml b/.github/workflows/clearCache.yml new file mode 100644 index 00000000..8985f34c --- /dev/null +++ b/.github/workflows/clearCache.yml @@ -0,0 +1,29 @@ +name: cleanup caches by a branch +on: + pull_request: + types: + - closed + +jobs: + cleanup: + runs-on: ubuntu-latest + steps: + - name: Cleanup + run: | + gh extension install actions/gh-actions-cache + + echo "Fetching list of cache key" + cacheKeysForPR=$(gh actions-cache list -R $REPO -B $BRANCH -L 100 | cut -f 1 ) + + ## Setting this to not fail the workflow while deleting cache keys. + set +e + echo "Deleting caches..." + for cacheKey in $cacheKeysForPR + do + gh actions-cache delete $cacheKey -R $REPO -B $BRANCH --confirm + done + echo "Done" + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + REPO: ${{ github.repository }} + BRANCH: refs/pull/${{ github.event.pull_request.number }}/merge diff --git a/.github/workflows/deployToGoogle.yml b/.github/workflows/deployToGoogle.yml index 32cfd4f0..c373620a 100644 --- a/.github/workflows/deployToGoogle.yml +++ b/.github/workflows/deployToGoogle.yml @@ -25,16 +25,16 @@ jobs: - uses: nttld/setup-ndk@v1 with: - ndk-version: r26b + ndk-version: r27 - name: Setup JDK - uses: actions/setup-java@v4.0.0 + uses: actions/setup-java@v4 with: - java-version: 20 + java-version: 21 distribution: temurin - name: Cache Gradle dependencies - uses: actions/cache@v4.0.0 + uses: actions/cache@v4 with: path: | ~/.gradle/caches @@ -44,7 +44,7 @@ jobs: restore-keys: ${{ runner.os }}-gradle- - name: Cache build cache - uses: actions/cache@v4.0.0 + uses: actions/cache@v4 with: path: | ${{ github.workspace }}/.ccache @@ -60,7 +60,7 @@ jobs: - name: Build Bundle id: buildBundle - uses: gradle/gradle-build-action@v3.0.0 + uses: gradle/gradle-build-action@v3 with: gradle-version: wrapper arguments: bundleRelease @@ -75,10 +75,10 @@ jobs: keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} keyPassword: ${{ secrets.KEY_PASSWORD }} env: - BUILD_TOOLS_VERSION: 33.0.0 + buildToolsVersion: '35.0.0' - name: Upload Artifact - uses: actions/upload-artifact@v4.3.0 + uses: actions/upload-artifact@v4 with: name: Artifact path: app/build/outputs/bundle/release/app-release.aab @@ -90,7 +90,7 @@ jobs: run: echo '${{ secrets.SERVICE_ACCOUNT_JSON }}' > service_account.json - name: Deploy to Production - uses: r0adkll/upload-google-play@v1.1.2 + uses: r0adkll/upload-google-play@v1.1.3 with: serviceAccountJson: service_account.json packageName: de.dertyp7214.rboardthememanager diff --git a/.github/workflows/pullRequest.yml b/.github/workflows/pullRequest.yml index 63a7913b..fc5b8577 100644 --- a/.github/workflows/pullRequest.yml +++ b/.github/workflows/pullRequest.yml @@ -23,12 +23,12 @@ jobs: - uses: nttld/setup-ndk@v1 with: - ndk-version: r26b + ndk-version: r27 - name: Setup JDK - uses: actions/setup-java@v4.0.0 + uses: actions/setup-java@v4 with: - java-version: 20 + java-version: 21 distribution: temurin - name: Cache Gradle dependencies @@ -58,7 +58,7 @@ jobs: - name: Build apk id: buildAllApks - uses: gradle/gradle-build-action@v3.0.0 + uses: gradle/gradle-build-action@v3 with: gradle-version: wrapper arguments: assembleDebug @@ -73,13 +73,13 @@ jobs: echo "::set-output name=json::$content" - name: Upload Artifact - uses: actions/upload-artifact@v4.3.0 + uses: actions/upload-artifact@v4 with: name: Debug Artifact path: app/build/outputs/apk/debug/app-debug.apk - name: Check if release already exists - uses: mukunku/tag-exists-action@v1.5.0 + uses: mukunku/tag-exists-action@v1.6.0 id: checkTag env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index 8d81632f..485accd3 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -1,6 +1,13 @@ + + + + - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 0a13859b..8e9caf3a 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,3 @@ -