diff --git a/libraries/pom.xml b/libraries/pom.xml index b3e31788884..560c1a1e5e6 100644 --- a/libraries/pom.xml +++ b/libraries/pom.xml @@ -56,7 +56,7 @@ tools/kotlin-compiler tools/kotlin-jdk-annotations tools/runtime - tools/kotlin-gradle-plugin + tools/kotlin-gradle-plugin-core tools/kotlin-maven-plugin tools/kotlin-js-library tools/kotlin-js-tests diff --git a/libraries/tools/kotlin-gradle-plugin/.gitignore b/libraries/tools/kotlin-gradle-plugin-core/.gitignore similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/.gitignore rename to libraries/tools/kotlin-gradle-plugin-core/.gitignore diff --git a/libraries/tools/kotlin-gradle-plugin/gradle_api_jar/.gitignore b/libraries/tools/kotlin-gradle-plugin-core/gradle_api_jar/.gitignore similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/gradle_api_jar/.gitignore rename to libraries/tools/kotlin-gradle-plugin-core/gradle_api_jar/.gitignore diff --git a/libraries/tools/kotlin-gradle-plugin/gradle_api_jar/README.txt b/libraries/tools/kotlin-gradle-plugin-core/gradle_api_jar/README.txt similarity index 96% rename from libraries/tools/kotlin-gradle-plugin/gradle_api_jar/README.txt rename to libraries/tools/kotlin-gradle-plugin-core/gradle_api_jar/README.txt index c9045e657f0..df08dc77e0d 100644 --- a/libraries/tools/kotlin-gradle-plugin/gradle_api_jar/README.txt +++ b/libraries/tools/kotlin-gradle-plugin-core/gradle_api_jar/README.txt @@ -1,7 +1,7 @@ -Deploying gradle api to maven - - * gradlew build - -> build/libs/gradle-api-1.4.jar - - * mvn deploy - build/libs/gradle-api-1.4.jar -> http://repository.jetbrains.com/utils +Deploying gradle api to maven + + * gradlew build + -> build/libs/gradle-api-1.4.jar + + * mvn deploy + build/libs/gradle-api-1.4.jar -> http://repository.jetbrains.com/utils diff --git a/libraries/tools/kotlin-gradle-plugin/gradle_api_jar/build.gradle b/libraries/tools/kotlin-gradle-plugin-core/gradle_api_jar/build.gradle similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/gradle_api_jar/build.gradle rename to libraries/tools/kotlin-gradle-plugin-core/gradle_api_jar/build.gradle diff --git a/libraries/tools/kotlin-gradle-plugin/gradle_api_jar/gradle/wrapper/gradle-wrapper.jar b/libraries/tools/kotlin-gradle-plugin-core/gradle_api_jar/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/gradle_api_jar/gradle/wrapper/gradle-wrapper.jar rename to libraries/tools/kotlin-gradle-plugin-core/gradle_api_jar/gradle/wrapper/gradle-wrapper.jar diff --git a/libraries/tools/kotlin-gradle-plugin/gradle_api_jar/gradle/wrapper/gradle-wrapper.properties b/libraries/tools/kotlin-gradle-plugin-core/gradle_api_jar/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/gradle_api_jar/gradle/wrapper/gradle-wrapper.properties rename to libraries/tools/kotlin-gradle-plugin-core/gradle_api_jar/gradle/wrapper/gradle-wrapper.properties diff --git a/libraries/tools/kotlin-gradle-plugin/gradle_api_jar/gradlew b/libraries/tools/kotlin-gradle-plugin-core/gradle_api_jar/gradlew similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/gradle_api_jar/gradlew rename to libraries/tools/kotlin-gradle-plugin-core/gradle_api_jar/gradlew diff --git a/libraries/tools/kotlin-gradle-plugin/gradle_api_jar/gradlew.bat b/libraries/tools/kotlin-gradle-plugin-core/gradle_api_jar/gradlew.bat similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/gradle_api_jar/gradlew.bat rename to libraries/tools/kotlin-gradle-plugin-core/gradle_api_jar/gradlew.bat diff --git a/libraries/tools/kotlin-gradle-plugin/gradle_api_jar/pom.xml b/libraries/tools/kotlin-gradle-plugin-core/gradle_api_jar/pom.xml similarity index 97% rename from libraries/tools/kotlin-gradle-plugin/gradle_api_jar/pom.xml rename to libraries/tools/kotlin-gradle-plugin-core/gradle_api_jar/pom.xml index b5e367c2c68..ab208885125 100644 --- a/libraries/tools/kotlin-gradle-plugin/gradle_api_jar/pom.xml +++ b/libraries/tools/kotlin-gradle-plugin-core/gradle_api_jar/pom.xml @@ -1,51 +1,51 @@ - - - - 4.0.0 - - 1.4.1 - 3.0.4 - - - org.jetbrains.kotlin - gradle-api - pom - 1.4 - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.7 - - - attach-artifacts - compile - - attach-artifact - - - - - build/libs/gradle-api-1.4.jar - jar - - - - - - - - - - - - utils - http://repository.jetbrains.com/utils - - - - + + + + 4.0.0 + + 1.4.1 + 3.0.4 + + + org.jetbrains.kotlin + gradle-api + pom + 1.4 + + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.7 + + + attach-artifacts + compile + + attach-artifact + + + + + build/libs/gradle-api-1.4.jar + jar + + + + + + + + + + + + utils + http://repository.jetbrains.com/utils + + + + diff --git a/libraries/tools/kotlin-gradle-plugin/gradle_api_jar/settings.gradle b/libraries/tools/kotlin-gradle-plugin-core/gradle_api_jar/settings.gradle similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/gradle_api_jar/settings.gradle rename to libraries/tools/kotlin-gradle-plugin-core/gradle_api_jar/settings.gradle diff --git a/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/com/google/common/base/annotations.xml b/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/com/google/common/base/annotations.xml similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/com/google/common/base/annotations.xml rename to libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/com/google/common/base/annotations.xml diff --git a/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/com/google/common/io/annotations.xml b/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/com/google/common/io/annotations.xml similarity index 97% rename from libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/com/google/common/io/annotations.xml rename to libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/com/google/common/io/annotations.xml index b7f0b110ddc..64ac65dcca1 100644 --- a/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/com/google/common/io/annotations.xml +++ b/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/com/google/common/io/annotations.xml @@ -1,5 +1,5 @@ - - - - + + + + \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/apache/commons/io/annotations.xml b/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/apache/commons/io/annotations.xml similarity index 97% rename from libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/apache/commons/io/annotations.xml rename to libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/apache/commons/io/annotations.xml index 86f130b880e..0aee42a6e6a 100644 --- a/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/apache/commons/io/annotations.xml +++ b/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/apache/commons/io/annotations.xml @@ -1,5 +1,5 @@ - - - - + + + + \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/annotations.xml b/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/annotations.xml similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/annotations.xml rename to libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/annotations.xml diff --git a/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/file/annotations.xml b/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/file/annotations.xml similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/file/annotations.xml rename to libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/file/annotations.xml diff --git a/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/initialization/dsl/annotations.xml b/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/initialization/dsl/annotations.xml similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/initialization/dsl/annotations.xml rename to libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/initialization/dsl/annotations.xml diff --git a/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/internal/annotations.xml b/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/internal/annotations.xml similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/internal/annotations.xml rename to libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/internal/annotations.xml diff --git a/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/internal/project/annotations.xml b/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/internal/project/annotations.xml similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/internal/project/annotations.xml rename to libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/internal/project/annotations.xml diff --git a/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/logging/annotations.xml b/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/logging/annotations.xml similarity index 97% rename from libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/logging/annotations.xml rename to libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/logging/annotations.xml index 7ee1ff08665..87c8bc5da18 100644 --- a/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/logging/annotations.xml +++ b/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/logging/annotations.xml @@ -1,5 +1,5 @@ - - - - + + + + \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/plugins/annotations.xml b/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/plugins/annotations.xml similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/plugins/annotations.xml rename to libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/plugins/annotations.xml diff --git a/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/tasks/annotations.xml b/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/tasks/annotations.xml similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/tasks/annotations.xml rename to libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/tasks/annotations.xml diff --git a/libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/tasks/compile/annotations.xml b/libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/tasks/compile/annotations.xml similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/kotlinAnnotation/org/gradle/api/tasks/compile/annotations.xml rename to libraries/tools/kotlin-gradle-plugin-core/kotlinAnnotation/org/gradle/api/tasks/compile/annotations.xml diff --git a/libraries/tools/kotlin-gradle-plugin/pom.xml b/libraries/tools/kotlin-gradle-plugin-core/pom.xml similarity index 99% rename from libraries/tools/kotlin-gradle-plugin/pom.xml rename to libraries/tools/kotlin-gradle-plugin-core/pom.xml index f3602e2ce62..2c558ae18e8 100644 --- a/libraries/tools/kotlin-gradle-plugin/pom.xml +++ b/libraries/tools/kotlin-gradle-plugin-core/pom.xml @@ -16,7 +16,7 @@ ../../pom.xml - kotlin-gradle-plugin + kotlin-gradle-plugin-core jar diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/KotlinSourceSet.kt b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/KotlinSourceSet.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/KotlinSourceSet.kt rename to libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/KotlinSourceSet.kt diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt rename to libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt rename to libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/resources/META-INF/gradle-plugins/kotlin.properties b/libraries/tools/kotlin-gradle-plugin-core/src/main/resources/META-INF/gradle-plugins/kotlin.properties similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/main/resources/META-INF/gradle-plugins/kotlin.properties rename to libraries/tools/kotlin-gradle-plugin-core/src/main/resources/META-INF/gradle-plugins/kotlin.properties diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt b/libraries/tools/kotlin-gradle-plugin-core/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt rename to libraries/tools/kotlin-gradle-plugin-core/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/alfa/build.gradle b/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/alfa/build.gradle similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/alfa/build.gradle rename to libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/alfa/build.gradle diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/alfa/externalAnnotations/com/google/common/base/annotations.xml b/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/alfa/externalAnnotations/com/google/common/base/annotations.xml similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/alfa/externalAnnotations/com/google/common/base/annotations.xml rename to libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/alfa/externalAnnotations/com/google/common/base/annotations.xml diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/alfa/gradle/wrapper/gradle-wrapper.jar b/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/alfa/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/alfa/gradle/wrapper/gradle-wrapper.jar rename to libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/alfa/gradle/wrapper/gradle-wrapper.jar diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/alfa/gradle/wrapper/gradle-wrapper.properties b/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/alfa/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/alfa/gradle/wrapper/gradle-wrapper.properties rename to libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/alfa/gradle/wrapper/gradle-wrapper.properties diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/alfa/gradlew b/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/alfa/gradlew similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/alfa/gradlew rename to libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/alfa/gradlew diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/alfa/gradlew.bat b/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/alfa/gradlew.bat similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/alfa/gradlew.bat rename to libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/alfa/gradlew.bat diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/alfa/src/deploy/kotlin/kotlinSrc.kt b/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/alfa/src/deploy/kotlin/kotlinSrc.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/alfa/src/deploy/kotlin/kotlinSrc.kt rename to libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/alfa/src/deploy/kotlin/kotlinSrc.kt diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/alfa/src/main/java/demo/Greeter.java b/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/alfa/src/main/java/demo/Greeter.java similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/alfa/src/main/java/demo/Greeter.java rename to libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/alfa/src/main/java/demo/Greeter.java diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/alfa/src/main/java/demo/HelloWorld.java b/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/alfa/src/main/java/demo/HelloWorld.java similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/alfa/src/main/java/demo/HelloWorld.java rename to libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/alfa/src/main/java/demo/HelloWorld.java diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/alfa/src/main/kotlin/helloWorld.kt b/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/alfa/src/main/kotlin/helloWorld.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/alfa/src/main/kotlin/helloWorld.kt rename to libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/alfa/src/main/kotlin/helloWorld.kt diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/alfa/src/test/kotlin/tests.kt b/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/alfa/src/test/kotlin/tests.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/alfa/src/test/kotlin/tests.kt rename to libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/alfa/src/test/kotlin/tests.kt