Fix JPMS for gRPC (#390)

Author: Mr3zee

grpc/grpc-core/build.gradle.kts

@@ -14,17 +14,20 @@ kotlin {
                 api(projects.core)
                 api(projects.utils)
                 api(libs.coroutines.core)
+
+                implementation(libs.atomicfu)
             }
         }
 
         jvmMain {
             dependencies {
+                api(libs.grpc.api)
                 api(libs.grpc.util)
                 api(libs.grpc.stub)
                 api(libs.grpc.protobuf)
-                api(libs.grpc.kotlin.stub)
+                implementation(libs.grpc.kotlin.stub) // causes problems to jpms if api
                 api(libs.protobuf.java.util)
-                api(libs.protobuf.kotlin)
+                implementation(libs.protobuf.kotlin)
             }
         }
     }

jpms-check/build.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
 import util.targets.hasJavaModule
@@ -11,9 +11,13 @@ plugins {
 
 description = "Internal module for checking JPMS compliance"
 
-tasks.register("generateModuleInfo") {
+val excludedProjects = listOf(
+    "protobuf-plugin",
+)
+
+val generateModuleInfo = tasks.register("generateModuleInfo") {
     val modules = project.rootProject.subprojects
-        .filter { it.hasJavaModule }
+        .filter { it.applicableForCheck() }
         .map { it.javaModuleName() }
 
     val moduleInfoPath = project.projectDir.absolutePath + "/src/main/java/module-info.java"
@@ -33,7 +37,7 @@ tasks.register("generateModuleInfo") {
 }
 
 tasks.getByName<JavaCompile>("compileJava") {
-    dependsOn("generateModuleInfo")
+    dependsOn(generateModuleInfo)
 
     val projectFiles = project.files()
     doFirst {
@@ -58,9 +62,13 @@ dependencies {
                 .joinToString(":", prefix = ":") { segment -> segment.name }
 
             it.plugins.withId("maven-publish") {
-                if (it.hasJavaModule) {
+                if (it.applicableForCheck()) {
                     api(project(dep))
                 }
             }
         }
 }
+
+private fun Project.applicableForCheck(): Boolean {
+    return hasJavaModule && name !in excludedProjects
+}

versions-root/libs.versions.toml

@@ -103,6 +103,7 @@ protobuf-java = { module = "com.google.protobuf:protobuf-java", version.ref = "p
 protobuf-java-util = { module = "com.google.protobuf:protobuf-java-util", version.ref = "protobuf" }
 protobuf-kotlin = { module = "com.google.protobuf:protobuf-kotlin", version.ref = "protobuf" }
 protobuf-gradle-plugin = { module = "com.google.protobuf:protobuf-gradle-plugin", version.ref = "protobuf-gradle" }
+grpc-api = { module = "io.grpc:grpc-api", version.ref = "grpc" }
 grpc-stub = { module = "io.grpc:grpc-stub", version.ref = "grpc" }
 grpc-util = { module = "io.grpc:grpc-util", version.ref = "grpc" }
 grpc-netty = { module = "io.grpc:grpc-netty", version.ref = "grpc" }