Bump Gradle API to 8.0

^KT-55624 Fixed
This commit is contained in:
Yahor Berdnikau
2023-03-16 11:13:25 +01:00
committed by Space Team
parent 8d02a415b2
commit 19b0ffd85c
4 changed files with 12 additions and 23 deletions
@@ -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)
@@ -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<KotlinPlatformType> = setOf(jvm, androidJvm)