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:
@@ -23,7 +23,6 @@
|
||||
@file:Suppress("UnstableApiUsage")
|
||||
|
||||
import com.android.build.gradle.BaseExtension
|
||||
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
|
||||
|
||||
plugins {
|
||||
id("com.android.base")
|
||||
@@ -48,13 +47,9 @@ extensions.findByType(BaseExtension::class)?.run {
|
||||
targetCompatibility = Version.java
|
||||
}
|
||||
|
||||
kotlinOptions {
|
||||
jvmTarget = Version.java.toString()
|
||||
}
|
||||
|
||||
packagingOptions.jniLibs.useLegacyPackaging = false
|
||||
}
|
||||
|
||||
fun BaseExtension.kotlinOptions(block: KotlinJvmOptions.() -> Unit) {
|
||||
(this as ExtensionAware).extensions.configure("kotlinOptions", block)
|
||||
kotlin {
|
||||
jvmToolchain(Version.java.toString().toInt())
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
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
|
||||
zipStorePath=wrapper/dists
|
||||
|
||||
@@ -20,8 +20,10 @@
|
||||
* <https://github.com/cinit/QAuxiliary/blob/master/LICENSE.md>.
|
||||
*/
|
||||
|
||||
@Suppress("DSL_SCOPE_VIOLATION")
|
||||
plugins {
|
||||
id("build-logic.root-project")
|
||||
alias(libs.plugins.kotlin.jvm) apply false
|
||||
}
|
||||
|
||||
tasks.register<Delete>("clean").configure {
|
||||
|
||||
@@ -40,4 +40,5 @@ sealedEnum-ksp = { module = "com.github.livefront.sealed-enum:ksp", version = "0
|
||||
changelog = { id = "org.jetbrains.changelog", version = "2.0.0" }
|
||||
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
|
||||
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" }
|
||||
|
||||
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,6 +1,6 @@
|
||||
#Fri Dec 02 09:11:05 CST 2022
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
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
|
||||
zipStorePath=wrapper/dists
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
|
||||
|
||||
plugins {
|
||||
kotlin("jvm")
|
||||
}
|
||||
@@ -9,8 +7,8 @@ dependencies {
|
||||
implementation(libs.kotlinpoet.ksp)
|
||||
}
|
||||
|
||||
tasks.withType<KotlinCompile> {
|
||||
kotlinOptions.jvmTarget = Version.java.toString()
|
||||
kotlin {
|
||||
jvmToolchain(Version.java.toString().toInt())
|
||||
}
|
||||
|
||||
tasks.withType<JavaCompile> {
|
||||
|
||||
Reference in New Issue
Block a user