From 978b515682f4b73fcc12fa8f855ef77e1ff46539 Mon Sep 17 00:00:00 2001 From: Adam <897017+asemy@users.noreply.github.com> Date: Sat, 30 Oct 2021 18:49:52 +0200 Subject: [PATCH] get code compiling (add java as srcdir) --- modules/factorio-events-data-model/build.gradle.kts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/factorio-events-data-model/build.gradle.kts b/modules/factorio-events-data-model/build.gradle.kts index 4f2aa33..b82d1a5 100644 --- a/modules/factorio-events-data-model/build.gradle.kts +++ b/modules/factorio-events-data-model/build.gradle.kts @@ -56,6 +56,8 @@ open class ProtocPlugin : Plugin { project.dependencies { 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 */ @@ -151,6 +153,7 @@ open class ProtocPlugin : Plugin { val genSrcDir = project.layout.buildDirectory.dir("protobuf/generated-sources") val ktGenSrc = genSrcDir.map { it.dir("kotlin") } + val jGenSrc = genSrcDir.map { it.dir("java") } project.mkdir(ktGenSrc) @@ -159,6 +162,7 @@ open class ProtocPlugin : Plugin { project.sourceSets.named("main") { this.java.srcDir(ktGenSrc) + this.java.srcDir(jGenSrc) } // sourceSets.main.get().kotlin.srcDir(ktGenSrc) @@ -171,6 +175,7 @@ open class ProtocPlugin : Plugin { project.plugins.withType { project.extensions.configure { this.module.generatedSourceDirs.add(ktGenSrc.get().asFile) + this.module.generatedSourceDirs.add(jGenSrc.get().asFile) } }