From 5f77d644df3d4d9e560db1f5c5d45baaff950bfe Mon Sep 17 00:00:00 2001 From: Pun Butrach Date: Sun, 3 Aug 2025 19:20:43 +0700 Subject: [PATCH] build: Bump all dependencies across every ecosystems --- .github/workflows/build_pull_request.yml | 6 ++--- .github/workflows/release.yml | 4 +--- api/build.gradle.kts | 7 ++++-- app/build.gradle.kts | 12 +++++----- app/proguard-rules.pro | 7 +++++- gradle/libs.versions.toml | 28 ++++++++++++------------ gradle/wrapper/gradle-wrapper.properties | 4 ++-- 7 files changed, 36 insertions(+), 32 deletions(-) diff --git a/.github/workflows/build_pull_request.yml b/.github/workflows/build_pull_request.yml index c28a17f1..840ff110 100644 --- a/.github/workflows/build_pull_request.yml +++ b/.github/workflows/build_pull_request.yml @@ -4,7 +4,7 @@ on: workflow_dispatch: pull_request: branches: - - dev + - compose-dev jobs: release: @@ -13,11 +13,9 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 - with: - fetch-depth: 0 - name: Cache Gradle - uses: burrunan/gradle-cache-action@v1 + uses: burrunan/gradle-cache-action@v3 - name: Build env: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f5d3463c..73d23994 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,8 +18,6 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 - with: - fetch-depth: 0 - name: Setup Java uses: actions/setup-java@v4 @@ -28,7 +26,7 @@ jobs: java-version: '17' - name: Cache Gradle - uses: burrunan/gradle-cache-action@v1 + uses: burrunan/gradle-cache-action@v3 - name: Build env: diff --git a/api/build.gradle.kts b/api/build.gradle.kts index 137ab978..d3f7e5ac 100644 --- a/api/build.gradle.kts +++ b/api/build.gradle.kts @@ -1,3 +1,4 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget import java.io.IOException plugins { @@ -81,8 +82,10 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = "17" + kotlin { + compilerOptions { + jvmTarget = JvmTarget.fromTarget("17") + } } buildFeatures { diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 2de52228..795aa4bf 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,3 +1,4 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget import kotlin.random.Random plugins { @@ -199,8 +200,11 @@ android { arg("room.schemaLocation", "$projectDir/schemas") } - kotlinOptions { - jvmTarget = "17" + kotlin { + compilerOptions { + jvmTarget = JvmTarget.fromTarget("17") + jvmToolchain(17) + } } buildFeatures { @@ -223,10 +227,6 @@ android { } } -kotlin { - jvmToolchain(17) -} - tasks { // Needed by gradle-semantic-release-plugin. // Tracking: https://github.com/KengoTODA/gradle-semantic-release-plugin/issues/435. diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index b9b9c1af..eef01235 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -10,7 +10,12 @@ # Required for serialization to work properly -if @kotlinx.serialization.Serializable class ** -keepclassmembers class <1> { - static <1>$Companion Companion; + static <1>$* Companion; +} +-keepnames @kotlinx.serialization.internal.NamedCompanion class * +-if @kotlinx.serialization.internal.NamedCompanion class * +-keepclassmembernames class * { + static <1> *; } -if @kotlinx.serialization.Serializable class ** { static **$* *; diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a41ac459..cd5ac560 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,31 +1,31 @@ [versions] ktx = "1.16.0" material3 = "1.3.2" -ui-tooling = "1.8.1" -viewmodel-lifecycle = "2.9.0" +ui-tooling = "1.8.3" +viewmodel-lifecycle = "2.9.2" splash-screen = "1.0.1" activity = "1.10.1" -appcompat = "1.7.0" -preferences-datastore = "1.1.2" -work-runtime = "2.10.1" -compose-bom = "2025.05.00" -navigation = "2.8.6" -accompanist = "0.37.0" +appcompat = "1.7.1" +preferences-datastore = "1.1.7" +work-runtime = "2.10.3" +compose-bom = "2025.07.00" +navigation = "2.9.3" +accompanist = "0.37.3" placeholder = "1.1.2" -reorderable = "2.4.3" -serialization = "1.8.0" +reorderable = "2.5.1" +serialization = "1.9.0" collection = "0.3.8" datetime = "0.6.1" -room-version = "2.7.1" +room-version = "2.7.2" revanced-patcher = "21.0.0" revanced-library = "3.0.2" koin = "3.5.3" ktor = "2.3.9" markdown-renderer = "0.30.0" fading-edges = "1.0.4" -kotlin = "2.1.10" -android-gradle-plugin = "8.9.1" -dev-tools-gradle-plugin = "2.1.10-1.0.29" +kotlin = "2.2.0" +android-gradle-plugin = "8.11.1" +dev-tools-gradle-plugin = "2.2.0-2.0.2" about-libraries-gradle-plugin = "12.1.2" coil = "2.7.0" app-icon-loader-coil = "1.5.0" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 247cf2a9..3e781fba 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=61ad310d3c7d3e5da131b76bbf22b5a4c0786e9d892dae8c1658d4b484de3caa -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip +distributionSha256Sum=8fad3d78296ca518113f3d29016617c7f9367dc005f932bd9d93bf45ba46072b +distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME