move lua to src/generated, and tweak IntelliJ 'mark as excluded/src'
This commit is contained in:
parent
db4350a927
commit
a381e01886
23 changed files with 31 additions and 19 deletions
|
|
@ -7,6 +7,8 @@ import dev.adamko.kafkatorio.gradle.typescriptAttributes
|
||||||
import dev.adamko.kafkatorio.task.TypescriptToLuaTask
|
import dev.adamko.kafkatorio.task.TypescriptToLuaTask
|
||||||
import net.swiftzer.semver.SemVer
|
import net.swiftzer.semver.SemVer
|
||||||
import org.apache.tools.ant.filters.ReplaceTokens
|
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 {
|
plugins {
|
||||||
dev.adamko.kafkatorio.lang.node
|
dev.adamko.kafkatorio.lang.node
|
||||||
|
|
@ -71,8 +73,8 @@ val typescriptToLua by tasks.registering(TypescriptToLuaTask::class) {
|
||||||
dependsOn(tasks.npmInstall, installEventsTsSchema, tasks.updatePackageJson)
|
dependsOn(tasks.npmInstall, installEventsTsSchema, tasks.updatePackageJson)
|
||||||
|
|
||||||
sourceFiles.set(tsSrcDir)
|
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) }
|
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 {
|
idea {
|
||||||
module {
|
module {
|
||||||
sourceDirs.plusAssign(
|
sourceDirs.plusAssign(
|
||||||
listOf(
|
listOf(
|
||||||
file("src/main/typescript"),
|
typescriptSrcDir,
|
||||||
file("src/main/lua"),
|
luaSrcDir,
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
// sourceDirs = sourceDirs + file("src/main/lua")
|
// sourceDirs = sourceDirs + file("src/main/lua")
|
||||||
resourceDirs = resourceDirs + file("src/main/resources")
|
resourceDirs = resourceDirs + resourcesDir
|
||||||
testSourceDirs = testSourceDirs + file("src/test/typescript")
|
testSourceDirs = testSourceDirs + typescriptTestSrcDir
|
||||||
|
|
||||||
|
generatedSourceDirs = generatedSourceDirs + generatedSrcDir
|
||||||
|
// excludeDirs = excludeDirs + generatedSrcDir
|
||||||
|
|
||||||
generatedSourceDirs = generatedSourceDirs + listOf(
|
|
||||||
file("src/main/lua")
|
|
||||||
)
|
|
||||||
iml {
|
iml {
|
||||||
whenMerged {
|
whenMerged {
|
||||||
require(this is org.gradle.plugins.ide.idea.model.Module)
|
require(this is IdeaImlModule)
|
||||||
|
|
||||||
sourceDirs.plusAssign(
|
sourceDirs.plusAssign(
|
||||||
listOf(
|
listOf(
|
||||||
file("src/main/typescript"),
|
typescriptSrcDir,
|
||||||
file("src/main/lua"),
|
luaSrcDir,
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
generatedSourceFolders.plusAssign(
|
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 + resourcesDir
|
||||||
resourceDirs = resourceDirs + file("src/main/resources")
|
testSourceDirs = testSourceDirs + typescriptTestSrcDir
|
||||||
testSourceDirs = testSourceDirs + file("src/test/typescript")
|
// excludeDirs = excludeDirs + generatedSrcDir
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
import dev.adamko.kafkatorio.task.KafkaConsumerGroupsTask
|
import dev.adamko.kafkatorio.task.KafkaConsumerGroupsTask
|
||||||
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
|
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
|
||||||
import org.jetbrains.kotlin.utils.addToStdlib.applyIf
|
|
||||||
|
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
|
|
@ -74,10 +73,10 @@ dependencies {
|
||||||
|
|
||||||
|
|
||||||
application {
|
application {
|
||||||
// mainClass.set("dev.adamko.kafkatorio.processor.EventProcessorKt")
|
|
||||||
mainClass.set("dev.adamko.kafkatorio.server.EventsServerKt")
|
mainClass.set("dev.adamko.kafkatorio.server.EventsServerKt")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
tasks.withType<KotlinCompile>().configureEach {
|
tasks.withType<KotlinCompile>().configureEach {
|
||||||
kotlinOptions.freeCompilerArgs += listOf(
|
kotlinOptions.freeCompilerArgs += listOf(
|
||||||
"-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
|
"-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
|
||||||
|
|
@ -93,6 +92,7 @@ val kafkaStateDirDelete by tasks.registering(Delete::class) {
|
||||||
delete(kafkaStateDir)
|
delete(kafkaStateDir)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
val kafkaConsumersDelete by tasks.registering(KafkaConsumerGroupsTask.DeleteAll::class) {
|
val kafkaConsumersDelete by tasks.registering(KafkaConsumerGroupsTask.DeleteAll::class) {
|
||||||
group = project.name
|
group = project.name
|
||||||
}
|
}
|
||||||
|
|
@ -100,6 +100,9 @@ val kafkaConsumersDelete by tasks.registering(KafkaConsumerGroupsTask.DeleteAll:
|
||||||
|
|
||||||
idea {
|
idea {
|
||||||
module {
|
module {
|
||||||
excludeDirs = excludeDirs + kafkaStateDir.asFile
|
excludeDirs = excludeDirs + listOf(
|
||||||
|
kafkaStateDir.asFile,
|
||||||
|
file("server-data"),
|
||||||
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue