diff --git a/settings.gradle b/settings.gradle index 83799699dd5..2f723332cee 100644 --- a/settings.gradle +++ b/settings.gradle @@ -25,4 +25,4 @@ include ':runtime' include ':common' include ':backend.native:tests' include ':tools:helpers' -include ':tools:kotlin-native-gradle-plugin' +include ':tools:gradle-plugin' diff --git a/tools/kotlin-native-gradle-plugin/build.gradle b/tools/gradle-plugin/build.gradle similarity index 96% rename from tools/kotlin-native-gradle-plugin/build.gradle rename to tools/gradle-plugin/build.gradle index d0d65e1ae98..e54c9d60d63 100644 --- a/tools/kotlin-native-gradle-plugin/build.gradle +++ b/tools/gradle-plugin/build.gradle @@ -20,9 +20,6 @@ apply plugin: 'kotlin' apply plugin: 'maven-publish' apply plugin: 'com.jfrog.bintray' -group = 'org.jetbrains.kotlin' -version = konanVersion - // TODO: move this code to top level (the same for backend.native) // Copied from backend.native allprojects { @@ -83,6 +80,9 @@ publishing { publications { gradlePlugin(MavenPublication) { artifact jar + groupId 'org.jetbrains.kotlin' + artifactId 'kotlin-native-gradle-plugin' + version konanVersion pom.withXml { XmlProvider xml -> def stdlibDep = xml.asNode().appendNode("dependencies").appendNode("dependency") stdlibDep.appendNode("groupId", "org.jetbrains.kotlin") @@ -111,4 +111,4 @@ bintray { override = project.hasProperty("override") } publications = ['gradlePlugin'] -} +} \ No newline at end of file diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/CompilerDownloadTask.kt b/tools/gradle-plugin/src/main/kotlin/CompilerDownloadTask.kt similarity index 100% rename from tools/kotlin-native-gradle-plugin/src/main/kotlin/CompilerDownloadTask.kt rename to tools/gradle-plugin/src/main/kotlin/CompilerDownloadTask.kt diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/KonanCompilerConfig.kt b/tools/gradle-plugin/src/main/kotlin/KonanCompilerConfig.kt similarity index 100% rename from tools/kotlin-native-gradle-plugin/src/main/kotlin/KonanCompilerConfig.kt rename to tools/gradle-plugin/src/main/kotlin/KonanCompilerConfig.kt diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/KonanCompilerTask.kt b/tools/gradle-plugin/src/main/kotlin/KonanCompilerTask.kt similarity index 100% rename from tools/kotlin-native-gradle-plugin/src/main/kotlin/KonanCompilerTask.kt rename to tools/gradle-plugin/src/main/kotlin/KonanCompilerTask.kt diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/KonanInteropConfig.kt b/tools/gradle-plugin/src/main/kotlin/KonanInteropConfig.kt similarity index 100% rename from tools/kotlin-native-gradle-plugin/src/main/kotlin/KonanInteropConfig.kt rename to tools/gradle-plugin/src/main/kotlin/KonanInteropConfig.kt diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/KonanInteropTask.kt b/tools/gradle-plugin/src/main/kotlin/KonanInteropTask.kt similarity index 100% rename from tools/kotlin-native-gradle-plugin/src/main/kotlin/KonanInteropTask.kt rename to tools/gradle-plugin/src/main/kotlin/KonanInteropTask.kt diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/KonanPlugin.kt b/tools/gradle-plugin/src/main/kotlin/KonanPlugin.kt similarity index 100% rename from tools/kotlin-native-gradle-plugin/src/main/kotlin/KonanPlugin.kt rename to tools/gradle-plugin/src/main/kotlin/KonanPlugin.kt diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/KonanToolingModelBuilder.kt b/tools/gradle-plugin/src/main/kotlin/KonanToolingModelBuilder.kt similarity index 100% rename from tools/kotlin-native-gradle-plugin/src/main/kotlin/KonanToolingModelBuilder.kt rename to tools/gradle-plugin/src/main/kotlin/KonanToolingModelBuilder.kt diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/model/KonanModel.kt b/tools/gradle-plugin/src/main/kotlin/model/KonanModel.kt similarity index 100% rename from tools/kotlin-native-gradle-plugin/src/main/kotlin/model/KonanModel.kt rename to tools/gradle-plugin/src/main/kotlin/model/KonanModel.kt diff --git a/tools/kotlin-native-gradle-plugin/src/main/resources/META-INF/gradle-plugins/konan.properties b/tools/gradle-plugin/src/main/resources/META-INF/gradle-plugins/konan.properties similarity index 100% rename from tools/kotlin-native-gradle-plugin/src/main/resources/META-INF/gradle-plugins/konan.properties rename to tools/gradle-plugin/src/main/resources/META-INF/gradle-plugins/konan.properties