grpc-native: Finish iOS support

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

Author: Jozott00

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

@@ -18,7 +18,6 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.DefaultCInteropSettings
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 import org.jetbrains.kotlin.gradle.tasks.CInteropProcess
 import java.io.File
-import kotlin.io.resolve
 
 // works with the cinterop-c Bazel project
 fun KotlinMultiplatformExtension.configureCLibCInterop(
@@ -46,9 +45,9 @@ fun KotlinMultiplatformExtension.configureCLibCInterop(
     val buildCinteropCLib = project.tasks.register<Exec>("buildCinteropCLib") {
         group = "build"
         workingDir = cinteropCLib
-        commandLine("bash", "-c", "bazel build $bazelTask --config=release")
-        inputs.files(project.fileTree(cinteropCLib) { exclude("bazel-*/**") })
-        outputs.dir(cinteropCLib.resolve("bazel-bin"))
+        commandLine("bash", "-c", "${cinteropCLib}/build_all_targets.sh $bazelTask out")
+        inputs.files(project.fileTree(cinteropCLib) { exclude("bazel-*/**", "out/**") })
+        outputs.dir(cinteropCLib.resolve("out"))
 
         dependsOn(checkBazel)
     }

grpc/grpc-core/build.gradle.kts

@@ -77,10 +77,7 @@ kotlin {
                 cinteropCLib.resolve("include"),
                 cinteropCLib.resolve("bazel-cinterop-c/external/grpc+/include"),
             )
-            extraOpts(
-                "-libraryPath", "${cinteropCLib.resolve("bazel-out/darwin_arm64-opt/bin")}",
-                "-libraryPath", "${cinteropCLib.resolve("out")}",
-            )
+            extraOpts("-libraryPath", "${cinteropCLib.resolve("out")}")
         }
     }
 }

grpc/grpc-core/gradle.properties

@@ -13,7 +13,8 @@ kotlinx.rpc.exclude.tvosArm64=true
 kotlinx.rpc.exclude.tvosSimulatorArm64=true
 kotlinx.rpc.exclude.tvosX64=true
 kotlinx.rpc.exclude.watchosArm32=true
-kotlinx.rpc.exclude.watchosArm64=true
 kotlinx.rpc.exclude.watchosDeviceArm64=true
-kotlinx.rpc.exclude.watchosSimulatorArm64=true
 kotlinx.rpc.exclude.watchosX64=true
+# TODO: Remove once we ant to activate WatchOS (these two targets are already prepared for activation)
+kotlinx.rpc.exclude.watchosArm64=true
+kotlinx.rpc.exclude.watchosSimulatorArm64=true

grpc/grpc-core/src/nativeInterop/cinterop/libkgrpc.def

@@ -12,3 +12,6 @@ strictEnums = grpc_status_code grpc_connectivity_state grpc_call_error
 staticLibraries.macos_arm64 = libkgrpc_static.macos_arm64.a
 staticLibraries.ios_arm64 = libkgrpc_static.ios_arm64.a
 staticLibraries.ios_simulator_arm64 = libkgrpc_static.ios_sim_arm64.a
+# TODO: Uncomment when activating WatchOS
+# staticLibraries.watchos_arm64 = libkgrpc_static.watchos_arm64_32.a
+# staticLibraries.watchos_simulator_arm64 = libkgrpc_static.watchos_sim_arm64.a

protobuf/protobuf-core/build.gradle.kts

@@ -59,10 +59,7 @@ kotlin {
             includeDirs(
                 cinteropCLib.resolve("include")
             )
-            extraOpts(
-                "-libraryPath", "${cinteropCLib.resolve("bazel-out/darwin_arm64-opt/bin")}",
-                "-libraryPath", "${cinteropCLib.resolve("out")}",
-            )
+            extraOpts("-libraryPath", "${cinteropCLib.resolve("out")}")
         }
     }
 }

protobuf/protobuf-core/gradle.properties

@@ -13,7 +13,8 @@ kotlinx.rpc.exclude.tvosArm64=true
 kotlinx.rpc.exclude.tvosSimulatorArm64=true
 kotlinx.rpc.exclude.tvosX64=true
 kotlinx.rpc.exclude.watchosArm32=true
-kotlinx.rpc.exclude.watchosArm64=true
 kotlinx.rpc.exclude.watchosDeviceArm64=true
-kotlinx.rpc.exclude.watchosSimulatorArm64=true
 kotlinx.rpc.exclude.watchosX64=true
+# TODO: Remove once we ant to activate WatchOS (these two targets are already prepared for activation)
+kotlinx.rpc.exclude.watchosArm64=true
+kotlinx.rpc.exclude.watchosSimulatorArm64=true

protobuf/protobuf-core/src/nativeInterop/cinterop/libprotowire.def

@@ -6,4 +6,7 @@ noStringConversion = pw_encoder_write_string
 
 staticLibraries.macos_arm64 = libprotowire_static.macos_arm64.a
 staticLibraries.ios_arm64 = libprotowire_static.ios_arm64.a
-staticLibraries.ios_simulator_arm64 = libprotowire_static.ios_sim_arm64.a
+staticLibraries.ios_simulator_arm64 = libprotowire_static.ios_sim_arm64.a
+# TODO: Uncomment when activating WatchOS
+# staticLibraries.watchos_arm64 = libprotowire_static.watchos_arm64_32.a
+# staticLibraries.watchos_simulator_arm64 = libprotowire_static.watchos_sim_arm64.a