Apply test dependencies (#177)

* Update Gradle Metal to 0.4+ * Add test dependencies to testImplementation configuration * Update Gradle Metal to 0.4
pedrolamarao · Nov 25, 2023 · e0ca57b · e0ca57b
1 parent a636bdb
commit e0ca57b
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 36 deletions.
diff --git a/elf/build.gradle.kts b/elf/build.gradle.kts
@@ -9,17 +9,12 @@ group = "br.dev.pedrolamarao.metal.elf"
 
 dependencies {
     api(project(":psys"))
+    testImplementation(project(":googletest"))
 }
 
 metal {
     compileOptions = listOf("-fasm-blocks","-g","-std=c++20","-Wno-unused-command-line-argument")
 
     applications { test { targets = setOf("x86_64-pc-linux-gnu","x86_64-pc-windows-msvc") } }
     ixx.main { public = true }
-}
-
-// TODO: enhance Gradle Metal with component-specific dependencies
-
-dependencies {
-    implementation(project(":googletest"))
 }
diff --git a/gradle/plugins/build.gradle.kts b/gradle/plugins/build.gradle.kts
@@ -6,7 +6,7 @@ group = "br.dev.pedrolamarao.metal.plugins"
 
 val elf = "1.0.0-SNAPSHOT"
 val gdb = "1.0.0-SNAPSHOT"
-val metal = "0.3"
+val metal = "0.4"
 
 kotlin.jvmToolchain {
     languageVersion.set(JavaLanguageVersion.of(17))

diff --git a/gradle/plugins/src/main/kotlin/metal-test.gradle.kts b/gradle/plugins/src/main/kotlin/metal-test.gradle.kts
@@ -3,11 +3,11 @@ plugins {
     id("br.dev.pedrolamarao.metal.cxx")
 }
 
-val linkExecutable = metal.applications.named("main").flatMap { it.linkTask }
+val mainExecutable = metal.applications.named("main").flatMap { it.output }
 
 val createImage = project.tasks.register<MultibootCreateImageTask>("make-main-image") {
-    dependsOn(linkExecutable)
-    inputFile = linkExecutable.flatMap { it.output }
+    dependsOn("link-main")
+    inputFile = mainExecutable
 }
 
 tasks.register("image") {
@@ -17,7 +17,7 @@ tasks.register("image") {
 
 val testImage = project.tasks.register<MultibootTestImageTask>("test-main-image") {
     imageFile = createImage.flatMap { it.outputFile }
-    executableFile = linkExecutable.flatMap { it.output }
+    executableFile = mainExecutable
 }
 
 tasks.test {

diff --git a/multiboot2/foo/build.gradle.kts b/multiboot2/foo/build.gradle.kts
@@ -7,17 +7,12 @@ plugins {
 
 dependencies {
     api(project(":psys"))
+    testImplementation(project(":googletest"))
 }
 
 metal {
     compileOptions = listOf("-fasm-blocks","-g","-std=c++20","-Wno-unused-command-line-argument")
 
     applications { test { targets = setOf("x86_64-pc-linux-gnu","x86_64-pc-windows-msvc") } }
     ixx { main { public = true } }
-}
-
-// TODO: enhance Gradle Metal with component-specific dependencies
-
-dependencies {
-    implementation(project(":googletest"))
 }
diff --git a/pc/build.gradle.kts b/pc/build.gradle.kts
@@ -9,17 +9,12 @@ group = "br.dev.pedrolamarao.metal.pc"
 
 dependencies {
     api(project(":psys"))
+    testImplementation(project(":googletest"))
 }
 
 metal {
     compileOptions = listOf("-fasm-blocks","-g","-std=c++20","-Wno-unused-command-line-argument")
 
     applications { test { targets = setOf("x86_64-pc-linux-gnu","x86_64-pc-windows-msvc") } }
     ixx { main { public = true } }
-}
-
-// TODO: enhance Gradle Metal with component-specific dependencies
-
-dependencies {
-    implementation(project(":googletest"))
 }
diff --git a/psys/build.gradle.kts b/psys/build.gradle.kts
@@ -7,15 +7,13 @@ plugins {
 
 group = "br.dev.pedrolamarao.metal.psys"
 
+dependencies {
+    testImplementation(project(":googletest"))
+}
+
 metal {
     compileOptions = listOf("-fasm-blocks","-g","-std=c++20")
 
     applications { test { targets = setOf("x86_64-pc-linux-gnu","x86_64-pc-windows-msvc") } }
     ixx { main { public = true } }
-}
-
-// TODO: enhance Gradle Metal with component-specific dependencies
-
-dependencies {
-    implementation(project(":googletest"))
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -11,7 +11,7 @@ pluginManagement {
     resolutionStrategy {
         eachPlugin {
             if (requested.id.id.startsWith("br.dev.pedrolamarao.metal.")) {
-                useModule("br.dev.pedrolamarao.gradle.metal:plugins:0.3")
+                useModule("br.dev.pedrolamarao.gradle.metal:plugins:0.4")
             }
         }
     }

diff --git a/x86/build.gradle.kts b/x86/build.gradle.kts
@@ -11,6 +11,7 @@ group = "br.dev.pedrolamarao.metal.x86"
 
 dependencies {
     api(project(":psys"))
+    testImplementation(project(":googletest"))
 }
 
 metal {
@@ -30,10 +31,4 @@ tasks.named<MetalCompileTask>("compile-main-cxx") {
         "x86_64-pc-linux-gnu",
         "x86_64-pc-windows-msvc" -> include("x86_64/*")
     }
-}
-
-// TODO: enhance Gradle Metal with component-specific dependencies
-
-dependencies {
-    implementation(project(":googletest"))
 }