From 86def8833243f8dbf9adb6a00a6faee0fed90e66 Mon Sep 17 00:00:00 2001 From: iamr0s <271257581@qq.com> Date: Wed, 9 Oct 2024 00:52:45 +0800 Subject: [PATCH] build: gradle version 8.10.2 --- app/build.gradle.kts | 7 ++++--- build.gradle.kts | 1 + gradle/libs.versions.toml | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 8038c38..ebaa8dd 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -80,9 +80,10 @@ android { } } - compileOptions { - targetCompatibility = JavaVersion.VERSION_17 - sourceCompatibility = JavaVersion.VERSION_17 + java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(17)) + } } kotlin { diff --git a/build.gradle.kts b/build.gradle.kts index c271305..9c46002 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { + alias(libs.plugins.toolchains.resolver) apply false alias(libs.plugins.agp.lib) apply false alias(libs.plugins.agp.app) apply false alias(libs.plugins.kotlin) apply false diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f9d5a6d..67cc1f3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -11,7 +11,7 @@ # https://androidx.dev/storage/compose-compiler/repository/ [versions] -agp = "8.6.1" +agp = "8.7.0" kotlin = "2.0.0" compose = "1.7.3" room = "2.6.1" @@ -20,6 +20,7 @@ rikka-shizuku = "13.1.5" koin = "3.5.6" [plugins] +toolchains-resolver = { id = "org.gradle.toolchains.foojay-resolver-convention", version = "0.4.0" } agp-lib = { id = "com.android.library", version.ref = "agp" } agp-app = { id = "com.android.application", version.ref = "agp" } kotlin = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }