diff --git a/buildSrc/src/main/kotlin/GradleCommon.kt b/buildSrc/src/main/kotlin/GradleCommon.kt index 0b6c4f19f59..f62f7d9244d 100644 --- a/buildSrc/src/main/kotlin/GradleCommon.kt +++ b/buildSrc/src/main/kotlin/GradleCommon.kt @@ -124,7 +124,7 @@ fun Project.createGradleCommonSourceSet(): SourceSet { dependencies { compileOnlyConfigurationName(kotlinStdlib()) - "commonGradleApiCompileOnly"("dev.gradleplugins:gradle-api:7.6") + "commonGradleApiCompileOnly"("dev.gradleplugins:gradle-api:8.0") if (this@createGradleCommonSourceSet.name !in testPlugins) { compileOnlyConfigurationName(project(":kotlin-gradle-plugin-api")) { capabilities { diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index ba4bd5378d7..a62eb3905d4 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -2111,12 +2111,6 @@ - - - - - - @@ -2135,18 +2129,6 @@ - - - - - - - - - - - - @@ -2165,6 +2147,12 @@ + + + + + + diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/KotlinToolRunner.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/KotlinToolRunner.kt index 6db7f011e07..04354742248 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/KotlinToolRunner.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/KotlinToolRunner.kt @@ -13,7 +13,6 @@ import org.gradle.api.model.ObjectFactory import org.gradle.process.ExecOperations import org.gradle.process.ExecResult import org.gradle.process.JavaExecSpec -import org.gradle.util.GradleVersion import org.jetbrains.kotlin.konan.target.HostManager import java.io.File import java.lang.reflect.InvocationTargetException @@ -159,9 +158,7 @@ abstract class KotlinToolRunner( ) executionContext.javaexec { spec -> - @Suppress("DEPRECATION") - if (GradleVersion.current() >= GradleVersion.version("7.0")) spec.mainClass.set(mainClass) - else spec.main = mainClass + spec.mainClass.set(mainClass) spec.classpath = classpath spec.jvmArgs(jvmArgs) spec.systemProperties(systemProperties) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinUsages.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinUsages.kt index a4de2c6f430..5cdd111d3a5 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinUsages.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinUsages.kt @@ -23,6 +23,10 @@ object KotlinUsages { const val KOTLIN_CINTEROP = "kotlin-cinterop" const val KOTLIN_SOURCES = "kotlin-sources" + // Following two constants were removed in Gradle 8.0 from 'Usages' class + private const val JAVA_RUNTIME_CLASSES = "java-runtime-classes" + private const val JAVA_RUNTIME_RESOURCES = "java-runtime-resources" + val values = setOf(KOTLIN_API, KOTLIN_RUNTIME) private val jvmPlatformTypes: Set = setOf(jvm, androidJvm)