From a381e01886bbf6e7653264e7da0989e24d3b9c54 Mon Sep 17 00:00:00 2001 From: Adam <897017+aSemy@users.noreply.github.com> Date: Sat, 2 Jul 2022 09:50:11 +0200 Subject: [PATCH] move lua to src/generated, and tweak IntelliJ 'mark as excluded/src' --- modules/events-mod/build.gradle.kts | 41 +++++++++++-------- .../src/{main => generated}/lua/control.lua | 0 .../lua/generated/kafkatorio-schema.lua | 0 .../{main => generated}/lua/lualib_bundle.lua | 0 .../lua/main/PacketEmitter.lua | 0 .../lua/main/cache/EventDataCache.lua | 0 .../lua/main/commands/kafkatorioCommands.lua | 0 .../lua/main/events/configurationUpdate.lua | 0 .../lua/main/events/consoleUpdates.lua | 0 .../lua/main/events/converters.lua | 0 .../lua/main/events/entityUpdates.lua | 0 .../lua/main/events/eventTypeCheck.lua | 0 .../lua/main/events/mapChunkUpdates.lua | 0 .../lua/main/events/playerUpdates.lua | 0 .../lua/main/events/prototypeUpdates.lua | 0 .../lua/main/events/registerHandlers.lua | 0 .../lua/main/events/settingsUpdate.lua | 0 .../lua/main/events/surfaceUpdates.lua | 0 .../lua/main/global-init.lua | 0 .../lua/main/queue/queue.lua | 0 .../lua/main/settings/KafkatorioSettings.lua | 0 .../src/{main => generated}/lua/settings.lua | 0 modules/events-server/build.gradle.kts | 9 ++-- 23 files changed, 31 insertions(+), 19 deletions(-) rename modules/events-mod/src/{main => generated}/lua/control.lua (100%) rename modules/events-mod/src/{main => generated}/lua/generated/kafkatorio-schema.lua (100%) rename modules/events-mod/src/{main => generated}/lua/lualib_bundle.lua (100%) rename modules/events-mod/src/{main => generated}/lua/main/PacketEmitter.lua (100%) rename modules/events-mod/src/{main => generated}/lua/main/cache/EventDataCache.lua (100%) rename modules/events-mod/src/{main => generated}/lua/main/commands/kafkatorioCommands.lua (100%) rename modules/events-mod/src/{main => generated}/lua/main/events/configurationUpdate.lua (100%) rename modules/events-mod/src/{main => generated}/lua/main/events/consoleUpdates.lua (100%) rename modules/events-mod/src/{main => generated}/lua/main/events/converters.lua (100%) rename modules/events-mod/src/{main => generated}/lua/main/events/entityUpdates.lua (100%) rename modules/events-mod/src/{main => generated}/lua/main/events/eventTypeCheck.lua (100%) rename modules/events-mod/src/{main => generated}/lua/main/events/mapChunkUpdates.lua (100%) rename modules/events-mod/src/{main => generated}/lua/main/events/playerUpdates.lua (100%) rename modules/events-mod/src/{main => generated}/lua/main/events/prototypeUpdates.lua (100%) rename modules/events-mod/src/{main => generated}/lua/main/events/registerHandlers.lua (100%) rename modules/events-mod/src/{main => generated}/lua/main/events/settingsUpdate.lua (100%) rename modules/events-mod/src/{main => generated}/lua/main/events/surfaceUpdates.lua (100%) rename modules/events-mod/src/{main => generated}/lua/main/global-init.lua (100%) rename modules/events-mod/src/{main => generated}/lua/main/queue/queue.lua (100%) rename modules/events-mod/src/{main => generated}/lua/main/settings/KafkatorioSettings.lua (100%) rename modules/events-mod/src/{main => generated}/lua/settings.lua (100%) diff --git a/modules/events-mod/build.gradle.kts b/modules/events-mod/build.gradle.kts index 59dc28b..6be5d7d 100644 --- a/modules/events-mod/build.gradle.kts +++ b/modules/events-mod/build.gradle.kts @@ -7,6 +7,8 @@ import dev.adamko.kafkatorio.gradle.typescriptAttributes import dev.adamko.kafkatorio.task.TypescriptToLuaTask import net.swiftzer.semver.SemVer import org.apache.tools.ant.filters.ReplaceTokens +import org.gradle.plugins.ide.idea.model.Module as IdeaImlModule +import org.gradle.plugins.ide.idea.model.Path as IdeaImlPath plugins { dev.adamko.kafkatorio.lang.node @@ -71,8 +73,8 @@ val typescriptToLua by tasks.registering(TypescriptToLuaTask::class) { dependsOn(tasks.npmInstall, installEventsTsSchema, tasks.updatePackageJson) sourceFiles.set(tsSrcDir) -// outputDirectory.set(layout.buildDirectory.dir("typescriptToLua")) - outputDirectory.set(layout.projectDirectory.dir("src/main/lua")) + + outputDirectory.set(layout.projectDirectory.dir("src/generated/lua")) } @@ -184,38 +186,45 @@ tasks.updatePackageJson { tasks.assemble { dependsOn(installEventsTsSchema, tasks.updatePackageJson) } +val typescriptSrcDir: File = file("src/main/typescript") +val luaSrcDir: File = file("src/generated/lua") +val resourcesDir: File = file("src/main/resources") +val typescriptTestSrcDir: File = file("src/test/typescript") +val generatedSrcDir: File = file("src/generated") + + idea { module { sourceDirs.plusAssign( listOf( - file("src/main/typescript"), - file("src/main/lua"), + typescriptSrcDir, + luaSrcDir, ) ) // sourceDirs = sourceDirs + file("src/main/lua") - resourceDirs = resourceDirs + file("src/main/resources") - testSourceDirs = testSourceDirs + file("src/test/typescript") + resourceDirs = resourceDirs + resourcesDir + testSourceDirs = testSourceDirs + typescriptTestSrcDir + + generatedSourceDirs = generatedSourceDirs + generatedSrcDir +// excludeDirs = excludeDirs + generatedSrcDir - generatedSourceDirs = generatedSourceDirs + listOf( - file("src/main/lua") - ) iml { whenMerged { - require(this is org.gradle.plugins.ide.idea.model.Module) + require(this is IdeaImlModule) sourceDirs.plusAssign( listOf( - file("src/main/typescript"), - file("src/main/lua"), + typescriptSrcDir, + luaSrcDir, ) ) generatedSourceFolders.plusAssign( - org.gradle.plugins.ide.idea.model.Path(file("src/main/lua").toURI().toString()) + IdeaImlPath(luaSrcDir.toURI().toString()) ) -// sourceDirs = sourceDirs + file("src/main/typescript") - resourceDirs = resourceDirs + file("src/main/resources") - testSourceDirs = testSourceDirs + file("src/test/typescript") + resourceDirs = resourceDirs + resourcesDir + testSourceDirs = testSourceDirs + typescriptTestSrcDir +// excludeDirs = excludeDirs + generatedSrcDir } } } diff --git a/modules/events-mod/src/main/lua/control.lua b/modules/events-mod/src/generated/lua/control.lua similarity index 100% rename from modules/events-mod/src/main/lua/control.lua rename to modules/events-mod/src/generated/lua/control.lua diff --git a/modules/events-mod/src/main/lua/generated/kafkatorio-schema.lua b/modules/events-mod/src/generated/lua/generated/kafkatorio-schema.lua similarity index 100% rename from modules/events-mod/src/main/lua/generated/kafkatorio-schema.lua rename to modules/events-mod/src/generated/lua/generated/kafkatorio-schema.lua diff --git a/modules/events-mod/src/main/lua/lualib_bundle.lua b/modules/events-mod/src/generated/lua/lualib_bundle.lua similarity index 100% rename from modules/events-mod/src/main/lua/lualib_bundle.lua rename to modules/events-mod/src/generated/lua/lualib_bundle.lua diff --git a/modules/events-mod/src/main/lua/main/PacketEmitter.lua b/modules/events-mod/src/generated/lua/main/PacketEmitter.lua similarity index 100% rename from modules/events-mod/src/main/lua/main/PacketEmitter.lua rename to modules/events-mod/src/generated/lua/main/PacketEmitter.lua diff --git a/modules/events-mod/src/main/lua/main/cache/EventDataCache.lua b/modules/events-mod/src/generated/lua/main/cache/EventDataCache.lua similarity index 100% rename from modules/events-mod/src/main/lua/main/cache/EventDataCache.lua rename to modules/events-mod/src/generated/lua/main/cache/EventDataCache.lua diff --git a/modules/events-mod/src/main/lua/main/commands/kafkatorioCommands.lua b/modules/events-mod/src/generated/lua/main/commands/kafkatorioCommands.lua similarity index 100% rename from modules/events-mod/src/main/lua/main/commands/kafkatorioCommands.lua rename to modules/events-mod/src/generated/lua/main/commands/kafkatorioCommands.lua diff --git a/modules/events-mod/src/main/lua/main/events/configurationUpdate.lua b/modules/events-mod/src/generated/lua/main/events/configurationUpdate.lua similarity index 100% rename from modules/events-mod/src/main/lua/main/events/configurationUpdate.lua rename to modules/events-mod/src/generated/lua/main/events/configurationUpdate.lua diff --git a/modules/events-mod/src/main/lua/main/events/consoleUpdates.lua b/modules/events-mod/src/generated/lua/main/events/consoleUpdates.lua similarity index 100% rename from modules/events-mod/src/main/lua/main/events/consoleUpdates.lua rename to modules/events-mod/src/generated/lua/main/events/consoleUpdates.lua diff --git a/modules/events-mod/src/main/lua/main/events/converters.lua b/modules/events-mod/src/generated/lua/main/events/converters.lua similarity index 100% rename from modules/events-mod/src/main/lua/main/events/converters.lua rename to modules/events-mod/src/generated/lua/main/events/converters.lua diff --git a/modules/events-mod/src/main/lua/main/events/entityUpdates.lua b/modules/events-mod/src/generated/lua/main/events/entityUpdates.lua similarity index 100% rename from modules/events-mod/src/main/lua/main/events/entityUpdates.lua rename to modules/events-mod/src/generated/lua/main/events/entityUpdates.lua diff --git a/modules/events-mod/src/main/lua/main/events/eventTypeCheck.lua b/modules/events-mod/src/generated/lua/main/events/eventTypeCheck.lua similarity index 100% rename from modules/events-mod/src/main/lua/main/events/eventTypeCheck.lua rename to modules/events-mod/src/generated/lua/main/events/eventTypeCheck.lua diff --git a/modules/events-mod/src/main/lua/main/events/mapChunkUpdates.lua b/modules/events-mod/src/generated/lua/main/events/mapChunkUpdates.lua similarity index 100% rename from modules/events-mod/src/main/lua/main/events/mapChunkUpdates.lua rename to modules/events-mod/src/generated/lua/main/events/mapChunkUpdates.lua diff --git a/modules/events-mod/src/main/lua/main/events/playerUpdates.lua b/modules/events-mod/src/generated/lua/main/events/playerUpdates.lua similarity index 100% rename from modules/events-mod/src/main/lua/main/events/playerUpdates.lua rename to modules/events-mod/src/generated/lua/main/events/playerUpdates.lua diff --git a/modules/events-mod/src/main/lua/main/events/prototypeUpdates.lua b/modules/events-mod/src/generated/lua/main/events/prototypeUpdates.lua similarity index 100% rename from modules/events-mod/src/main/lua/main/events/prototypeUpdates.lua rename to modules/events-mod/src/generated/lua/main/events/prototypeUpdates.lua diff --git a/modules/events-mod/src/main/lua/main/events/registerHandlers.lua b/modules/events-mod/src/generated/lua/main/events/registerHandlers.lua similarity index 100% rename from modules/events-mod/src/main/lua/main/events/registerHandlers.lua rename to modules/events-mod/src/generated/lua/main/events/registerHandlers.lua diff --git a/modules/events-mod/src/main/lua/main/events/settingsUpdate.lua b/modules/events-mod/src/generated/lua/main/events/settingsUpdate.lua similarity index 100% rename from modules/events-mod/src/main/lua/main/events/settingsUpdate.lua rename to modules/events-mod/src/generated/lua/main/events/settingsUpdate.lua diff --git a/modules/events-mod/src/main/lua/main/events/surfaceUpdates.lua b/modules/events-mod/src/generated/lua/main/events/surfaceUpdates.lua similarity index 100% rename from modules/events-mod/src/main/lua/main/events/surfaceUpdates.lua rename to modules/events-mod/src/generated/lua/main/events/surfaceUpdates.lua diff --git a/modules/events-mod/src/main/lua/main/global-init.lua b/modules/events-mod/src/generated/lua/main/global-init.lua similarity index 100% rename from modules/events-mod/src/main/lua/main/global-init.lua rename to modules/events-mod/src/generated/lua/main/global-init.lua diff --git a/modules/events-mod/src/main/lua/main/queue/queue.lua b/modules/events-mod/src/generated/lua/main/queue/queue.lua similarity index 100% rename from modules/events-mod/src/main/lua/main/queue/queue.lua rename to modules/events-mod/src/generated/lua/main/queue/queue.lua diff --git a/modules/events-mod/src/main/lua/main/settings/KafkatorioSettings.lua b/modules/events-mod/src/generated/lua/main/settings/KafkatorioSettings.lua similarity index 100% rename from modules/events-mod/src/main/lua/main/settings/KafkatorioSettings.lua rename to modules/events-mod/src/generated/lua/main/settings/KafkatorioSettings.lua diff --git a/modules/events-mod/src/main/lua/settings.lua b/modules/events-mod/src/generated/lua/settings.lua similarity index 100% rename from modules/events-mod/src/main/lua/settings.lua rename to modules/events-mod/src/generated/lua/settings.lua diff --git a/modules/events-server/build.gradle.kts b/modules/events-server/build.gradle.kts index 769882a..a2a99f3 100644 --- a/modules/events-server/build.gradle.kts +++ b/modules/events-server/build.gradle.kts @@ -1,6 +1,5 @@ import dev.adamko.kafkatorio.task.KafkaConsumerGroupsTask import org.jetbrains.kotlin.gradle.tasks.KotlinCompile -import org.jetbrains.kotlin.utils.addToStdlib.applyIf plugins { @@ -74,10 +73,10 @@ dependencies { application { -// mainClass.set("dev.adamko.kafkatorio.processor.EventProcessorKt") mainClass.set("dev.adamko.kafkatorio.server.EventsServerKt") } + tasks.withType().configureEach { kotlinOptions.freeCompilerArgs += listOf( "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi", @@ -93,6 +92,7 @@ val kafkaStateDirDelete by tasks.registering(Delete::class) { delete(kafkaStateDir) } + val kafkaConsumersDelete by tasks.registering(KafkaConsumerGroupsTask.DeleteAll::class) { group = project.name } @@ -100,6 +100,9 @@ val kafkaConsumersDelete by tasks.registering(KafkaConsumerGroupsTask.DeleteAll: idea { module { - excludeDirs = excludeDirs + kafkaStateDir.asFile + excludeDirs = excludeDirs + listOf( + kafkaStateDir.asFile, + file("server-data"), + ) } }