Make it possible to import project into IDEA
diff --git a/buildSrc/src/main/kotlin/localDependencies.kt b/buildSrc/src/main/kotlin/localDependencies.kt index 9fb3321..05dba4b 100644 --- a/buildSrc/src/main/kotlin/localDependencies.kt +++ b/buildSrc/src/main/kotlin/localDependencies.kt
@@ -62,6 +62,13 @@ artifact("[organisation]/sources/[artifact]-[revision](-[classifier]).[ext]") artifact("[organisation]/[module]/[revision]/[artifact](-[classifier]).[ext]") artifact("[organisation]/intellij-core/[revision]/artifacts/[artifact](-[classifier]).[ext]") + + artifact("[organisation]/[module]/202.7660.26/artifacts/lib/[artifact](-[classifier]).[ext]") + artifact("[organisation]/[module]/202.7660.26/artifacts/[artifact](-[classifier]).[ext]") + artifact("[organisation]/${project.ideModuleName()}/202.7660.26/artifacts/plugins/[module]/lib/[artifact](-[classifier]).[ext]") // bundled plugins + artifact("[organisation]/sources/[artifact]-202.7660.26(-[classifier]).[ext]") + artifact("[organisation]/[module]/202.7660.26/[artifact](-[classifier]).[ext]") + artifact("[organisation]/intellij-core/202.7660.26/artifacts/[artifact](-[classifier]).[ext]") } metadataSources {
diff --git a/generators/iml-to-gradle-generator/testResources/ideaIU-project-structure-mapping.json b/generators/iml-to-gradle-generator/testResources/ideaIU-project-structure-mapping.json index 81885ea..b5f8592 100644 --- a/generators/iml-to-gradle-generator/testResources/ideaIU-project-structure-mapping.json +++ b/generators/iml-to-gradle-generator/testResources/ideaIU-project-structure-mapping.json
@@ -365,21 +365,6 @@ "type": "module-output" }, { - "moduleName": "intellij.xml.dom", - "path": "lib/openapi.jar", - "type": "module-output" - }, - { - "moduleName": "intellij.platform.webide", - "path": "lib/openapi.jar", - "type": "module-output" - }, - { - "moduleName": "intellij.platform.graph", - "path": "lib/openapi.jar", - "type": "module-output" - }, - { "moduleName": "intellij.platform.commercial.license", "path": "lib/idea.jar", "type": "module-output"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2dfd4cd..0477454 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@ +#Fri Mar 26 21:01:50 CET 2021 distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip -distributionSha256Sum=8ad57759019a9233dc7dc4d1a530cefe109dc122000d57f7e623f8cf4ba9dfc4 -zipStoreBase=GRADLE_USER_HOME +distributionPath=wrapper/dists zipStorePath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME
diff --git a/kotlin-ide/compiler-plugins/annotation-based-compiler-support/build.gradle.kts b/kotlin-ide/compiler-plugins/annotation-based-compiler-support/build.gradle.kts index 44e50de..9ed4bb4 100644 --- a/kotlin-ide/compiler-plugins/annotation-based-compiler-support/build.gradle.kts +++ b/kotlin-ide/compiler-plugins/annotation-based-compiler-support/build.gradle.kts
@@ -46,7 +46,6 @@ jpsLikeJarDependency(intellijPluginDep("maven-model", forIde = true), JpsDepScope.COMPILE) // Exported transitive dependency jpsLikeJarDependency("org.jetbrains.intellij.deps:trove4j:1.0.20200330", JpsDepScope.COMPILE) // Exported transitive dependency jpsLikeJarDependency(intellijDep(forIde = true), JpsDepScope.COMPILE, { includeJars("dom-openapi") }) // Exported transitive dependency - jpsLikeJarDependency(intellijDep(forIde = true), JpsDepScope.COMPILE, { includeJars("openapi") }) // Exported transitive dependency jpsLikeJarDependency("org.jetbrains:annotations-java5:20.1.0", JpsDepScope.COMPILE) // Exported transitive dependency jpsLikeJarDependency(intellijDep(forIde = true), JpsDepScope.COMPILE, { includeJars("platform-ide-util-io") }) // Exported transitive dependency jpsLikeJarDependency(intellijDep(forIde = true), JpsDepScope.COMPILE, { includeJars("resources") }) // Exported transitive dependency
diff --git a/kotlin-ide/maven/build.gradle.kts b/kotlin-ide/maven/build.gradle.kts index 602f180..f045571 100644 --- a/kotlin-ide/maven/build.gradle.kts +++ b/kotlin-ide/maven/build.gradle.kts
@@ -65,7 +65,6 @@ jpsLikeJarDependency(intellijPluginDep("maven-model", forIde = true), JpsDepScope.COMPILE) // Exported transitive dependency jpsLikeJarDependency("org.jetbrains.intellij.deps:trove4j:1.0.20200330", JpsDepScope.COMPILE) // Exported transitive dependency jpsLikeJarDependency(intellijDep(forIde = true), JpsDepScope.COMPILE, { includeJars("dom-openapi") }) // Exported transitive dependency - jpsLikeJarDependency(intellijDep(forIde = true), JpsDepScope.COMPILE, { includeJars("openapi") }) // Exported transitive dependency jpsLikeJarDependency("org.jetbrains:annotations-java5:20.1.0", JpsDepScope.COMPILE) // Exported transitive dependency jpsLikeJarDependency(intellijDep(forIde = true), JpsDepScope.COMPILE, { includeJars("platform-statistics") }) // Exported transitive dependency jpsLikeJarDependency(intellijDep(forIde = true), JpsDepScope.COMPILE, { includeJars("external-system-rt") }) // Exported transitive dependency
diff --git a/kotlin-ide/project-wizard/idea/build.gradle.kts b/kotlin-ide/project-wizard/idea/build.gradle.kts index b9f9fc4..4ab2a5f 100644 --- a/kotlin-ide/project-wizard/idea/build.gradle.kts +++ b/kotlin-ide/project-wizard/idea/build.gradle.kts
@@ -69,7 +69,6 @@ jpsLikeJarDependency(intellijPluginDep("maven-model", forIde = true), JpsDepScope.COMPILE) // Exported transitive dependency jpsLikeJarDependency("org.jetbrains.intellij.deps:trove4j:1.0.20200330", JpsDepScope.COMPILE) // Exported transitive dependency jpsLikeJarDependency(intellijDep(forIde = true), JpsDepScope.COMPILE, { includeJars("dom-openapi") }) // Exported transitive dependency - jpsLikeJarDependency(intellijDep(forIde = true), JpsDepScope.COMPILE, { includeJars("openapi") }) // Exported transitive dependency jpsLikeJarDependency("org.jetbrains:annotations-java5:20.1.0", JpsDepScope.COMPILE) // Exported transitive dependency jpsLikeJarDependency(intellijDep(forIde = true), JpsDepScope.COMPILE, { includeJars("platform-statistics") }) // Exported transitive dependency jpsLikeJarDependency(intellijDep(forIde = true), JpsDepScope.COMPILE, { includeJars("external-system-rt") }) // Exported transitive dependency