Replace 'interop-as-source-set-klib.gradle' with cinterop commonization

atomicfu/build.gradle

@@ -139,21 +139,6 @@ if (rootProject.ext.native_targets_enabled) {
             }
         }
     }
-
-    // Hack for publishing as HMPP: pack the cinterop klib as a source set:
-    if (!project.ext.ideaActive) {
-        kotlin.sourceSets {
-            nativeInterop
-            nativeMain.dependsOn(nativeInterop)
-        }
-
-        apply from: "$rootDir/gradle/interop-as-source-set-klib.gradle"
-
-        registerInteropAsSourceSetOutput(
-                kotlin.linuxX64().compilations["main"].cinterops["interop"],
-                kotlin.sourceSets["nativeInterop"]
-        )
-    }
 }
 
 configurations {

gradle.properties

@@ -27,8 +27,8 @@ kotlin.native.ignoreDisabledTargets=true
 
 kotlin.js.compiler=both
 
-kotlin.mpp.enableGranularSourceSetsMetadata=true
 kotlin.mpp.enableCompatibilityMetadataVariant=true
+kotlin.mpp.enableCInteropCommonization=true
 
 # Workaround for Bintray treating .sha512 files as artifacts
 # https://github.com/gradle/gradle/issues/11412