diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index d9e10c0..f40928c 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -19,19 +19,19 @@ jobs: RELEASE_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 with: fetch-depth: 0 submodules: true - name: Set up JDK 21 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: java-version: "21" distribution: "temurin" cache: gradle - - uses: actions/cache@v4 + - uses: actions/cache@v6 with: path: | ~/.gradle/caches @@ -40,7 +40,7 @@ jobs: key: gradle-deps-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} restore-keys: gradle-deps- - - uses: actions/cache@v4 + - uses: actions/cache@v6 with: path: | ~/.gradle/caches/build-cache-* @@ -98,19 +98,19 @@ jobs: RELEASE_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 with: fetch-depth: 0 submodules: true - name: Set up JDK 21 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: java-version: "21" distribution: "temurin" cache: gradle - - uses: actions/cache@v4 + - uses: actions/cache@v6 with: path: | ~/.gradle/caches @@ -119,7 +119,7 @@ jobs: key: gradle-deps-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} restore-keys: gradle-deps- - - uses: actions/cache@v4 + - uses: actions/cache@v6 with: path: | ~/.gradle/caches/build-cache-* diff --git a/.github/workflows/renovate-check.yml b/.github/workflows/renovate-check.yml index 3d38b4d..6f6dc7b 100644 --- a/.github/workflows/renovate-check.yml +++ b/.github/workflows/renovate-check.yml @@ -11,19 +11,19 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 with: fetch-depth: 0 submodules: true - name: Set up JDK 21 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: java-version: "21" distribution: "temurin" cache: gradle - - uses: actions/cache@v4 + - uses: actions/cache@v6 with: path: | ~/.gradle/caches @@ -32,7 +32,7 @@ jobs: key: gradle-deps-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} restore-keys: gradle-deps- - - uses: actions/cache@v4 + - uses: actions/cache@v6 with: path: | ~/.gradle/caches/build-cache-* diff --git a/app/build.gradle.kts b/app/build.gradle.kts index f346153..c31df3f 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -106,6 +106,17 @@ android { buildConfig = true } + packaging { + resources { + excludes += listOf( + "META-INF/LICENSE.md", + "META-INF/LICENSE", + "META-INF/NOTICE.md", + "META-INF/NOTICE", + ) + } + } + externalNativeBuild { cmake { path = file("src/main/jni/CMakeLists.txt") diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3d96e36..fc23863 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,8 +1,8 @@ [versions] agp = "9.2.1" -bcpkixJdk18on = "1.84" +bcpkixJdk18on = "1.85" boringssl = "20251124" -conscryptAndroid = "2.5.3" +conscryptAndroid = "2.6.1" datastorePreferences = "1.2.1" kotlin = "2.4.0" kotlinx-serialization = "1.11.0"