MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-08 15:09:39 +07:00
Code Issues Packages Projects Releases Wiki Activity

[gradle][IDEA-357700] Gradle TAPI 8.10

Browse Source 
GitOrigin-RevId: e5bdd2e6914ebd956c88bed98d8b9cf87df6f0ef
This commit is contained in:
Alexander.Glukhov
2024-08-20 10:36:34 +02:00
committed by intellij-monorepo-bot
parent 5fe65b9d43
commit 935c50be78
4 changed files with 33 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.idea/libraries/Gradle.xml generated
View File

@@ -1,9 +1,9 @@
<component name="libraryTable">
<library name="Gradle" type="repository">
<properties maven-id="org.jetbrains.intellij.deps:gradle-api:8.9">
<properties maven-id="org.jetbrains.intellij.deps:gradle-api:8.10">
<verification>
<artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/gradle-api/8.9/gradle-api-8.9.jar">
<sha256sum>986ee000ce8a9c32318428af43d5a159fe4e77a06a908f7aed905109ab815de6</sha256sum>
<artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/gradle-api/8.10/gradle-api-8.10.jar">
<sha256sum>fb4396fe3c6abf4cae1e753a8d1b28180d09c3e4fbd0cf46c2cae847483e6c5b</sha256sum>
</artifact>
</verification>
</properties>
@@ -11,7 +11,7 @@
<root url="file://$PROJECT_DIR$/plugins/gradle/anno" />
</ANNOTATIONS>
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/gradle-api/8.9/gradle-api-8.9.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/gradle-api/8.10/gradle-api-8.10.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />

2
plugins/gradle/plugin-content.yaml
View File

@@ -154,7 +154,7 @@
files:
- name: $PROJECT_DIR$/community/lib/ant/lib/ant.jar
reason: withProjectLibrary
- name: lib/gradle-api-8.9.jar
- name: lib/gradle-api-8.10.jar
projectLibraries:
- name: Gradle
files:

32
plugins/gradle/src/org/jetbrains/plugins/gradle/internal/daemon/DaemonServicesFactory.kt
View File

@@ -10,6 +10,7 @@ import org.gradle.internal.logging.events.OutputEventListener
import org.gradle.internal.service.ServiceRegistry
import org.gradle.launcher.daemon.client.DaemonClientFactory
import org.gradle.launcher.daemon.configuration.DaemonParameters
import org.gradle.launcher.daemon.configuration.DaemonPriority
import org.gradle.util.GradleVersion
import java.io.ByteArrayInputStream
import java.io.File
@@ -112,20 +113,41 @@ private fun getDaemonRequestContextAfter8Dot8(): Any {
}
val daemonJvmCriteriaClass = Class.forName("org.gradle.launcher.daemon.toolchain.DaemonJvmCriteria")
val nativeServiceModeValue = nativeServicesModeClass.enumConstants[2]
if (GradleVersionUtil.isCurrentGradleAtLeast("8.9")) {
if (GradleVersionUtil.isCurrentGradleAtLeast("8.10")) {
val requestContextConstructor = requestContextClass.getDeclaredConstructor(
daemonJvmCriteriaClass,
Collection::class.java,
Boolean::class.java,
nativeServicesModeClass,
DaemonParameters.Priority::class.java
DaemonPriority::class.java
)
return requestContextConstructor.newInstance(
/*DaemonJvmCriteria*/ null,
/*daemonOpts*/ emptyList<String>(),
/*applyInstrumentationAgent*/ false,
/*nativeServicesMode*/ nativeServiceModeValue,
/*priority*/ DaemonParameters.Priority.NORMAL
/*priority*/ DaemonPriority.NORMAL
)
}
val legacyDaemonPriorityClass = Class.forName("org.gradle.launcher.daemon.configuration.DaemonParameters\$Priority")
if (!legacyDaemonPriorityClass.isEnum) {
throw IllegalStateException("DaemonParameters.Priority is expected to be a Enum. Gradle version: ${GradleVersion.current()}")
}
val normalDaemonPriority = legacyDaemonPriorityClass.enumConstants[1]
if (GradleVersionUtil.isCurrentGradleAtLeast("8.9")) {
val requestContextConstructor = requestContextClass.getDeclaredConstructor(
daemonJvmCriteriaClass,
Collection::class.java,
Boolean::class.java,
nativeServicesModeClass,
legacyDaemonPriorityClass
)
return requestContextConstructor.newInstance(
/*DaemonJvmCriteria*/ null,
/*daemonOpts*/ emptyList<String>(),
/*applyInstrumentationAgent*/ false,
/*nativeServicesMode*/ nativeServiceModeValue,
/*priority*/ normalDaemonPriority
)
}
else {
@@ -135,7 +157,7 @@ private fun getDaemonRequestContextAfter8Dot8(): Any {
Collection::class.java,
Boolean::class.java,
nativeServicesModeClass,
DaemonParameters.Priority::class.java
legacyDaemonPriorityClass
)
return requestContextConstructor.newInstance(
/*JavaInfo*/ null,
@@ -143,7 +165,7 @@ private fun getDaemonRequestContextAfter8Dot8(): Any {
/*daemonOpts*/ emptyList<String>(),
/*applyInstrumentationAgent*/ false,
/*nativeServicesMode*/ nativeServiceModeValue,
/*priority*/ DaemonParameters.Priority.NORMAL
/*priority*/ normalDaemonPriority
)
}
}

2
plugins/gradle/testSources/org/jetbrains/plugins/gradle/util/GradleJvmSupportMatricesTest.kt
View File

@@ -10,7 +10,7 @@ class GradleJvmSupportMatricesTest : GradleJvmSupportMatricesTestCase() {
private const val FUTURE_GRADLE_VERSION = "100.0"
private const val LATEST_SUPPORTED_JAVA_VERSION = 22
private const val FUTURE_JAVA_VERSION = 100
private const val BUNDLED_GRADLE_VERSION = "8.9"
private const val BUNDLED_GRADLE_VERSION = "8.10"
private const val LATEST_GRADLE_VERSION = "8.10"
}