diff --git a/libraries/pom.xml b/libraries/pom.xml index 0e2c9a13d93..cb91757afa7 100644 --- a/libraries/pom.xml +++ b/libraries/pom.xml @@ -100,8 +100,6 @@ tools/kotlin-annotation-processing examples/annotation-processor-example tools/kotlin-gradle-plugin - tools/kotlin-gradle-plugin-core - tools/kotlin-gradle-plugin-dsl tools/kotlin-gradle-plugin-api tools/kotlin-android-extensions tools/kotlin-maven-plugin-test diff --git a/libraries/tools/kotlin-gradle-plugin-core/.gitignore b/libraries/tools/kotlin-gradle-plugin-core/.gitignore deleted file mode 100644 index b97b22398a9..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-core/.gitignore +++ /dev/null @@ -1 +0,0 @@ -local-repo diff --git a/libraries/tools/kotlin-gradle-plugin-core/pom.xml b/libraries/tools/kotlin-gradle-plugin-core/pom.xml deleted file mode 100644 index aeddd4f57e1..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-core/pom.xml +++ /dev/null @@ -1,117 +0,0 @@ - - - - - 4.0.0 - - 3.0.4 - - - - org.jetbrains.kotlin - kotlin-project - 1.1-SNAPSHOT - ../../pom.xml - - - kotlin-gradle-plugin-core - jar - - - - commons-io - commons-io - 2.4 - - - org.jetbrains.kotlin - kotlin-gradle-plugin-api - ${project.version} - provided - - - org.jetbrains.kotlin - kotlin-gradle-plugin-dsl - ${project.version} - - - commons-lang - commons-lang - 2.6 - - - org.jetbrains.kotlin - gradle-api - 2.2 - provided - - - org.jetbrains.kotlin - kotlin-compiler-embeddable - ${project.version} - - - org.jetbrains.kotlin - kotlin-annotation-processing - ${project.version} - - - org.jetbrains.kotlin - kotlin-stdlib - ${project.version} - - - - - - ${project.basedir}/src/main/kotlin - ${project.basedir}/src/test/kotlin - - - - ${project.basedir}/src/main/resources - - - - - - kotlin-maven-plugin - org.jetbrains.kotlin - ${project.version} - - - - compile - compile - compile - - - - test-compile - test-compile - test-compile - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.19.1 - - - src/test/resources/** - - - - - - - - - jetbrains-utils - http://repository.jetbrains.com/utils - - - diff --git a/libraries/tools/kotlin-gradle-plugin-dsl/.gitignore b/libraries/tools/kotlin-gradle-plugin-dsl/.gitignore deleted file mode 100644 index b97b22398a9..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-dsl/.gitignore +++ /dev/null @@ -1 +0,0 @@ -local-repo diff --git a/libraries/tools/kotlin-gradle-plugin-dsl/pom.xml b/libraries/tools/kotlin-gradle-plugin-dsl/pom.xml deleted file mode 100644 index ea262694cb0..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-dsl/pom.xml +++ /dev/null @@ -1,116 +0,0 @@ - - - - - 4.0.0 - - 3.0.4 - - - - org.jetbrains.kotlin - kotlin-project - 0.1-SNAPSHOT - ../../pom.xml - - - kotlin-gradle-plugin-dsl - jar - - - - org.jetbrains.kotlin - kotlin-gradle-plugin-api - ${project.version} - provided - - - org.jetbrains.kotlin - gradle-api - 2.2 - provided - - - org.jetbrains.kotlin - kotlin-compiler-embeddable - ${project.version} - - - org.jetbrains.kotlin - kotlin-stdlib - ${project.version} - - - - - - ${project.basedir}/src/main/kotlin - ${project.basedir}/src/test/kotlin - - - - ${project.basedir}/src/main/resources - - - - - - kotlin-maven-plugin - org.jetbrains.kotlin - ${project.version} - - - - compile - compile - compile - - - - - org.jetbrains.dokka - dokka-maven-plugin - 0.9.9 - - - pre-site - - dokka - - - - - markdown - - - ${project.basedir}/Module.md - - - - - ${project.basedir}/src/main/kotlin - http://github.com/me/myrepo - - - - - - - - - - jetbrains-utils - http://repository.jetbrains.com/utils - - - - - - jcenter - JCenter - https://jcenter.bintray.com/ - - - diff --git a/libraries/tools/kotlin-gradle-plugin-dsl/Module.md b/libraries/tools/kotlin-gradle-plugin/Module.md similarity index 98% rename from libraries/tools/kotlin-gradle-plugin-dsl/Module.md rename to libraries/tools/kotlin-gradle-plugin/Module.md index 1cf9b630149..a47cfce5328 100644 --- a/libraries/tools/kotlin-gradle-plugin-dsl/Module.md +++ b/libraries/tools/kotlin-gradle-plugin/Module.md @@ -1,4 +1,4 @@ -# Module kotlin-gradle-plugin-dsl +# Module kotlin-gradle-plugin `kotlin-gradle-plugin` artifact provides multiple plugins. diff --git a/libraries/tools/kotlin-gradle-plugin-core/gradle_api_jar/.gitignore b/libraries/tools/kotlin-gradle-plugin/gradle_api_jar/.gitignore similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-core/gradle_api_jar/.gitignore rename to libraries/tools/kotlin-gradle-plugin/gradle_api_jar/.gitignore diff --git a/libraries/tools/kotlin-gradle-plugin-core/gradle_api_jar/README.txt b/libraries/tools/kotlin-gradle-plugin/gradle_api_jar/README.txt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-core/gradle_api_jar/README.txt rename to libraries/tools/kotlin-gradle-plugin/gradle_api_jar/README.txt diff --git a/libraries/tools/kotlin-gradle-plugin-core/gradle_api_jar/build.gradle b/libraries/tools/kotlin-gradle-plugin/gradle_api_jar/build.gradle similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-core/gradle_api_jar/build.gradle rename to libraries/tools/kotlin-gradle-plugin/gradle_api_jar/build.gradle diff --git a/libraries/tools/kotlin-gradle-plugin-core/gradle_api_jar/gradle/wrapper/gradle-wrapper.jar b/libraries/tools/kotlin-gradle-plugin/gradle_api_jar/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-core/gradle_api_jar/gradle/wrapper/gradle-wrapper.jar rename to libraries/tools/kotlin-gradle-plugin/gradle_api_jar/gradle/wrapper/gradle-wrapper.jar diff --git a/libraries/tools/kotlin-gradle-plugin-core/gradle_api_jar/gradle/wrapper/gradle-wrapper.properties b/libraries/tools/kotlin-gradle-plugin/gradle_api_jar/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-core/gradle_api_jar/gradle/wrapper/gradle-wrapper.properties rename to libraries/tools/kotlin-gradle-plugin/gradle_api_jar/gradle/wrapper/gradle-wrapper.properties diff --git a/libraries/tools/kotlin-gradle-plugin-core/gradle_api_jar/gradlew b/libraries/tools/kotlin-gradle-plugin/gradle_api_jar/gradlew similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-core/gradle_api_jar/gradlew rename to libraries/tools/kotlin-gradle-plugin/gradle_api_jar/gradlew diff --git a/libraries/tools/kotlin-gradle-plugin-core/gradle_api_jar/gradlew.bat b/libraries/tools/kotlin-gradle-plugin/gradle_api_jar/gradlew.bat similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-core/gradle_api_jar/gradlew.bat rename to libraries/tools/kotlin-gradle-plugin/gradle_api_jar/gradlew.bat diff --git a/libraries/tools/kotlin-gradle-plugin-core/gradle_api_jar/pom.xml b/libraries/tools/kotlin-gradle-plugin/gradle_api_jar/pom.xml similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-core/gradle_api_jar/pom.xml rename to libraries/tools/kotlin-gradle-plugin/gradle_api_jar/pom.xml diff --git a/libraries/tools/kotlin-gradle-plugin-core/gradle_api_jar/settings.gradle b/libraries/tools/kotlin-gradle-plugin/gradle_api_jar/settings.gradle similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-core/gradle_api_jar/settings.gradle rename to libraries/tools/kotlin-gradle-plugin/gradle_api_jar/settings.gradle diff --git a/libraries/tools/kotlin-gradle-plugin/pom.xml b/libraries/tools/kotlin-gradle-plugin/pom.xml index e3b069ae997..02a80512bd4 100644 --- a/libraries/tools/kotlin-gradle-plugin/pom.xml +++ b/libraries/tools/kotlin-gradle-plugin/pom.xml @@ -20,6 +20,11 @@ jar + + commons-io + commons-io + 2.4 + org.jetbrains.kotlin kotlin-stdlib @@ -30,6 +35,16 @@ kotlin-android-extensions ${project.version} + + org.jetbrains.kotlin + kotlin-compiler-embeddable + ${project.version} + + + org.jetbrains.kotlin + kotlin-annotation-processing + ${project.version} + com.android.tools.build gradle @@ -42,16 +57,6 @@ 2.2 provided - - org.jetbrains.kotlin - kotlin-gradle-plugin-core - ${project.version} - - - org.jetbrains.kotlin - kotlin-gradle-plugin-api - ${project.version} - org.jetbrains.kotlin kotlin-gradle-subplugin-example @@ -172,6 +177,27 @@ + + org.jetbrains.dokka + dokka-maven-plugin + 0.9.9 + + + pre-site + + dokka + + + + + markdown + + + ${project.basedir}/Module.md + + + + diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/annotation/AnnotationFileUpdater.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/annotation/AnnotationFileUpdater.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/annotation/AnnotationFileUpdater.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/annotation/AnnotationFileUpdater.kt diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/annotation/SourceAnnotationsRegistry.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/annotation/SourceAnnotationsRegistry.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/annotation/SourceAnnotationsRegistry.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/annotation/SourceAnnotationsRegistry.kt diff --git a/libraries/tools/kotlin-gradle-plugin-dsl/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCompile.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCompile.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-dsl/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCompile.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCompile.kt diff --git a/libraries/tools/kotlin-gradle-plugin-dsl/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptions.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptions.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-dsl/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptions.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptions.kt diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptionsBase.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptionsBase.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptionsBase.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptionsBase.kt diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptionsImpl.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptionsImpl.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptionsImpl.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptionsImpl.kt diff --git a/libraries/tools/kotlin-gradle-plugin-dsl/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-dsl/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions.kt diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptionsBase.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptionsBase.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptionsBase.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptionsBase.kt diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptionsImpl.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptionsImpl.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptionsImpl.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptionsImpl.kt diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/ArtifactDifferenceRegistry.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/ArtifactDifferenceRegistry.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/ArtifactDifferenceRegistry.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/ArtifactDifferenceRegistry.kt diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/BuildInfo.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/BuildInfo.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/BuildInfo.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/BuildInfo.kt diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/ChangedJavaFilesProcessor.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/ChangedJavaFilesProcessor.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/ChangedJavaFilesProcessor.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/ChangedJavaFilesProcessor.kt diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/ChangesEither.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/ChangesEither.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/ChangesEither.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/ChangesEither.kt diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/CompilerPluginOptions.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/CompilerPluginOptions.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/CompilerPluginOptions.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/CompilerPluginOptions.kt diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/GradleIncrementalCacheImpl.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/GradleIncrementalCacheImpl.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/GradleIncrementalCacheImpl.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/GradleIncrementalCacheImpl.kt diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/IncrementalCachesManager.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/IncrementalCachesManager.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/IncrementalCachesManager.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/IncrementalCachesManager.kt diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KaptOptions.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KaptOptions.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KaptOptions.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KaptOptions.kt diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/gradleCacheVersion.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/gradleCacheVersion.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/gradleCacheVersion.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/gradleCacheVersion.kt diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/kapt/kaptStubGeneratorUtils.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/kapt/kaptStubGeneratorUtils.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/kapt/kaptStubGeneratorUtils.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/kapt/kaptStubGeneratorUtils.kt diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/incremental/snapshots/FileSnapshot.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/snapshots/FileSnapshot.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/incremental/snapshots/FileSnapshot.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/snapshots/FileSnapshot.kt diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/incremental/snapshots/FileSnapshotExternalizer.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/snapshots/FileSnapshotExternalizer.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/incremental/snapshots/FileSnapshotExternalizer.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/snapshots/FileSnapshotExternalizer.kt diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/incremental/snapshots/FileSnapshotMap.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/snapshots/FileSnapshotMap.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/incremental/snapshots/FileSnapshotMap.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/snapshots/FileSnapshotMap.kt diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/incremental/snapshots/FileSnapshotProvider.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/snapshots/FileSnapshotProvider.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/incremental/snapshots/FileSnapshotProvider.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/snapshots/FileSnapshotProvider.kt diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/incremental/snapshots/hashUtil.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/snapshots/hashUtil.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/incremental/snapshots/hashUtil.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/incremental/snapshots/hashUtil.kt diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/kotlin/org/jetbrains/kotlin/TestWithWorkingDir.kt b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/TestWithWorkingDir.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-core/src/test/kotlin/org/jetbrains/kotlin/TestWithWorkingDir.kt rename to libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/TestWithWorkingDir.kt diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/kotlin/org/jetbrains/kotlin/incremental/snapshots/FileSnapshotMapTest.kt b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/incremental/snapshots/FileSnapshotMapTest.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-core/src/test/kotlin/org/jetbrains/kotlin/incremental/snapshots/FileSnapshotMapTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/incremental/snapshots/FileSnapshotMapTest.kt diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/kotlin/org/jetbrains/kotlin/incremental/snapshots/FileSnapshotTest.kt b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/incremental/snapshots/FileSnapshotTest.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-core/src/test/kotlin/org/jetbrains/kotlin/incremental/snapshots/FileSnapshotTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/incremental/snapshots/FileSnapshotTest.kt