Enable native examples and the server TCK (#771)

dstepanov · web-flow · commit 14c5c0ed547f · 2024-02-21T11:32:26.000+01:00
diff --git a/buildSrc/src/main/groovy/io.micronaut.build.internal.serde-base.gradle b/buildSrc/src/main/groovy/io.micronaut.build.internal.serde-base.gradle
@@ -1,3 +1,7 @@
 repositories {
     mavenCentral()
 }
+
+configurations.configureEach {
+    resolutionStrategy.preferProjectModules()
+}
diff --git a/buildSrc/src/main/groovy/io.micronaut.build.internal.serde-examples.gradle b/buildSrc/src/main/groovy/io.micronaut.build.internal.serde-examples.gradle
@@ -3,9 +3,6 @@ plugins {
     id("io.micronaut.minimal.application")
 }
 
-configurations.all {
-    resolutionStrategy.preferProjectModules()
-}
 micronaut {
     version libs.versions.micronaut.platform.get()
 }
diff --git a/buildSrc/src/main/groovy/io.micronaut.build.internal.serde-native-examples.gradle b/buildSrc/src/main/groovy/io.micronaut.build.internal.serde-native-examples.gradle
@@ -3,9 +3,6 @@ plugins {
     id("io.micronaut.application")
 }
 
-configurations.all {
-    resolutionStrategy.preferProjectModules()
-}
 micronaut {
     version libs.versions.micronaut.platform.get()
 }
diff --git a/doc-examples/example-java/build.gradle.kts b/doc-examples/example-java/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     id("java")
-    id("io.micronaut.build.internal.serde-examples")
+    id("io.micronaut.build.internal.serde-native-examples")
 }
 
 micronaut {
diff --git a/doc-examples/example-jsonb-java/build.gradle.kts b/doc-examples/example-jsonb-java/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     id("java")
-    id("io.micronaut.build.internal.serde-examples")
+    id("io.micronaut.build.internal.serde-native-examples")
 }
 
 micronaut {
diff --git a/test-suite-http-server-tck-netty/build.gradle.kts b/test-suite-http-server-tck-netty/build.gradle.kts
@@ -1,8 +1,7 @@
 plugins {
-    java
-}
-repositories {
-    mavenCentral()
+    id ("java")
+    id ("io.micronaut.build.internal.serde-base")
+    id ("org.graalvm.buildtools.native")
 }
 
 dependencies {
@@ -23,6 +22,7 @@ dependencies {
     testImplementation(libs.junit.jupiter.engine)
     testImplementation(mnValidation.micronaut.validation)
 }
+
 tasks.withType<Test> {
     useJUnitPlatform()
 }
diff --git a/test-suite-http-server-tck-netty/src/test/java/io/micronaut/serde/http/server/tck/netty/NettyHttpServerTestSuite.java b/test-suite-http-server-tck-netty/src/test/java/io/micronaut/serde/http/server/tck/netty/NettyHttpServerTestSuite.java
@@ -24,7 +24,8 @@
 @ExcludeClassNamePatterns({
     "io.micronaut.http.server.tck.tests.constraintshandler.ControllerConstraintHandlerTest",
     "io.micronaut.http.server.tck.tests.forms.FormsInputNumberOptionalTest",
-    "io.micronaut.http.server.tck.tests.forms.FormsSubmissionsWithListsTest"
+    "io.micronaut.http.server.tck.tests.forms.FormsSubmissionsWithListsTest",
+    "io.micronaut.http.server.tck.tests.staticresources.StaticResourceTest" // Graal fails to see /assets from the TCK as a resource
 })
 @SelectPackages({
         "io.micronaut.http.server.tck.tests",

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,7 @@`
`1`	`1`	`repositories {`
`2`	`2`	`mavenCentral()`
`3`	`3`	`}`
	`4`	`+`
	`5`	`+configurations.configureEach {`
	`6`	`+ resolutionStrategy.preferProjectModules()`
	`7`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,6 @@ plugins {`
`3`	`3`	`id("io.micronaut.minimal.application")`
`4`	`4`	`}`
`5`	`5`
`6`		`-configurations.all {`
`7`		`- resolutionStrategy.preferProjectModules()`
`8`		`-}`
`9`	`6`	`micronaut {`
`10`	`7`	`version libs.versions.micronaut.platform.get()`
`11`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,6 @@ plugins {`
`3`	`3`	`id("io.micronaut.application")`
`4`	`4`	`}`
`5`	`5`
`6`		`-configurations.all {`
`7`		`- resolutionStrategy.preferProjectModules()`
`8`		`-}`
`9`	`6`	`micronaut {`
`10`	`7`	`version libs.versions.micronaut.platform.get()`
`11`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`plugins {`
`2`	`2`	`id("java")`
`3`		`- id("io.micronaut.build.internal.serde-examples")`
	`3`	`+ id("io.micronaut.build.internal.serde-native-examples")`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`micronaut {`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,7 @@`
`1`	`1`	`plugins {`
`2`		`- java`
`3`		`-}`
`4`		`-repositories {`
`5`		`- mavenCentral()`
	`2`	`+ id ("java")`
	`3`	`+ id ("io.micronaut.build.internal.serde-base")`
	`4`	`+ id ("org.graalvm.buildtools.native")`
`6`	`5`	`}`
`7`	`6`
`8`	`7`	`dependencies {`
`@@ -23,6 +22,7 @@ dependencies {`
`23`	`22`	`testImplementation(libs.junit.jupiter.engine)`
`24`	`23`	`testImplementation(mnValidation.micronaut.validation)`
`25`	`24`	`}`
	`25`	`+`
`26`	`26`	`tasks.withType<Test> {`
`27`	`27`	`useJUnitPlatform()`
`28`	`28`	`}`