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-356237] minor cosmetic fix

Browse Source 
GitOrigin-RevId: 7beba21d6b3167bd5d82542a8c4a0caa55c9c598
This commit is contained in:
Alexander.Glukhov
2024-07-16 11:01:46 +02:00
committed by intellij-monorepo-bot
parent 0f66b2d9db
commit 3ce1d38cb8
1 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,7 +63,7 @@ private fun getDaemonServicesAfter8Dot8(daemonClientFactory: DaemonClientFactory
)
val serviceLookupDelegate = getGradleServiceLookup()
val serviceLookup: Any = GradleServiceLookupProxy.newProxyInstance(serviceLookupDelegate)
val requestContext = getDaemonRequestContext()
val requestContext = getDaemonRequestContextAfter8Dot8()
return createBuildClientServicesMethod.invoke(
daemonClientFactory,
serviceLookup,
@@ -101,7 +101,7 @@ private fun getGradleServiceLookup(): GradleServiceLookup {
}
}
private fun getDaemonRequestContext(): Any {
private fun getDaemonRequestContextAfter8Dot8(): Any {
val requestContextClass = Class.forName("org.gradle.launcher.daemon.context.DaemonRequestContext")
val nativeServicesClass = Class.forName("org.gradle.internal.nativeintegration.services.NativeServices")
val nativeServicesModeClass = nativeServicesClass.declaredClasses.find { it.name.contains("NativeServicesMode") }
@@ -112,8 +112,23 @@ private fun getDaemonRequestContext(): Any {
}
val daemonJvmCriteriaClass = Class.forName("org.gradle.launcher.daemon.toolchain.DaemonJvmCriteria")
val nativeServiceModeValue = nativeServicesModeClass.enumConstants[2]
val isGradle88 = GradleVersionUtil.isCurrentGradleAtLeast("8.8") && GradleVersionUtil.isCurrentGradleOlderThan("8.9")
if (isGradle88) {
if (GradleVersionUtil.isCurrentGradleAtLeast("8.9")) {
val requestContextConstructor = requestContextClass.getDeclaredConstructor(
daemonJvmCriteriaClass,
Collection::class.java,
Boolean::class.java,
nativeServicesModeClass,
DaemonParameters.Priority::class.java
)
return requestContextConstructor.newInstance(
/*DaemonJvmCriteria*/ null,
/*daemonOpts*/ emptyList<String>(),
/*applyInstrumentationAgent*/ false,
/*nativeServicesMode*/ nativeServiceModeValue,
/*priority*/ DaemonParameters.Priority.NORMAL
)
}
else {
val requestContextConstructor = requestContextClass.getDeclaredConstructor(
JavaInfo::class.java,
daemonJvmCriteriaClass,
@@ -131,20 +146,4 @@ private fun getDaemonRequestContext(): Any {
/*priority*/ DaemonParameters.Priority.NORMAL
)
}
else {
val requestContextConstructor = requestContextClass.getDeclaredConstructor(
daemonJvmCriteriaClass,
Collection::class.java,
Boolean::class.java,
nativeServicesModeClass,
DaemonParameters.Priority::class.java
)
return requestContextConstructor.newInstance(
/*DaemonJvmCriteria*/ null,
/*daemonOpts*/ emptyList<String>(),
/*applyInstrumentationAgent*/ false,
/*nativeServicesMode*/ nativeServiceModeValue,
/*priority*/ DaemonParameters.Priority.NORMAL
)
}
}