Adopt go tool for running pkl-gen-go, update dependencies (#11)

Author: HT154

.circleci/config.pkl

@@ -31,7 +31,7 @@ jobs {
   ["test"] {
     docker {
       new {
-        image = "cimg/go:1.23"
+        image = "cimg/go:1.25"
       }
     }
     steps {
@@ -41,9 +41,8 @@ jobs {
         command = """
           mkdir -p /tmp/bin
           export PATH=$PATH:/tmp/bin
-          curl -L -o /tmp/bin/pkl https://github.com/apple/pkl/releases/download/0.29.0/pkl-linux-amd64
+          curl -L -o /tmp/bin/pkl https://github.com/apple/pkl/releases/download/0.29.1/pkl-linux-amd64
           chmod +x /tmp/bin/pkl
-          go install github.com/apple/pkl-go/cmd/pkl-gen-go@latest
           go list -f '{{.Dir}}/...' -m | xargs go generate
           go list -f '{{.Dir}}/...' -m | xargs go test
           """

.circleci/config.yml

@@ -10,14 +10,13 @@ jobs:
         command: |-
           mkdir -p /tmp/bin
           export PATH=$PATH:/tmp/bin
-          curl -L -o /tmp/bin/pkl https://github.com/apple/pkl/releases/download/0.29.0/pkl-linux-amd64
+          curl -L -o /tmp/bin/pkl https://github.com/apple/pkl/releases/download/0.29.1/pkl-linux-amd64
           chmod +x /tmp/bin/pkl
-          go install github.com/apple/pkl-go/cmd/pkl-gen-go@latest
           go list -f '{{.Dir}}/...' -m | xargs go generate
           go list -f '{{.Dir}}/...' -m | xargs go test
         name: test
     docker:
-    - image: cimg/go:1.23
+    - image: cimg/go:1.25
 workflows:
   prb:
     jobs:

README.adoc

@@ -2,5 +2,10 @@
 
 Ready-go-to examples that demonstrate using Pkl with Go applications.
 
-* link:./simple[Simple Example]
-* link:./buildtimeeval[Build Time Evaluation Example]
+* link:./simple[Simple Example] illustrates a basic web service that uses Pkl to drive configuration.
+* link:./buildtimeeval[Build Time Evaluation Example] is similar to the simple example but moves Pkl evaluation from run time to build time.
+
+=== Requirements
+
+* Go >1.25
+* Pkl >0.29.1

README.md

@@ -1,5 +1,5 @@
 amends "pkl:Project"
 
 dependencies {
-  ["go"] { uri = "package://pkg.pkl-lang.org/pkl-go/[email protected].0" }
+  ["go"] { uri = "package://pkg.pkl-lang.org/pkl-go/[email protected].1" }
 }

buildtimeeval/PklProject

@@ -3,9 +3,9 @@
   "resolvedDependencies": {
     "package://pkg.pkl-lang.org/pkl-go/pkl.golang@0": {
       "type": "remote",
-      "uri": "projectpackage://pkg.pkl-lang.org/pkl-go/[email protected].0",
+      "uri": "projectpackage://pkg.pkl-lang.org/pkl-go/[email protected].1",
       "checksums": {
-        "sha256": "cc351272251f7d0c93cd93de413f49898effcc432d832135ee9412dda39aea89"
+        "sha256": "8116c0ad12a9b7284642871dd698c6ff70d018cb1bfe77b4d1fb7871781e73bf"
       }
     }
   }

buildtimeeval/PklProject.deps.json

@@ -31,19 +31,11 @@ This approach is not feasible if:
 
 == Codegen
 
-To generate new Pkl sources for the AppConfig module, first install the
-Go code generator:
+To generate new Pkl sources for the AppConfig module, run:
 
 [source,bash]
 ----
-go install github.com/apple/pkl-go/cmd/pkl-gen-go@latest
-----
-
-With that installed, generate Go sources via:
-
-[source,bash]
-----
-pkl-gen-go pkl/AppConfig.pkl
+go tool pkl-gen-go pkl/AppConfig.pkl
 ----
 
 The code generator detects that the Go package for `AppConfig` is

buildtimeeval/README.adoc

@@ -14,6 +14,6 @@
 // limitations under the License.
 // ===----------------------------------------------------------------------===//
 
-//go:generate pkl-gen-go pkl/AppConfig.pkl
+//go:generate go tool pkl-gen-go pkl/AppConfig.pkl
 //go:generate go run cmd/internal/generate-pkl-data/main.go
 package buildtimeeval

buildtimeeval/generate.go

@@ -2,46 +2,52 @@ module github.com/apple/pkl-go-examples/buildtimeeval
 
 go 1.23.7
 
-toolchain go1.23.11
+toolchain go1.25.0
 
 require (
-	github.com/apple/pkl-go v0.11.0
-	github.com/gin-gonic/gin v1.10.0
+	github.com/apple/pkl-go v0.11.1
+	github.com/gin-gonic/gin v1.10.1
 	github.com/go-redis/redis/v8 v8.11.5
-	github.com/stretchr/testify v1.10.0
+	github.com/stretchr/testify v1.11.1
 )
 
 require (
-	github.com/bytedance/sonic v1.11.6 // indirect
-	github.com/bytedance/sonic/loader v0.1.1 // indirect
-	github.com/cespare/xxhash/v2 v2.2.0 // indirect
-	github.com/cloudwego/base64x v0.1.4 // indirect
-	github.com/cloudwego/iasm v0.2.0 // indirect
+	github.com/bytedance/sonic v1.14.0 // indirect
+	github.com/bytedance/sonic/loader v0.3.0 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
+	github.com/cloudwego/base64x v0.1.6 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
-	github.com/gabriel-vasile/mimetype v1.4.3 // indirect
-	github.com/gin-contrib/sse v0.1.0 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.10 // indirect
+	github.com/gin-contrib/sse v1.1.0 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-playground/validator/v10 v10.20.0 // indirect
-	github.com/goccy/go-json v0.10.2 // indirect
+	github.com/go-playground/validator/v10 v10.27.0 // indirect
+	github.com/goccy/go-json v0.10.5 // indirect
+	github.com/google/go-cmp v0.7.0 // indirect
+	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.7 // indirect
+	github.com/klauspost/cpuid/v2 v2.3.0 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/pelletier/go-toml/v2 v2.2.2 // indirect
+	github.com/pelletier/go-toml/v2 v2.2.4 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/spf13/cobra v1.8.0 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
-	github.com/ugorji/go/codec v1.2.12 // indirect
+	github.com/ugorji/go/codec v1.3.0 // indirect
 	github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
 	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
-	golang.org/x/arch v0.8.0 // indirect
-	golang.org/x/crypto v0.23.0 // indirect
-	golang.org/x/net v0.25.0 // indirect
-	golang.org/x/sys v0.20.0 // indirect
-	golang.org/x/text v0.15.0 // indirect
-	google.golang.org/protobuf v1.34.1 // indirect
+	golang.org/x/arch v0.20.0 // indirect
+	golang.org/x/crypto v0.41.0 // indirect
+	golang.org/x/mod v0.26.0 // indirect
+	golang.org/x/net v0.43.0 // indirect
+	golang.org/x/sys v0.35.0 // indirect
+	golang.org/x/text v0.28.0 // indirect
+	google.golang.org/protobuf v1.36.8 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
+
+tool github.com/apple/pkl-go/cmd/pkl-gen-go