fix: update jni to v0.0.5, fix nested package proto path

xaionaro@dx.center · xaionaro@dx.center · commit 718b6262c4d8 · 2026-03-22T03:42:22.000Z
Update jni dependency to v0.0.5 which exports spec.Java/spec.Overlays
embedded FS and ParseSpec/ParseOverlay functions.

Fix proto filename for nested packages (e.g., health/connect): use
filepath.Base to extract the last path segment for the filename instead
of using the full package path, which created double-nested directories.
diff --git a/go.mod b/go.mod
@@ -5,7 +5,7 @@ go 1.24.0
 toolchain go1.24.2
 
 require (
-	github.com/AndroidGoLab/jni v0.0.4
+	github.com/AndroidGoLab/jni v0.0.5
 	github.com/spf13/cobra v1.10.2
 	github.com/stretchr/testify v1.11.1
 	google.golang.org/grpc v1.79.2
diff --git a/go.sum b/go.sum
@@ -1,5 +1,7 @@
 github.com/AndroidGoLab/jni v0.0.4 h1:DCDkxy8JeZYvYeZgOSeYHTVbeTIE5h+C0AeOe5OG9Ds=
 github.com/AndroidGoLab/jni v0.0.4/go.mod h1:ZYHgM39mTiJ3JZVvhn1+4j8H3CiHRIq8l/s2gsK7JZw=
+github.com/AndroidGoLab/jni v0.0.5 h1:Z/jZ+xYfoQETxqPKsfnrjBYEqs28J4O121HgEI7yBNs=
+github.com/AndroidGoLab/jni v0.0.5/go.mod h1:ZYHgM39mTiJ3JZVvhn1+4j8H3CiHRIq8l/s2gsK7JZw=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
 github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
diff --git a/tools/pkg/protogen/generate_test.go b/tools/pkg/protogen/generate_test.go
@@ -73,7 +73,7 @@ func TestGenerate_AllRealSpecs(t *testing.T) {
 			continue
 		}
 
-		protoPath := filepath.Join(outputDir, pkgName, pkgName+".proto")
+		protoPath := filepath.Join(outputDir, pkgName, filepath.Base(pkgName)+".proto")
 		data, err := os.ReadFile(protoPath)
 		if err != nil {
 			t.Errorf("%s (pkg=%s): proto file not created at %s: %v", baseName, pkgName, protoPath, err)
diff --git a/tools/pkg/protogen/protogen.go b/tools/pkg/protogen/protogen.go
@@ -33,7 +33,9 @@ func Generate(specPath, overlayPath, outputDir, goModule string) error {
 		return fmt.Errorf("mkdir %s: %w", pkgDir, err)
 	}
 
-	outputPath := filepath.Join(pkgDir, merged.Package+".proto")
+	// Use only the last path segment as the filename (e.g., "health/connect" → "connect.proto").
+	baseName := filepath.Base(merged.Package)
+	outputPath := filepath.Join(pkgDir, baseName+".proto")
 	if err := renderProto(data, outputPath); err != nil {
 		return fmt.Errorf("render proto: %w", err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ func TestGenerate_AllRealSpecs(t *testing.T) {`
`73`	`73`	`continue`
`74`	`74`	`}`
`75`	`75`
`76`		`- protoPath := filepath.Join(outputDir, pkgName, pkgName+".proto")`
	`76`	`+ protoPath := filepath.Join(outputDir, pkgName, filepath.Base(pkgName)+".proto")`
`77`	`77`	`data, err := os.ReadFile(protoPath)`
`78`	`78`	`if err != nil {`
`79`	`79`	`t.Errorf("%s (pkg=%s): proto file not created at %s: %v", baseName, pkgName, protoPath, err)`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,9 @@ func Generate(specPath, overlayPath, outputDir, goModule string) error {`
`33`	`33`	`return fmt.Errorf("mkdir %s: %w", pkgDir, err)`
`34`	`34`	`}`
`35`	`35`
`36`		`- outputPath := filepath.Join(pkgDir, merged.Package+".proto")`
	`36`	`+ // Use only the last path segment as the filename (e.g., "health/connect" → "connect.proto").`
	`37`	`+ baseName := filepath.Base(merged.Package)`
	`38`	`+ outputPath := filepath.Join(pkgDir, baseName+".proto")`
`37`	`39`	`if err := renderProto(data, outputPath); err != nil {`
`38`	`40`	`return fmt.Errorf("render proto: %w", err)`
`39`	`41`	`}`