From 759d4806c05d63a8a656b33712a70577f4fb1ccc Mon Sep 17 00:00:00 2001 From: Daniel Chao Date: Thu, 28 Mar 2024 07:57:28 -0700 Subject: [PATCH] Fix java/kotlin usage examples (#372) Co-authored-by: Fruxz <28064149+TheFruxz@users.noreply.github.com> --- docs/docs.gradle.kts | 3 ++- docs/modules/java-binding/examples/JavaConfigExample.java | 2 +- docs/modules/kotlin-binding/examples/KotlinConfigExample.kt | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/docs/docs.gradle.kts b/docs/docs.gradle.kts index e3b1b7a1..06e6d2c2 100644 --- a/docs/docs.gradle.kts +++ b/docs/docs.gradle.kts @@ -10,12 +10,13 @@ sourceSets { java { srcDir(file("modules/pkl-core/examples")) srcDir(file("modules/pkl-config-java/examples")) + srcDir(file("modules/java-binding/examples")) } val kotlin = project.extensions .getByType() .sourceSets[name] .kotlin - kotlin.srcDir(file("modules/pkl-config-kotlin/examples")) + kotlin.srcDir(file("modules/kotlin-binding/examples")) } } diff --git a/docs/modules/java-binding/examples/JavaConfigExample.java b/docs/modules/java-binding/examples/JavaConfigExample.java index 8d1b2c0d..dd8d5a6a 100644 --- a/docs/modules/java-binding/examples/JavaConfigExample.java +++ b/docs/modules/java-binding/examples/JavaConfigExample.java @@ -13,7 +13,7 @@ public class JavaConfigExample { Config config; try (var evaluator = ConfigEvaluator.preconfigured()) { // <1> config = evaluator.evaluate( - ModuleSource.text("pigeon { age = 5; diet = \"Seeds\" }")); // <2> + ModuleSource.text("pigeon { age = 5; diet = new Listing { \"Seeds\" } }")); // <2> } var pigeon = config.get("pigeon"); // <3> var age = pigeon.get("age").as(int.class); // <4> diff --git a/docs/modules/kotlin-binding/examples/KotlinConfigExample.kt b/docs/modules/kotlin-binding/examples/KotlinConfigExample.kt index 997c3ff4..49c6d5d8 100644 --- a/docs/modules/kotlin-binding/examples/KotlinConfigExample.kt +++ b/docs/modules/kotlin-binding/examples/KotlinConfigExample.kt @@ -3,6 +3,7 @@ import org.pkl.config.java.ConfigEvaluator import org.pkl.config.kotlin.forKotlin import org.pkl.config.kotlin.to +import org.pkl.core.ModuleSource import org.junit.jupiter.api.Test // the pkl/pkl-examples repo has a similar example @@ -12,7 +13,7 @@ class KotlinConfigExample { // tag::usage[] val evaluator = ConfigEvaluator.preconfigured().forKotlin() // <1> val config = evaluator.use { // <2> - it.evaluateText("""pigeon { age = 5; diet = "Seeds" }""") + it.evaluate(ModuleSource.text("""pigeon { age = 5; diet = new Listing { "Seeds" } }""")) } val pigeon = config["pigeon"] // <3> val age = pigeon["age"].to() // <4> @@ -25,7 +26,7 @@ class KotlinConfigExample { // tag::nullable[] val evaluator = ConfigEvaluator.preconfigured().forKotlin() val config = evaluator.use { - it.evaluateText("name = null") // <1> + it.evaluate(ModuleSource.text("name = null")) // <1> } val name = config["name"].to() // <2> // end::nullable[]