diff --git a/build.gradle.kts b/build.gradle.kts index 061444a..f005f4a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,32 +1,16 @@ -plugins { - kotlin("jvm") version "2.2.10" - kotlin("plugin.serialization") version "2.2.20" -} - -group = "moe.rosa" -version = "0.1.0" - -repositories { - mavenCentral() -} - -dependencies { - testImplementation(kotlin("test")) - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0") - implementation(kotlin("reflect")) -} -kotlin { - jvmToolchain(24) -} - -tasks.build.configure { +tasks.register("build").configure { + group = "build" + dependsOn("test") + dependsOn(":plt-build:build") dependsOn(":plt-build-wrapper:compileGo") dependsOn(":plt-fetch:compileGo") dependsOn(":plt-pkg:compileGo") dependsOn(":plt-server:compileGo") dependsOn(":plt-updated:compileGo") } -tasks.test.configure { +tasks.register("test").configure { + group = "verification" + dependsOn(":plt-build:test") dependsOn(":plt-build-wrapper:testGo") dependsOn(":plt-fetch:testGo") dependsOn(":plt-pkg:testGo") diff --git a/buildSrc/src/main/kotlin/moe/rosa/planterette/buildsrc/GoPlugin.kt b/buildSrc/src/main/kotlin/moe/rosa/planterette/buildsrc/GoPlugin.kt index a611251..c3c2bde 100644 --- a/buildSrc/src/main/kotlin/moe/rosa/planterette/buildsrc/GoPlugin.kt +++ b/buildSrc/src/main/kotlin/moe/rosa/planterette/buildsrc/GoPlugin.kt @@ -11,7 +11,7 @@ class GoPlugin : Plugin { group = "go" description = "compile all go source files and output into build directory" workingDir(project.layout.projectDirectory) - commandLine("go", "build", "-o", "../build/go") + commandLine("go", "build", "-o", "../build/go/${project.name}") } project.tasks.register("runGo", Exec::class.java) { group = "go" diff --git a/plt-build/build.gradle.kts b/plt-build/build.gradle.kts index 888c792..767fa68 100644 --- a/plt-build/build.gradle.kts +++ b/plt-build/build.gradle.kts @@ -1,5 +1,6 @@ plugins { - id("java") + kotlin("jvm") version "2.2.10" + kotlin("plugin.serialization") version "2.2.20" } group = "moe.rosa" @@ -13,8 +14,17 @@ dependencies { testImplementation(platform("org.junit:junit-bom:5.10.0")) testImplementation("org.junit.jupiter:junit-jupiter") testRuntimeOnly("org.junit.platform:junit-platform-launcher") + + testImplementation(kotlin("test")) + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0") + implementation(kotlin("reflect")) +} + +kotlin { + jvmToolchain(24) } tasks.test { useJUnitPlatform() -} \ No newline at end of file +} +project.layout.buildDirectory.set(file("../build")) \ No newline at end of file diff --git a/plt-build/settings.gradle.kts b/plt-build/settings.gradle.kts new file mode 100644 index 0000000..415aad4 --- /dev/null +++ b/plt-build/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "plt-build" \ No newline at end of file diff --git a/plt-server/go.mod b/plt-server/go.mod index 4d28f79..71d8b4e 100644 --- a/plt-server/go.mod +++ b/plt-server/go.mod @@ -1,3 +1,3 @@ -module plt-updated +module plt-server go 1.24 diff --git a/settings.gradle.kts b/settings.gradle.kts index 926c209..4878082 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,7 +1,3 @@ -plugins { - id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" -} -rootProject.name = "planterette" include("plt-build") include("plt-build-wrapper") include("plt-fetch")