get code compiling (add java as srcdir)

This commit is contained in:
Adam 2021-10-30 18:49:52 +02:00
parent 31ae0c9800
commit 978b515682

View file

@ -56,6 +56,8 @@ open class ProtocPlugin : Plugin<Project> {
project.dependencies { project.dependencies {
protobufLib("com.google.protobuf:protobuf-javalite:3.19.1") protobufLib("com.google.protobuf:protobuf-javalite:3.19.1")
// implementation("com.google.protobuf:protobuf-javalite:3.19.1")
implementation("com.google.protobuf:protobuf-kotlin-lite:3.19.1")
} }
/** Download protobuf libs */ /** Download protobuf libs */
@ -151,6 +153,7 @@ open class ProtocPlugin : Plugin<Project> {
val genSrcDir = project.layout.buildDirectory.dir("protobuf/generated-sources") val genSrcDir = project.layout.buildDirectory.dir("protobuf/generated-sources")
val ktGenSrc = genSrcDir.map { it.dir("kotlin") } val ktGenSrc = genSrcDir.map { it.dir("kotlin") }
val jGenSrc = genSrcDir.map { it.dir("java") }
project.mkdir(ktGenSrc) project.mkdir(ktGenSrc)
@ -159,6 +162,7 @@ open class ProtocPlugin : Plugin<Project> {
project.sourceSets.named("main") { project.sourceSets.named("main") {
this.java.srcDir(ktGenSrc) this.java.srcDir(ktGenSrc)
this.java.srcDir(jGenSrc)
} }
// sourceSets.main.get().kotlin.srcDir(ktGenSrc) // sourceSets.main.get().kotlin.srcDir(ktGenSrc)
@ -171,6 +175,7 @@ open class ProtocPlugin : Plugin<Project> {
project.plugins.withType<IdeaPlugin> { project.plugins.withType<IdeaPlugin> {
project.extensions.configure<IdeaModel> { project.extensions.configure<IdeaModel> {
this.module.generatedSourceDirs.add(ktGenSrc.get().asFile) this.module.generatedSourceDirs.add(ktGenSrc.get().asFile)
this.module.generatedSourceDirs.add(jGenSrc.get().asFile)
} }
} }