Skip to content

Commit bdecf1b

Browse files
authored
Fix sources.jar generation for instrumentation & plugin (#324)
Plugin, Instrumentation-Extensions & Instrumentation-Runner had essentially empty sources.jar artifacts because the current integration only looked into src/main/java, but these modules changed to src/main/kotlin already. Redefining the declaration makes all source folders appear now
1 parent 3931ad3 commit bdecf1b

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

build-logic/src/main/kotlin/Deployment.kt

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,11 @@ fun Project.configureDeployment(deployConfig: Deployed) {
4545
archiveClassifier.set("sources")
4646

4747
if (isAndroid) {
48-
from(android.sourceSets.main.java.srcDirs)
48+
// This declaration includes Java source directories
49+
from(android.sourceSets.main.kotlin.srcDirs)
4950
} else {
50-
from(sourceSets.main.java.srcDirs)
51+
// This declaration includes Kotlin & Groovy source directories
52+
from(sourceSets.main.allJava.srcDirs)
5153
}
5254
}
5355

@@ -294,11 +296,11 @@ private class AndroidDsl(project: Project) {
294296
class MainDsl(sourceSets: NamedDomainObjectCollection<Any>) {
295297
private val delegate = sourceSets.named("main").get()
296298

297-
val java = JavaDsl(delegate)
299+
val kotlin = KotlinDsl(delegate)
298300

299-
class JavaDsl(main: Any) {
301+
class KotlinDsl(main: Any) {
300302
val srcDirs = main.javaClass
301-
.getDeclaredMethod("getJavaDirectories")
303+
.getDeclaredMethod("getKotlinDirectories")
302304
.invoke(main) as Set<File>
303305
}
304306
}

plugin/android-junit5/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ val versionClassTask = tasks.register<Copy>("createVersionClass") {
9999
}
100100
sourceSets {
101101
main {
102-
java.srcDir(genFolder)
102+
kotlin.srcDir(genFolder)
103103
}
104104
}
105105
tasks.withType<DokkaTask> {

0 commit comments

Comments
 (0)