Skip to content

Commit fbfe6c3

Browse files
authored
Merge pull request #1464 from lesserwhirls/sourcejar
Fix sourceJar building
2 parents a4ef01a + c4bc599 commit fbfe6c3

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

.github/workflows/deps.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,5 @@ jobs:
1313
java-version: '11'
1414
- name: Build with Gradle (refresh dependencies)
1515
run: ./gradlew clean classes testClasses assemble --refresh-dependencies
16+
- name: Build sourceJars
17+
run: ./gradlew sourceJar

gradle/any/protobuf.gradle

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,6 @@ protobuf {
88
}
99
}
1010

11-
// Add generated sources to the main sourceSet, which keeps intellij happy.
12-
// Now, we could use the idea plugin and let gradle generate intellij project files, but it seems as though gradle is
13-
// considering deprecating their plugin and upstreaming it to JetBrains. Might not be a good bet to start relying on
14-
// the idea plugin at this point.
15-
// https://github.com/gradle/gradle/issues/1366#issuecomment-546928184
16-
sourceSets.main.java.srcDirs += ['build/generated/sources/proto/main/java',
17-
'build/generated/sources/proto/main/grpc']
18-
1911
jacocoTestReport {
2012
afterEvaluate {
2113
// Exclude proto generated sources and classes from the coverage reports

0 commit comments

Comments
 (0)