grpc-native: Cleanup

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

Author: Jozott00

cinterop-c/.gitignore

@@ -12,6 +12,3 @@
 /.aswb/
 /.clwb/
 .idea/
-
-out/
-tmp/

cinterop-c/MODULE.bazel

@@ -3,8 +3,6 @@ module(
     version = "0.1",
 )
 
-http_file = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file")
-
 # rules_cc for cc_library support
 bazel_dep(
     name = "rules_cc",
@@ -37,36 +35,3 @@ bazel_dep(
     version = GRPC_VERSION,
     repo_name = "com_github_grpc_grpc",
 )
-
-## gRPC pre-built
-
-local_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:local.bzl", "local_repository")
-
-local_repository(
-    name = "prebuilt_deps",
-    path = "prebuilt-deps",
-)
-
-http_file(
-    name = "grpc_ios_arm64",
-    sha256 = "7bc13a15c59850048e77b5719ea262a6fcc22884ab42c9f14f38859200faac9b",
-    urls = [GRPC_BASE + "ios_arm64.a"],
-)
-
-http_file(
-    name = "grpc_ios_sim_arm64",
-    sha256 = "55fde875508372860125ee8505ef4e84b95c9620744378a99f8f4095292dcae5",
-    urls = [GRPC_BASE + "ios_simulator_arm64.a"],
-)
-
-http_file(
-    name = "grpc_ios_x64",
-    sha256 = "7544113fe9b6c9d0a57c8b8864b5272e01e3a64ea36cd0802d4a76e98ad5e232",
-    urls = [GRPC_BASE + "ios_x64.a"],
-)
-
-http_file(
-    name = "grpc_macos_arm64",
-    sha256 = "6cf466a285832ecd0f41041164c412e9b541388210058310d7bb59f6a27d09de",
-    urls = [GRPC_BASE + "macos_arm64.a"],
-)

cinterop-c/extract_include_dir.sh

@@ -6,14 +6,14 @@
 set -Eeuo pipefail
 trap 'echo "ERROR: Build failed at ${BASH_SOURCE}:${LINENO}" >&2' ERR
 
-# Builds a static library for a specific platform (os/arch).
+# Extract all headers in the /include directory of the given target.
 #
 # Usage:
-#   ./build_target.sh //path:libtarget out_dir <platform> <short> <os>
+#   ./extract_include_dir.sh <target> <output-directory>
 # Example:
-#   ./build_target.sh :protowire_static out @build_bazel_apple_support//platforms:ios_arm64 ios_arm64 ios
+#   ./extract_include_dir.sh //prebuilt-deps/grpc_fat:grpc_fat prebuilt-deps/grpc_fat
 #
-# The example will produce ./out/libprotowire_static.ios_arm64.a
+# The example will produce the prebuilt-deps/grpc_fat/include directory with all headers.
 
 LABEL="${1:?need bazel target label}"
 DST="${2:?need output destination}"

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

@@ -2,23 +2,12 @@
  * Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
-import util.other.capitalized
 import util.other.isPublicModule
 import util.other.libs
-import util.other.maybeNamed
 import util.setupPage
-import util.tasks.ValidatePublishedArtifactsTask
-import util.tasks.configureNpm
-import util.tasks.registerChangelogTask
-import util.tasks.registerDumpPlatformTableTask
-import util.tasks.registerVerifyPlatformTableTask
-import kotlin.io.path.exists
-import kotlin.io.path.isDirectory
-import kotlin.io.path.listDirectoryEntries
-import kotlin.io.path.name
-import kotlin.io.path.readText
+import util.tasks.*
 import java.nio.file.Path
-import kotlin.io.path.createFile
+import kotlin.io.path.*
 
 plugins {
     id("org.jetbrains.dokka")
@@ -121,3 +110,17 @@ gradle.afterProject {
         }
     }
 }
+
+
+tasks.register<Exec>("checkBazel") {
+    commandLine("which", "bazel")
+    isIgnoreExitValue = true
+    doLast {
+        if (executionResult.get().exitValue == 0) {
+            val path = standardOutput.toString().trim()
+            logger.debug("bazel: {}", path)
+        } else {
+            throw GradleException("'bazel' not found on PATH. Please install Bazel (https://bazel.build/).")
+        }
+    }
+}

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

@@ -4,7 +4,6 @@
 
 package util
 
-import org.gradle.api.GradleException
 import org.gradle.api.NamedDomainObjectContainer
 import org.gradle.api.Project
 import org.gradle.api.file.Directory
@@ -31,20 +30,6 @@ fun KotlinMultiplatformExtension.configureCLibCInterop(
     val cLibSource = project.cinteropLibDir
     val cLibOutDir = project.bazelBuildDir.dir(buildTargetName).asFile
 
-
-    // TODO: Replace function implementation, so it does not use an internal API
-    fun findProgram(name: String) = org.gradle.internal.os.OperatingSystem.current().findInPath(name)
-    val checkBazel = project.tasks.register("checkBazel") {
-        doLast {
-            val bazelPath = findProgram("bazel")
-            if (bazelPath != null) {
-                logger.debug("bazel: {}", bazelPath)
-            } else {
-                throw GradleException("'bazel' not found on PATH. Please install Bazel (https://bazel.build/).")
-            }
-        }
-    }
-
     targets.withType<KotlinNativeTarget>().configureEach {
         // the name used for the static library files (e.g. iosSimulatorArm64 -> ios_simulator_arm64)
         val platformShortName = konanTarget.visibleName
@@ -118,6 +103,7 @@ fun KotlinMultiplatformExtension.configureCLibDependency(
 
     if (bazelExtractIncludeTask != null) {
         project.tasks.register<Exec>("buildIncludeDirCLib${buildTargetName.capitalized()}") {
+            dependsOn("checkBazel")
             group = "build"
             workingDir = project.cinteropLibDir
             commandLine(
@@ -169,8 +155,7 @@ private fun TaskContainer.registerBuildClibTask(
         inputs.files(project.fileTree(project.cinteropLibDir) { exclude("bazel-*/**", "prebuilt-deps/**") })
         outputs.files(outFile)
 
-        // TODO: how to register the task idempotently?
-        // dependsOn(checkBazel)
+        dependsOn("checkBazel")
     }
 }
 

gradle-conventions/src/main/kotlin/util/tasks/bazel.kt

@@ -79,7 +79,6 @@ kotlin {
             includeDirs(
                 cLibSource.resolve("include"),
                 cLibSource.resolve("$grpcPrebuiltDir/include"),
-                cLibSource.resolve("bazel-cinterop-c/external/grpc+/include"),
             )
             extraOpts("-libraryPath", "$grpcPrebuiltDir")
             extraOpts("-libraryPath", "$cLibOutDir")
@@ -88,7 +87,8 @@ kotlin {
 
     configureCLibDependency(
         project,
-        bazelTask = "//prebuilt-deps/grpc_fat:grpc_fat"
+        bazelTask = "//prebuilt-deps/grpc_fat:grpc_fat",
+        bazelExtractIncludeTask = "//prebuilt-deps/grpc_fat:grpc_include_dir"
     )
 
 }