From 04fca2ac0da90a0689a16cf01ad06c6d1bcab68c Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Wed, 5 Sep 2018 12:35:34 +0300 Subject: [PATCH] [IDEA plugin for K/N] Source code reorganization Move Gradle part of plugin from 'idea-gradle/native' to 'idea-gradle-native' module --- .../{idea-gradle/native => idea-gradle-native}/build.gradle.kts | 0 .../src/org/jetbrains/konan/gradle/GradleKonanModelProvider.kt | 0 .../org/jetbrains/konan/gradle/GradleKonanProjectComponent.kt | 0 .../konan/gradle/internal/KotlinNativeIdeInitializer.java | 0 prepare/idea-plugin/build.gradle.kts | 2 +- settings.gradle | 2 +- 6 files changed, 2 insertions(+), 2 deletions(-) rename idea/{idea-gradle/native => idea-gradle-native}/build.gradle.kts (100%) rename idea/{idea-gradle/native => idea-gradle-native}/src/org/jetbrains/konan/gradle/GradleKonanModelProvider.kt (100%) rename idea/{idea-gradle/native => idea-gradle-native}/src/org/jetbrains/konan/gradle/GradleKonanProjectComponent.kt (100%) rename idea/{idea-gradle/native => idea-gradle-native}/src/org/jetbrains/konan/gradle/internal/KotlinNativeIdeInitializer.java (100%) diff --git a/idea/idea-gradle/native/build.gradle.kts b/idea/idea-gradle-native/build.gradle.kts similarity index 100% rename from idea/idea-gradle/native/build.gradle.kts rename to idea/idea-gradle-native/build.gradle.kts diff --git a/idea/idea-gradle/native/src/org/jetbrains/konan/gradle/GradleKonanModelProvider.kt b/idea/idea-gradle-native/src/org/jetbrains/konan/gradle/GradleKonanModelProvider.kt similarity index 100% rename from idea/idea-gradle/native/src/org/jetbrains/konan/gradle/GradleKonanModelProvider.kt rename to idea/idea-gradle-native/src/org/jetbrains/konan/gradle/GradleKonanModelProvider.kt diff --git a/idea/idea-gradle/native/src/org/jetbrains/konan/gradle/GradleKonanProjectComponent.kt b/idea/idea-gradle-native/src/org/jetbrains/konan/gradle/GradleKonanProjectComponent.kt similarity index 100% rename from idea/idea-gradle/native/src/org/jetbrains/konan/gradle/GradleKonanProjectComponent.kt rename to idea/idea-gradle-native/src/org/jetbrains/konan/gradle/GradleKonanProjectComponent.kt diff --git a/idea/idea-gradle/native/src/org/jetbrains/konan/gradle/internal/KotlinNativeIdeInitializer.java b/idea/idea-gradle-native/src/org/jetbrains/konan/gradle/internal/KotlinNativeIdeInitializer.java similarity index 100% rename from idea/idea-gradle/native/src/org/jetbrains/konan/gradle/internal/KotlinNativeIdeInitializer.java rename to idea/idea-gradle-native/src/org/jetbrains/konan/gradle/internal/KotlinNativeIdeInitializer.java diff --git a/prepare/idea-plugin/build.gradle.kts b/prepare/idea-plugin/build.gradle.kts index 9f3d593b1af..e6cc7b3354b 100644 --- a/prepare/idea-plugin/build.gradle.kts +++ b/prepare/idea-plugin/build.gradle.kts @@ -37,7 +37,7 @@ val projectsToShadow by extra(listOf( ":idea:idea-native", ":idea:idea-core", ":idea:idea-gradle", - ":idea:idea-gradle:native", + ":idea:idea-gradle-native", //":idea-ultimate", ":compiler:ir.psi2ir", ":compiler:ir.tree", diff --git a/settings.gradle b/settings.gradle index 85f0d1567ae..eeba9dc1fc0 100644 --- a/settings.gradle +++ b/settings.gradle @@ -77,7 +77,7 @@ include ":kotlin-build-common", ":idea:idea-android-output-parser", ":idea:idea-test-framework", ":idea:idea-native", - ":idea:idea-gradle:native", + ":idea:idea-gradle-native", ":idea", ":idea-runner", ":eval4j",