From 465cc2a7c304fb000787782e6d8e05075f24babc Mon Sep 17 00:00:00 2001 From: Adam <897017+asemy@users.noreply.github.com> Date: Sat, 30 Oct 2021 11:33:40 +0200 Subject: [PATCH] kotlin generation working --- modules/factorio-events-data-model/build.gradle.kts | 11 ++++++++--- .../src/main/proto/FactorioServerLogRecord.proto | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/modules/factorio-events-data-model/build.gradle.kts b/modules/factorio-events-data-model/build.gradle.kts index bfc4af8..010baf6 100644 --- a/modules/factorio-events-data-model/build.gradle.kts +++ b/modules/factorio-events-data-model/build.gradle.kts @@ -102,11 +102,10 @@ open class ProtocPlugin : Plugin { val protoFile = project.layout.projectDirectory.file("src/main/proto/FactorioServerLogRecord.proto") - - args( parseSpaceSeparatedArgs( """ + -I=${protoLibsDir.map { it.asFile.canonicalPath }.get()} -I=${srcDir.asFile.canonicalPath} --java_out=${javaOut.get().asFile.canonicalPath} --kotlin_out=${kotlinOut.get().asFile.canonicalPath} @@ -122,6 +121,11 @@ open class ProtocPlugin : Plugin { // """.trimIndent() ) ) + doFirst { + javaOut.get().asFile.mkdirs() + kotlinOut.get().asFile.mkdirs() + } + // doLast { // executable = protocPrepare.flatMap { it.protocOutput }.get().asFile.canonicalPath // } @@ -129,7 +133,8 @@ open class ProtocPlugin : Plugin { } } -abstract class ProtocPluginConfig(private val project: Project) : java.io.Serializable { // TODO remove serializable? +abstract class ProtocPluginConfig(private val project: Project) : + java.io.Serializable { // TODO remove serializable? val protocWorkingDir: DirectoryProperty = project.objects.directoryProperty() diff --git a/modules/factorio-events-data-model/src/main/proto/FactorioServerLogRecord.proto b/modules/factorio-events-data-model/src/main/proto/FactorioServerLogRecord.proto index 4c4f188..906f31a 100644 --- a/modules/factorio-events-data-model/src/main/proto/FactorioServerLogRecord.proto +++ b/modules/factorio-events-data-model/src/main/proto/FactorioServerLogRecord.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -option optimize_for = LITE_RUNTIME; +//option optimize_for = LITE_RUNTIME; option java_multiple_files = true; package dev.adamko.factorioevents;