chore(deps): update dependency gradle to v8 (#322)

* chore(deps): update dependency gradle to v8

* build: Fix build error on gradle 8.0

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: keta1 <k@ketal.icu>
This commit is contained in:
renovate[bot]
2023-02-14 12:35:33 +08:00
committed by GitHub
parent c9b152b007
commit 1e930d721c
6 changed files with 9 additions and 13 deletions

View File

@@ -23,7 +23,6 @@
@file:Suppress("UnstableApiUsage") @file:Suppress("UnstableApiUsage")
import com.android.build.gradle.BaseExtension import com.android.build.gradle.BaseExtension
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
plugins { plugins {
id("com.android.base") id("com.android.base")
@@ -48,13 +47,9 @@ extensions.findByType(BaseExtension::class)?.run {
targetCompatibility = Version.java targetCompatibility = Version.java
} }
kotlinOptions {
jvmTarget = Version.java.toString()
}
packagingOptions.jniLibs.useLegacyPackaging = false packagingOptions.jniLibs.useLegacyPackaging = false
} }
fun BaseExtension.kotlinOptions(block: KotlinJvmOptions.() -> Unit) { kotlin {
(this as ExtensionAware).extensions.configure("kotlinOptions", block) jvmToolchain(Version.java.toString().toInt())
} }

View File

@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

View File

@@ -20,8 +20,10 @@
* <https://github.com/cinit/QAuxiliary/blob/master/LICENSE.md>. * <https://github.com/cinit/QAuxiliary/blob/master/LICENSE.md>.
*/ */
@Suppress("DSL_SCOPE_VIOLATION")
plugins { plugins {
id("build-logic.root-project") id("build-logic.root-project")
alias(libs.plugins.kotlin.jvm) apply false
} }
tasks.register<Delete>("clean").configure { tasks.register<Delete>("clean").configure {

View File

@@ -40,4 +40,5 @@ sealedEnum-ksp = { module = "com.github.livefront.sealed-enum:ksp", version = "0
changelog = { id = "org.jetbrains.changelog", version = "2.0.0" } changelog = { id = "org.jetbrains.changelog", version = "2.0.0" }
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
license = { id = "com.jaredsburrows.license", version = "0.9.0" } license = { id = "com.jaredsburrows.license", version = "0.9.0" }
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }

View File

@@ -1,6 +1,6 @@
#Fri Dec 02 09:11:05 CST 2022 #Fri Dec 02 09:11:05 CST 2022
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

View File

@@ -1,5 +1,3 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins { plugins {
kotlin("jvm") kotlin("jvm")
} }
@@ -9,8 +7,8 @@ dependencies {
implementation(libs.kotlinpoet.ksp) implementation(libs.kotlinpoet.ksp)
} }
tasks.withType<KotlinCompile> { kotlin {
kotlinOptions.jvmTarget = Version.java.toString() jvmToolchain(Version.java.toString().toInt())
} }
tasks.withType<JavaCompile> { tasks.withType<JavaCompile> {