grpc-native: Small fixes

Signed-off-by: Johannes Zottele <[email protected]>

Author: Jozott00

compiler-plugin/gradle.properties

@@ -42,3 +42,7 @@ kotlinx.rpc.plugin.internalDevelopment=true
 
 # set to true when building IDE compiler plugin artifacts
 kotlinx.rpc.forIdeBuild=false
+
+# enable code sharing between similar native targets:
+# https://www.jetbrains.com/help/kotlin-multiplatform-dev/multiplatform-share-on-platforms.html
+kotlin.mpp.enableCInteropCommonization=true

dokka-plugin/gradle.properties

@@ -42,3 +42,7 @@ kotlinx.rpc.plugin.internalDevelopment=true
 
 # set to true when building IDE compiler plugin artifacts
 kotlinx.rpc.forIdeBuild=false
+
+# enable code sharing between similar native targets:
+# https://www.jetbrains.com/help/kotlin-multiplatform-dev/multiplatform-share-on-platforms.html
+kotlin.mpp.enableCInteropCommonization=true

gradle-conventions/src/main/kotlin/conventions-root.gradle.kts

@@ -6,6 +6,7 @@ import util.other.isPublicModule
 import util.other.libs
 import util.setupPage
 import util.tasks.*
+import java.io.OutputStream
 import java.nio.file.Path
 import kotlin.io.path.*
 
@@ -115,11 +116,9 @@ gradle.afterProject {
 tasks.register<Exec>("checkBazel") {
     commandLine("which", "bazel")
     isIgnoreExitValue = true
+    standardOutput = OutputStream.nullOutputStream()
     doLast {
-        if (executionResult.get().exitValue == 0) {
-            val path = standardOutput.toString().trim()
-            logger.debug("bazel: {}", path)
-        } else {
+        if (executionResult.get().exitValue != 0) {
             throw GradleException("'bazel' not found on PATH. Please install Bazel (https://bazel.build/).")
         }
     }

gradle-conventions/src/main/kotlin/util/cinterop.kt

@@ -103,7 +103,7 @@ fun KotlinMultiplatformExtension.configureCLibDependency(
 
     if (bazelExtractIncludeTask != null) {
         project.tasks.register<Exec>("buildIncludeDirCLib${buildTargetName.capitalized()}") {
-            dependsOn("checkBazel")
+            dependsOn(":checkBazel")
             group = "build"
             workingDir = project.cinteropLibDir
             commandLine(
@@ -155,7 +155,7 @@ private fun TaskContainer.registerBuildClibTask(
         inputs.files(project.fileTree(project.cinteropLibDir) { exclude("bazel-*/**", "prebuilt-deps/**") })
         outputs.files(outFile)
 
-        dependsOn("checkBazel")
+        dependsOn(":checkBazel")
     }
 }
 

gradle-plugin/gradle.properties

@@ -42,3 +42,7 @@ kotlinx.rpc.plugin.internalDevelopment=true
 
 # set to true when building IDE compiler plugin artifacts
 kotlinx.rpc.forIdeBuild=false
+
+# enable code sharing between similar native targets:
+# https://www.jetbrains.com/help/kotlin-multiplatform-dev/multiplatform-share-on-platforms.html
+kotlin.mpp.enableCInteropCommonization=true

gradle.properties

@@ -42,3 +42,7 @@ kotlinx.rpc.plugin.internalDevelopment=true
 
 # set to true when building IDE compiler plugin artifacts
 kotlinx.rpc.forIdeBuild=false
+
+# enable code sharing between similar native targets:
+# https://www.jetbrains.com/help/kotlin-multiplatform-dev/multiplatform-share-on-platforms.html
+kotlin.mpp.enableCInteropCommonization=true

protoc-gen/gradle.properties

@@ -42,3 +42,7 @@ kotlinx.rpc.plugin.internalDevelopment=true
 
 # set to true when building IDE compiler plugin artifacts
 kotlinx.rpc.forIdeBuild=false
+
+# enable code sharing between similar native targets:
+# https://www.jetbrains.com/help/kotlin-multiplatform-dev/multiplatform-share-on-platforms.html
+kotlin.mpp.enableCInteropCommonization=true