From 0eb1c4182922a2fe0cdd404611dfbedfd7ebdebf Mon Sep 17 00:00:00 2001 From: Sean Arms <67096+lesserwhirls@users.noreply.github.com> Date: Thu, 31 Jul 2025 09:54:37 -0600 Subject: [PATCH 1/2] Test building sourceJars for PRs --- .github/workflows/deps.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/deps.yml b/.github/workflows/deps.yml index 7ab63440f4..39ea7afbc4 100644 --- a/.github/workflows/deps.yml +++ b/.github/workflows/deps.yml @@ -13,3 +13,5 @@ jobs: java-version: '11' - name: Build with Gradle (refresh dependencies) run: ./gradlew clean classes testClasses assemble --refresh-dependencies + - name: Build sourceJars + run: ./gradlew sourceJar From c4bc5994cf85181a7ab6d7ca6d797844a0211e4c Mon Sep 17 00:00:00 2001 From: Sean Arms <67096+lesserwhirls@users.noreply.github.com> Date: Thu, 31 Jul 2025 09:48:11 -0600 Subject: [PATCH 2/2] sourceSet modification no longer needed post proto plugin upgrade --- gradle/any/protobuf.gradle | 8 -------- 1 file changed, 8 deletions(-) diff --git a/gradle/any/protobuf.gradle b/gradle/any/protobuf.gradle index 9acc2ecdc3..d82f7580b1 100644 --- a/gradle/any/protobuf.gradle +++ b/gradle/any/protobuf.gradle @@ -8,14 +8,6 @@ protobuf { } } -// Add generated sources to the main sourceSet, which keeps intellij happy. -// Now, we could use the idea plugin and let gradle generate intellij project files, but it seems as though gradle is -// considering deprecating their plugin and upstreaming it to JetBrains. Might not be a good bet to start relying on -// the idea plugin at this point. -// https://github.com/gradle/gradle/issues/1366#issuecomment-546928184 -sourceSets.main.java.srcDirs += ['build/generated/sources/proto/main/java', - 'build/generated/sources/proto/main/grpc'] - jacocoTestReport { afterEvaluate { // Exclude proto generated sources and classes from the coverage reports