Kotlin version 1.3.70-eap-42, fixed HMPP support in IDE

Kotlin · Jan 17, 2020 · e9ec4cb · e9ec4cb
1 parent 10979a3
commit e9ec4cb
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 33 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -5,11 +5,11 @@
 # Kotlin
 version=1.3.3-native-mt-SNAPSHOT
 group=org.jetbrains.kotlinx
-kotlin_version=1.3.61
+kotlin_version=1.3.70-eap-42
 
 # Dependencies
 junit_version=4.12
-atomicfu_version=0.14.1
+atomicfu_version=0.14.1-1.3.70-eap-42-2
 html_version=0.6.8
 lincheck_version=2.0
 dokka_version=0.9.16-rdev-2-mpp-hacks

diff --git a/gradle/compile-native-multiplatform.gradle b/gradle/compile-native-multiplatform.gradle
@@ -9,23 +9,17 @@ kotlin {
     }
 
     targets {
-        if (project.ext.ideaActive) {
-            // todo: This is IDEA kludge, without "fromPresent" the code does not resolve properly
-            //fromPreset(project.ext.ideaPreset, 'native')
-            addTarget(project.ext.ideaPreset)
-        } else {
-            addTarget(presets.linuxX64)
-            addTarget(presets.iosArm64)
-            addTarget(presets.iosArm32)
-            addTarget(presets.iosX64)
-            addTarget(presets.macosX64)
-            addTarget(presets.mingwX64)
-            addTarget(presets.tvosArm64)
-            addTarget(presets.tvosX64)
-            addTarget(presets.watchosArm32)
-            addTarget(presets.watchosArm64)
-            addTarget(presets.watchosX86)
-        }
+        addTarget(presets.linuxX64)
+        addTarget(presets.iosArm64)
+        addTarget(presets.iosArm32)
+        addTarget(presets.iosX64)
+        addTarget(presets.macosX64)
+        addTarget(presets.mingwX64)
+        addTarget(presets.tvosArm64)
+        addTarget(presets.tvosX64)
+        addTarget(presets.watchosArm32)
+        addTarget(presets.watchosArm64)
+        addTarget(presets.watchosX86)
     }
 
     sourceSets {

diff --git a/gradle/targets.gradle b/gradle/targets.gradle
@@ -17,12 +17,5 @@ kotlin {
         project.ext.isLinuxHost = linuxEnabled
         project.ext.isMacosHost = macosEnabled
         project.ext.isWinHost = winEnabled
-
-        if (project.ext.ideaActive) {
-            def ideaPreset = presets.linuxX64
-            if (macosEnabled) ideaPreset = presets.macosX64
-            if (winEnabled) ideaPreset = presets.mingwX64
-            project.ext.ideaPreset = ideaPreset
-        }
     }
 }
diff --git a/kotlinx-coroutines-core/build.gradle b/kotlinx-coroutines-core/build.gradle
@@ -48,13 +48,6 @@ defineSourceSet("concurrent", ["common"]) { it in ["jvm", "native"] }
 defineSourceSet("nativeDarwin", ["native"]) { isNativeDarwin(it) }
 defineSourceSet("nativeOther", ["native"]) { isNativeOther(it) }
 
-// todo: This is IDEA kludge, without "fromPresent" the code does not resolve properly
-if (project.ext.ideaActive && isNativeDarwin(project.ext.ideaPreset.name)) {
-    kotlin.targets {
-        fromPreset(project.ext.ideaPreset, 'nativeDarwin')
-    }
-}
-
 /*
  * All platform plugins and configuration magic happens here instead of build.gradle
  * because JMV-only projects depend on core, thus core should always be initialized before configuration.
@@ -118,6 +111,25 @@ configurations {
     configureKotlinJvmPlatform(kotlinCompilerPluginClasspath)
 }
 
+if (project.ext.ideaActive) {
+    def ideaPreset = kotlin.presets.linuxX64
+    if (project.ext.isLinuxHost) ideaPreset = kotlin.presets.macosX64
+    if (project.ext.isWinHost) ideaPreset = kotlin.presets.mingwX64
+
+    kotlin.sourceSets {
+        configure(matching { it.name.startsWith("native")}) {
+            def hostMainCompilation = project.kotlin.targetFromPreset(ideaPreset).compilations.main
+            def compileConfiguration = configurations[hostMainCompilation.compileDependencyConfigurationName]
+            def hostNativePlatformLibs = files(provider {
+                compileConfiguration.findAll {
+                    it.path.endsWith(".klib") || it.absolutePath.contains("klib${File.separator}platform")
+                }
+            })
+            dependencies.add(implementationMetadataConfigurationName, hostNativePlatformLibs)
+        }
+    }
+}
+
 kotlin.sourceSets {
     jvmTest.dependencies {
         api "com.devexperts.lincheck:lincheck:$lincheck_version"