Bump Gradle API to 8.0
^KT-55624 Fixed
This commit is contained in:
committed by
Space Team
parent
8d02a415b2
commit
19b0ffd85c
@@ -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 {
|
||||
|
||||
@@ -2111,12 +2111,6 @@
|
||||
<sha256 value="ef21232955e314d621638b971da4ad786f04fe0cc608837d696bb2af3ec574ee" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="dev.gradleplugins" name="gradle-api" version="6.1">
|
||||
<artifact name="gradle-api-6.1.jar">
|
||||
<md5 value="22dfc96d7c3fd7d324d3fdc998a1bfd9" origin="Generated by Gradle"/>
|
||||
<sha256 value="30b79c1537c4b4b9ba816d026dfff48ddebaa8bc9f2bb716cc69066cea149c2b" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="dev.gradleplugins" name="gradle-api" version="6.9">
|
||||
<artifact name="gradle-api-6.9.jar">
|
||||
<md5 value="54b9007742dec27e80c6623d11e57ed4" origin="Generated by Gradle"/>
|
||||
@@ -2135,18 +2129,6 @@
|
||||
<sha256 value="584ba92aea00ffe3be168db491bc46bd004b3bfc8d3a5d1f55a086f2f8f77e8e" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="dev.gradleplugins" name="gradle-api" version="7.1.1">
|
||||
<artifact name="gradle-api-7.1.1.jar">
|
||||
<md5 value="41fcb06dc8e93297af85b50bf193ced0" origin="Generated by Gradle"/>
|
||||
<sha256 value="40dc5853f0bfac353b7d73739361a485512192950690be28ce3f736a04c500cb" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="dev.gradleplugins" name="gradle-api" version="7.2">
|
||||
<artifact name="gradle-api-7.2.jar">
|
||||
<md5 value="dce115967701cdcb0dd761dc46099061" origin="Generated by Gradle"/>
|
||||
<sha256 value="0b3e8478a8ed6bdb226941b313c1a06d50ef9d389d30cc82d7bc5985d94ed00f" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="dev.gradleplugins" name="gradle-api" version="7.4">
|
||||
<artifact name="gradle-api-7.4.jar">
|
||||
<md5 value="54f06ceb86b0618b31cdc6b26b5a106d" origin="https://repo1.maven.org/maven2/dev/gradleplugins/gradle-api/7.4/gradle-api-7.4.jar.md5"/>
|
||||
@@ -2165,6 +2147,12 @@
|
||||
<sha256 value="a2263280b9b9a7b9ce2c6a76905a2ad8948110d683e61429473b8e264858c474" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="dev.gradleplugins" name="gradle-api" version="8.0">
|
||||
<artifact name="gradle-api-8.0.jar">
|
||||
<md5 value="9a6c8f3ffbee711a917dfcfbcd8305f7" origin="Generated by Gradle"/>
|
||||
<sha256 value="62d5d15421cc4a5fd71a0d9ab711e9bb17c5160fb8c6e5a389278ef756e6b9b2" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="google" name="android_m2repository" version="r44">
|
||||
<artifact name="android_m2repository-r44.zip">
|
||||
<md5 value="7ba987b0caec8b0facfddd60851abb50" origin="Generated by Gradle"/>
|
||||
|
||||
+1
-4
@@ -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)
|
||||
|
||||
+4
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user