lazzexus/Kafkatorio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

jvm+kt+ts code gen working

Browse source
This commit is contained in:
Adam 2021-11-03 09:48:30 +01:00
parent ac8428f36d
commit 96d8ceda2c
4 changed files with 108 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

5
buildSrc/build.gradle.kts
View file

@ -24,6 +24,11 @@ dependencies {
}
tasks.withType<KotlinCompile>().configureEach {
kotlinOptions {
jvmTarget = "11"
}
kotlinOptions.freeCompilerArgs += listOf(
"-Xopt-in=kotlin.OptIn",
"-Xopt-in=kotlin.ExperimentalStdlibApi",

8
buildSrc/src/main/kotlin/dev/adamko/gradle/pbandg/pattern/KotlinMultiplatformProjectConfiguration.kt
View file

@ -10,7 +10,7 @@ class KotlinMultiplatformProjectConfiguration : Plugin<Project> {
override fun apply(project: Project) {
project.afterEvaluate {
addSourceSets(this)
addSourceSets(project)
}
}
@ -19,10 +19,6 @@ class KotlinMultiplatformProjectConfiguration : Plugin<Project> {
project.extensions.findByType<KotlinMultiplatformExtension>()?.apply {
project.logger.lifecycle("Kotlin Multiplatform source sets: ${sourceSets.joinToString { "${it.name} / ${it.kotlin.sourceDirectories.files.joinToString()}" }}")
// sourceSets.whenObjectAdded {
// this.name
// }
//
val jvmProto = this.sourceSets.maybeCreate("jvmProto").apply {
kotlin.srcDir(project.layout.pbAndGBuildDir.get().dir("generated-sources/java"))
@ -55,7 +51,7 @@ class KotlinMultiplatformProjectConfiguration : Plugin<Project> {
//
// targets .forEach {
// when (it.platformType){
// KotlinPlatformType.jvm -> TODO()
// KotlinPlatformType.jvm -> {}
// KotlinPlatformType.js -> {
// it.defaultConfigurationName
// }

51
buildSrc/src/main/kotlin/dev/adamko/gradle/pbandg/pb-and-g.gradle.kts
View file

@ -1,8 +1,6 @@
package dev.adamko.gradle.pbandg
import dev.adamko.gradle.pbandg.Constants.pbAndGBuildDir
import dev.adamko.gradle.pbandg.pattern.KotlinJvmProjectConfiguration
import dev.adamko.gradle.pbandg.pattern.KotlinMultiplatformProjectConfiguration
import dev.adamko.gradle.pbandg.settings.PBAndGSettings
import dev.adamko.gradle.pbandg.task.ProtobufCompileTask
import dev.adamko.gradle.pbandg.task.ProtobufPrepareLibrariesTask
@ -19,21 +17,21 @@ plugins {
// IntelliJPattern().apply(project)
//}
plugins.withId("org.jetbrains.kotlin.jvm") {
logger.info("Configuring Kotlin JVM plugin for PB&G")
KotlinJvmProjectConfiguration().apply(project)
}
plugins.withId("org.jetbrains.kotlin.multiplatform") {
logger.info("Configuring Kotlin Multiplatform plugin for PB&G")
KotlinMultiplatformProjectConfiguration().apply(project)
}
//plugins.withId("org.jetbrains.kotlin.jvm") {
// logger.info("Configuring Kotlin JVM plugin for PB&G")
// KotlinJvmProjectConfiguration().apply(project)
//}
//
//plugins.withId("org.jetbrains.kotlin.multiplatform") {
// logger.info("Configuring Kotlin Multiplatform plugin for PB&G")
// KotlinMultiplatformProjectConfiguration().apply(project)
//}
val pbAndGSettings =
project.extensions.create(Constants.PBG_SETTINGS_NAME, PBAndGSettings::class, project)
//val protocDep = ProtobufCompilerDependency(project, pbAndGSettings)
val protocDep = project.configurations.create("protobufCompiler") {
val protocDep: Configuration = project.configurations.create("protobufCompiler") {
this.description = "Define a single dependency that provides the protoc.exe for this system"
isVisible = false
isCanBeConsumed = false
@ -53,14 +51,10 @@ val protobufLibraryDependencies: Configuration =
isTransitive = false
}
project.dependencies {
protobufLibraryDependencies("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")
// protobufLibraryDependencies("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")
protobufLibraryDependencies("com.google.protobuf:protobuf-javalite:3.19.1") {
because("This dep contains common Google .proto files that will be extracted")
}
}
val protobufPrepareLibrariesTask =
@ -73,7 +67,7 @@ project.tasks.withType<ProtobufCompileTask> {
protobufLibraryDirectories.add(protobufPrepareLibrariesTask.flatMap { it.librariesDirectory })
val exe = protocDep.singleFile
logger.lifecycle("protoc.exe: $exe")
logger.debug("Configuring Protobuf task with protoc.exe: $exe")
protocExecutable.set(exe)
}
@ -84,18 +78,11 @@ val aggregateTask = project.tasks.register<Sync>("protobufCompileAll") {
val genSrcDir = project.layout.pbAndGBuildDir.map { it.dir("generated-sources") }
val pbCompileTasks = tasks.withType<ProtobufCompileTask>()
from(pbCompileTasks.map { it.temporaryDir })
into(genSrcDir)
includeEmptyDirs = false
val pbCompileTasks = tasks.withType<ProtobufCompileTask>()
from(pbCompileTasks.map { it.temporaryDir })
into(genSrcDir)
includeEmptyDirs = false
}
//project.tasks.assemble { dependsOn(aggregateTask) }
///** Convert `.proto` files to Kotlin */
//val pbCompileTask = project.tasks.create<ProtobufCompileTask>("protobufJava") {
// protocOutputs += KotlinOutput()
// protocOutputs += JavaOutput()
//}
project.tasks.assemble { dependsOn(aggregateTask) }