Do not move resource directories to the end of classpath (#1101)

JetBrains · Sep 20, 2022 · 601bd74 · 601bd74
1 parent 47983d6
commit 601bd74
Showing 1 changed file with 9 additions and 21 deletions.
diff --git a/src/main/kotlin/org/jetbrains/intellij/IntelliJPlugin.kt b/src/main/kotlin/org/jetbrains/intellij/IntelliJPlugin.kt
@@ -3,6 +3,7 @@
 package org.jetbrains.intellij
 
 import com.jetbrains.plugin.structure.base.utils.hasExtension
+import com.jetbrains.plugin.structure.base.utils.isDirectory
 import com.jetbrains.plugin.structure.base.utils.isJar
 import com.jetbrains.plugin.structure.intellij.version.IdeVersion
 import org.gradle.api.GradleException
@@ -38,9 +39,7 @@ import org.gradle.tooling.BuildException
 import org.jetbrains.gradle.ext.IdeaExtPlugin
 import org.jetbrains.gradle.ext.ProjectSettings
 import org.jetbrains.gradle.ext.TaskTriggersConfig
-import org.jetbrains.intellij.BuildFeature.NO_SEARCHABLE_OPTIONS_WARNING
-import org.jetbrains.intellij.BuildFeature.PAID_PLUGIN_SEARCHABLE_OPTIONS_WARNING
-import org.jetbrains.intellij.BuildFeature.SELF_UPDATE_CHECK
+import org.jetbrains.intellij.BuildFeature.*
 import org.jetbrains.intellij.IntelliJPluginConstants.PLATFORM_TYPE_ANDROID_STUDIO
 import org.jetbrains.intellij.IntelliJPluginConstants.PLATFORM_TYPE_CLION
 import org.jetbrains.intellij.IntelliJPluginConstants.PLATFORM_TYPE_INTELLIJ_COMMUNITY
@@ -49,31 +48,20 @@ import org.jetbrains.intellij.IntelliJPluginConstants.PLATFORM_TYPE_PYCHARM
 import org.jetbrains.intellij.IntelliJPluginConstants.PLATFORM_TYPE_RIDER
 import org.jetbrains.intellij.IntelliJPluginConstants.RELEASE_SUFFIX_EAP_CANDIDATE
 import org.jetbrains.intellij.IntelliJPluginConstants.RELEASE_SUFFIX_SNAPSHOT
-import org.jetbrains.intellij.dependency.IdeaDependency
-import org.jetbrains.intellij.dependency.IdeaDependencyManager
-import org.jetbrains.intellij.dependency.PluginDependency
-import org.jetbrains.intellij.dependency.PluginDependencyManager
-import org.jetbrains.intellij.dependency.PluginDependencyNotation
-import org.jetbrains.intellij.dependency.PluginProjectDependency
+import org.jetbrains.intellij.dependency.*
 import org.jetbrains.intellij.jbr.JbrResolver
 import org.jetbrains.intellij.model.MavenMetadata
 import org.jetbrains.intellij.model.XmlExtractor
 import org.jetbrains.intellij.performanceTest.ProfilerName
 import org.jetbrains.intellij.pluginRepository.PluginRepositoryFactory
 import org.jetbrains.intellij.tasks.*
-import org.jetbrains.intellij.utils.ArchiveUtils
-import org.jetbrains.intellij.utils.DependenciesDownloader
-import org.jetbrains.intellij.utils.LatestVersionResolver
-import org.jetbrains.intellij.utils.OpenedPackages
-import org.jetbrains.intellij.utils.getAndroidStudioReleases
-import org.jetbrains.intellij.utils.ivyRepository
-import org.jetbrains.intellij.utils.mavenRepository
+import org.jetbrains.intellij.utils.*
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import java.io.File
 import java.net.URL
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
-import java.util.EnumSet
+import java.util.*
 import java.util.jar.Manifest
 
 @Suppress("UnstableApiUsage")
@@ -116,7 +104,7 @@ open class IntelliJPlugin : Plugin<Project> {
                 if (!localPath.isPresent) {
                     throw GradleException(
                         "The value for the 'intellij.version' property was not specified, " +
-                            "see: https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#intellij-extension-version"
+                                "see: https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#intellij-extension-version"
                     )
                 }
                 null
@@ -235,8 +223,8 @@ open class IntelliJPlugin : Plugin<Project> {
                     if (it.dependencyId == "com.intellij.modules.java") {
                         throw BuildException(
                             "The project depends on 'com.intellij.modules.java' module but doesn't declare a compile dependency on it.\n " +
-                                "Please delete 'depends' tag from '${file.canonicalPath}' or add 'java' plugin to Gradle dependencies " +
-                                "(e.g. intellij { plugins = ['java'] })",
+                                    "Please delete 'depends' tag from '${file.canonicalPath}' or add 'java' plugin to Gradle dependencies " +
+                                    "(e.g. intellij { plugins = ['java'] })",
                             null,
                         )
                     }
@@ -1169,7 +1157,7 @@ open class IntelliJPlugin : Plugin<Project> {
             task.doFirst {
                 task.jvmArgs = getIdeJvmArgs(task, task.jvmArgs, ideDirProvider.get()) + OpenedPackages
                 task.classpath += ideaDependencyLibrariesProvider.get()
-                task.classpath -= task.classpath.filter { !it.toPath().isJar() }
+                task.classpath -= task.classpath.filter { !it.toPath().isDirectory && !it.toPath().isJar() }
 
                 // Rearrange classpath to put idea and plugins in the right order.
                 task.classpath -= ideaConfigurationFiles.get()