[Gradle] Compile Gradle plugins against Gradle API 8.5
^KT-65819 Fixed
This commit is contained in:
committed by
Space Team
parent
a6cdf27204
commit
e3b7366b10
@@ -1560,10 +1560,10 @@
|
||||
<sha256 value="ecc9aad0e1280afed3b22965292642ff640229bfd3e28f965251ba97f7bedc11" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="dev.gradleplugins" name="gradle-api" version="8.4">
|
||||
<artifact name="gradle-api-8.4.jar">
|
||||
<md5 value="a30d0712ecc5bdb2771e2e4021102636" origin="Generated by Gradle"/>
|
||||
<sha256 value="a4475365ae61377af0f14e8c227a4a18a9b8d3eec5ae29fdfd02390e2291addb" origin="Generated by Gradle"/>
|
||||
<component group="dev.gradleplugins" name="gradle-api" version="8.5">
|
||||
<artifact name="gradle-api-8.5.jar">
|
||||
<md5 value="2d94b3703027570df0e8c24137d89309" origin="Generated by Gradle"/>
|
||||
<sha256 value="a788daf0152784e96a3868a3e8bdc3cba105f37c379b20f6e688383457a51a43" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="google" name="android_m2repository" version="r44">
|
||||
@@ -3830,6 +3830,12 @@
|
||||
<sha256 value="55e989c512b80907799f854309f3bc7782c5b3d13932442d0379d5c472711504" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="1.9.20">
|
||||
<artifact name="kotlin-stdlib-1.9.20.jar">
|
||||
<md5 value="405681a02b165f82fc680133482b210c" origin="Generated by Gradle"/>
|
||||
<sha256 value="28a35bcdff46d864f80f346a617e486284b208d17378c41900dfb1de95a90e6c" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.jetbrains.kotlin" name="kotlin-stdlib-common" version="1.6.0">
|
||||
<artifact name="kotlin-stdlib-common-1.6.0.jar">
|
||||
<md5 value="05517b4cdeff2fc7c359a6148ac5dc38" origin="Generated by Gradle"/>
|
||||
|
||||
+1
@@ -32,6 +32,7 @@ internal class DefaultConfigurationCacheStartParameterAccessor(
|
||||
private val gradle: Gradle,
|
||||
) : ConfigurationCacheStartParameterAccessor {
|
||||
override val isConfigurationCacheRequested: Boolean by lazy {
|
||||
@Suppress("DEPRECATION") // TODO: will be fixed separately via KT-64355
|
||||
gradle.startParameter.isConfigurationCacheRequested
|
||||
}
|
||||
}
|
||||
|
||||
@@ -27,7 +27,6 @@ import org.gradle.api.tasks.compile.JavaCompile
|
||||
import org.gradle.jvm.tasks.Jar
|
||||
import org.gradle.jvm.toolchain.JavaToolchainService
|
||||
import org.gradle.kotlin.dsl.*
|
||||
import org.gradle.kotlin.dsl.support.uppercaseFirstChar
|
||||
import org.gradle.plugin.devel.plugins.JavaGradlePluginPlugin
|
||||
import org.gradle.plugin.devel.tasks.ValidatePlugins
|
||||
import org.jetbrains.dokka.DokkaVersion
|
||||
@@ -156,7 +155,7 @@ fun Project.createGradleCommonSourceSet(): SourceSet {
|
||||
|
||||
dependencies {
|
||||
compileOnlyConfigurationName(kotlinStdlib())
|
||||
"commonGradleApiCompileOnly"("dev.gradleplugins:gradle-api:8.4")
|
||||
"commonGradleApiCompileOnly"("dev.gradleplugins:gradle-api:8.5")
|
||||
if (this@createGradleCommonSourceSet.name !in testPlugins) {
|
||||
compileOnlyConfigurationName(project(":kotlin-gradle-plugin-api")) {
|
||||
capabilities {
|
||||
|
||||
Reference in New Issue
Block a user