Use Plugin Verifier libraries to resolve the bundled plugin classpath

Author: hsz

CHANGELOG.md

@@ -18,7 +18,8 @@
 - Load the `com.intellij` module by default when creating the IntelliJ Platform dependency
 - Load the `com.intellij` module with its optional dependencies for tests classpath as a cleaner fix for [IJPL-180516](https://youtrack.jetbrains.com/issue/IJPL-180516/Gradle-tests-fail-without-transitive-modules-jars-of-com.intellij-in-classpath)
 - Store `localPlatformArtifacts` Ivy XML files within the version-based subdirectory
-- Deprecate Writerside (WRS) as a target IntelliJ Platform.
+- Deprecate Writerside (WRS) as a target IntelliJ Platform
+- Use Plugin Verifier libraries to resolve the bundled plugin classpath
 
 ### Fixed
 

src/main/kotlin/org/jetbrains/intellij/platform/gradle/extensions/IntelliJPlatformDependenciesHelper.kt

@@ -812,11 +812,11 @@ class IntelliJPlatformDependenciesHelper(
      * @param id The ID of the bundled module.
      */
     private fun DependencyHandler.createIntelliJPlatformBundledModule(id: String): Dependency {
-        val bundledModule = productInfo.layout
-            .find { layout -> layout.name == id }
+        val bundledModule = ideProvider.get().findPluginById(id)
             .let { requireNotNull(it) { "Specified bundledModule '$id' doesn't exist." } }
+        val classpath = bundledModule.classpath.paths.map { it.pathString }
 
-        val (group, name, version) = writeBundledModuleDependency(id, bundledModule.classPath)
+        val (group, name, version) = writeBundledModuleDependency(id, classpath)
         return create(group, name, version)
     }