diff --git a/.github/workflows/buildCi.yml b/.github/workflows/buildCi.yml index 6bca4936..aa85f736 100644 --- a/.github/workflows/buildCi.yml +++ b/.github/workflows/buildCi.yml @@ -23,7 +23,7 @@ jobs: - name: Setup cmake uses: jwlawson/actions-setup-cmake@v2 with: - cmake-version: '3.31.6' + cmake-version: '4.0.2' - name: Setup Ninja run: sudo apt-get install ninja-build @@ -33,7 +33,7 @@ jobs: - uses: nttld/setup-ndk@v1 with: - ndk-version: r28 + ndk-version: r28b - name: Get Commit Message id: commitMessage @@ -90,7 +90,7 @@ jobs: - name: Sign artifact id: signArtifact - uses: ilharp/sign-android-release@v1.0.4 + uses: ilharp/sign-android-release@v2 with: releaseDir: app/build/outputs/apk/debug keyAlias: ${{ secrets.KEYALIAS }} diff --git a/.github/workflows/buildPro.yml b/.github/workflows/buildPro.yml index 71d3c18d..b74b5ba9 100644 --- a/.github/workflows/buildPro.yml +++ b/.github/workflows/buildPro.yml @@ -16,7 +16,7 @@ jobs: - name: Setup cmake uses: jwlawson/actions-setup-cmake@v2 with: - cmake-version: '3.31.6' + cmake-version: '4.0.2' - name: Setup Ninja run: sudo apt-get install ninja-build diff --git a/.github/workflows/buildRelease.yml b/.github/workflows/buildRelease.yml index f1d15de4..9eac8a2a 100644 --- a/.github/workflows/buildRelease.yml +++ b/.github/workflows/buildRelease.yml @@ -25,7 +25,7 @@ jobs: - name: Setup cmake uses: jwlawson/actions-setup-cmake@v2 with: - cmake-version: '3.31.6' + cmake-version: '4.0.2' - name: Setup Ninja run: sudo apt-get install ninja-build @@ -35,7 +35,7 @@ jobs: - uses: nttld/setup-ndk@v1 with: - ndk-version: r28 + ndk-version: r28b - name: Get Commit Message id: commitMessage @@ -94,7 +94,7 @@ jobs: - name: Sign artifact id: signArtifact - uses: ilharp/sign-android-release@v1 + uses: ilharp/sign-android-release@v2 with: releaseDir: app/build/outputs/apk/release keyAlias: ${{ secrets.KEYALIAS }} diff --git a/.github/workflows/deployToGoogle.yml b/.github/workflows/deployToGoogle.yml index bc4ed3bb..f6075217 100644 --- a/.github/workflows/deployToGoogle.yml +++ b/.github/workflows/deployToGoogle.yml @@ -25,7 +25,7 @@ jobs: - uses: nttld/setup-ndk@v1 with: - ndk-version: r28 + ndk-version: r28b - name: Setup JDK uses: actions/setup-java@v4 diff --git a/.github/workflows/pullRequest.yml b/.github/workflows/pullRequest.yml index 0efd786b..1d00e279 100644 --- a/.github/workflows/pullRequest.yml +++ b/.github/workflows/pullRequest.yml @@ -24,7 +24,7 @@ jobs: - name: Setup cmake uses: jwlawson/actions-setup-cmake@v2 with: - cmake-version: '3.31.6' + cmake-version: '4.0.2' - name: Setup Ninja run: sudo apt-get install ninja-build @@ -34,7 +34,7 @@ jobs: - uses: nttld/setup-ndk@v1 with: - ndk-version: r28 + ndk-version: r28b - name: Setup JDK uses: actions/setup-java@v4 diff --git a/.idea/AndroidProjectSystem.xml b/.idea/AndroidProjectSystem.xml new file mode 100644 index 00000000..4a53bee8 --- /dev/null +++ b/.idea/AndroidProjectSystem.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 94695869..d390bd5f 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,11 +1,6 @@ - - - - - - + \ No newline at end of file diff --git a/.idea/deviceManager.xml b/.idea/deviceManager.xml new file mode 100644 index 00000000..91f95584 --- /dev/null +++ b/.idea/deviceManager.xml @@ -0,0 +1,13 @@ + + + + + + \ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index b504339d..7338ebd7 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -7,10 +7,10 @@