Use same models in MPP and CIDR

buildSrc/settings.gradle

@@ -23,6 +23,17 @@ if (flags.includeCidrPlugins) {
     logger.info("NOT including CIDR plugins in buildSrc/settings.gradle")
 }
 
+if (flags.hasKotlinUltimate) {
+    logger.info("Including extension for IJ Ultimate in buildSrc/settings.gradle")
+    include ":prepare-deps:lldb-frontend"
+    include ":prepare-deps:native-debug-plugin"
+    project(":prepare-deps:lldb-frontend").projectDir = file("${flags.propertiesProvider.rootProjectDir}/kotlin-ultimate/buildSrc/prepare-deps/lldb-frontend")
+    project(":prepare-deps:native-debug-plugin").projectDir = file("${flags.propertiesProvider.rootProjectDir}/kotlin-ultimate/buildSrc/prepare-deps/native-debug-plugin")
+} else {
+    logger.info("Not including extension for IJ Ultimate in buildSrc/settings.gradle")
+}
+
+
 class LocalBuildPropertiesProvider {
     private Settings settings
     private Properties localProperties = new Properties()
@@ -57,8 +68,11 @@ class LocalBuildProperties {
     
     boolean includeCidrPlugins
 
+    boolean hasKotlinUltimate
+
     LocalBuildProperties(Settings settings) {
         propertiesProvider = new LocalBuildPropertiesProvider(settings)
-        includeCidrPlugins = propertiesProvider.getBoolean('cidrPluginsEnabled') && new File(propertiesProvider.rootProjectDir, 'kotlin-ultimate').exists()
+        hasKotlinUltimate = new File(propertiesProvider.rootProjectDir, 'kotlin-ultimate').exists()
+        includeCidrPlugins = propertiesProvider.getBoolean('cidrPluginsEnabled') && hasKotlinUltimate
     }
 }

buildSrc/src/main/kotlin/buildProperties.kt

@@ -57,9 +57,7 @@ class KotlinBuildProperties(
     val useBootstrapStdlib: Boolean
         get() = isInJpsBuildIdeaSync || getBoolean("kotlin.build.useBootstrapStdlib", false)
 
-    val kotlinUltimateExists: Boolean = propertiesProvider.rootProjectDir.resolve("kotlin-ultimate").exists()
-
-    val includeCidrPlugins: Boolean = kotlinUltimateExists && getBoolean("cidrPluginsEnabled")
+    private val kotlinUltimateExists: Boolean = propertiesProvider.rootProjectDir.resolve("kotlin-ultimate").exists()
 
     val isTeamcityBuild: Boolean = getBoolean("teamcity") || System.getenv("TEAMCITY_VERSION") != null
 
@@ -72,6 +70,10 @@ class KotlinBuildProperties(
             return kotlinUltimateExists && (explicitlyEnabled || isTeamcityBuild)
         }
 
+    val includeCidrPlugins: Boolean = kotlinUltimateExists && getBoolean("cidrPluginsEnabled")
+
+    val includeUltimate: Boolean = kotlinUltimateExists && (isTeamcityBuild || intellijUltimateEnabled)
+
     val postProcessing: Boolean get() = isTeamcityBuild || getBoolean("kotlin.build.postprocessing", true)
 
     val relocation: Boolean get() = postProcessing