Merge branch '18-append-v4-to-modpath' into 'dev'

dan-obx · dan-obx · commit 8069e1d326c0 · 2024-08-22T08:33:00.000Z
Append v4 to module path #18 See merge request objectbox/objectbox-generator!25
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 
 # ObjectBox Generator
 
-Current version: 4.0.0-alpha2
+Current version: 4.0.0-beta
 
 ObjectBox is a superfast cross-platform object-oriented database.
 ObjectBox Generator produces code for ObjectBox C, C++ and Go APIs (more languages to be supported in the future).
diff --git a/cmake/FindObjectBoxGenerator.cmake b/cmake/FindObjectBoxGenerator.cmake
@@ -31,7 +31,7 @@ The following variables are defined by this module:
 
 .. variable:: ObjectBoxGenerator_VERSION
 
-  The full version string of the used ObjectBox Generator executable, e.g. "4.0.0" or "4.0.0-alpha2".
+  The full version string of the used ObjectBox Generator executable, e.g. "4.0.0" or "4.0.0-beta".
 
 .. variable:: ObjectBoxGenerator_VERSION_MAJOR
 .. variable:: ObjectBoxGenerator_VERSION_MINOR
@@ -128,7 +128,7 @@ Generated headers and sources are written to the sub-directories ``ObjectBoxGene
 option(OBX_GENERATOR_ALLOW_FETCH "Opt-in automatic download and prepare for local execution" ON)
 
 # Updated by maintainer to latest available version:
-set(ObjectBoxGenerator_FETCH_VERSION 4.0.0-alpha2) # Note: must be safe for filename
+set(ObjectBoxGenerator_FETCH_VERSION 4.0.0-beta) # Note: must be safe for filename
 # Using the version in the directories used for the generator executable to cleanly support multiple versions.
 # This is e.g. relevant when updating to ensure fetching the new version.
 set(ObjectBoxGenerator_FETCH_DIR ${CMAKE_BINARY_DIR}/ObjectBoxGenerator-download/${ObjectBoxGenerator_FETCH_VERSION}/fetch)
diff --git a/cmd/generatorcmd.go b/cmd/generatorcmd.go
@@ -28,7 +28,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/objectbox/objectbox-generator/internal/generator"
+	"github.com/objectbox/objectbox-generator/v4/internal/generator"
 )
 
 const defaultErrorCode = 2
diff --git a/cmd/objectbox-generator/objectbox-generator.go b/cmd/objectbox-generator/objectbox-generator.go
@@ -30,11 +30,11 @@ import (
 	"os"
 	"strings"
 
-	generatorcmd "github.com/objectbox/objectbox-generator/cmd"
-	"github.com/objectbox/objectbox-generator/internal/generator"
-	cgenerator "github.com/objectbox/objectbox-generator/internal/generator/c"
-	"github.com/objectbox/objectbox-generator/internal/generator/flatbuffersc"
-	gogenerator "github.com/objectbox/objectbox-generator/internal/generator/go"
+	generatorcmd "github.com/objectbox/objectbox-generator/v4/cmd"
+	"github.com/objectbox/objectbox-generator/v4/internal/generator"
+	cgenerator "github.com/objectbox/objectbox-generator/v4/internal/generator/c"
+	"github.com/objectbox/objectbox-generator/v4/internal/generator/flatbuffersc"
+	gogenerator "github.com/objectbox/objectbox-generator/v4/internal/generator/go"
 )
 
 func main() {
diff --git a/cmd/objectbox-gogen/gogen.go b/cmd/objectbox-gogen/gogen.go
@@ -27,9 +27,9 @@ import (
 	"fmt"
 	"os"
 
-	generatorcmd "github.com/objectbox/objectbox-generator/cmd"
-	"github.com/objectbox/objectbox-generator/internal/generator"
-	gogenerator "github.com/objectbox/objectbox-generator/internal/generator/go"
+	generatorcmd "github.com/objectbox/objectbox-generator/v4/cmd"
+	"github.com/objectbox/objectbox-generator/v4/internal/generator"
+	gogenerator "github.com/objectbox/objectbox-generator/v4/internal/generator/go"
 )
 
 const VersionId = generator.VersionId
diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/objectbox/objectbox-generator
+module github.com/objectbox/objectbox-generator/v4
 
 go 1.11
 
diff --git a/internal/generator/binding/field.go b/internal/generator/binding/field.go
@@ -27,7 +27,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/objectbox/objectbox-generator/internal/generator/model"
+	"github.com/objectbox/objectbox-generator/v4/internal/generator/model"
 )
 
 // Field holds common field/property information used by specialized code parsers/generators.
diff --git a/internal/generator/binding/object.go b/internal/generator/binding/object.go
@@ -27,7 +27,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/objectbox/objectbox-generator/internal/generator/model"
+	"github.com/objectbox/objectbox-generator/v4/internal/generator/model"
 )
 
 // Object holds common entity information used by specialized code parsers/generators.
diff --git a/internal/generator/c/cgenerator.go b/internal/generator/c/cgenerator.go
@@ -28,10 +28,10 @@ import (
 	"strings"
 	"text/template"
 
-	"github.com/objectbox/objectbox-generator/internal/generator"
-	"github.com/objectbox/objectbox-generator/internal/generator/c/templates"
-	"github.com/objectbox/objectbox-generator/internal/generator/flatbuffersc"
-	"github.com/objectbox/objectbox-generator/internal/generator/model"
+	"github.com/objectbox/objectbox-generator/v4/internal/generator"
+	"github.com/objectbox/objectbox-generator/v4/internal/generator/c/templates"
+	"github.com/objectbox/objectbox-generator/v4/internal/generator/flatbuffersc"
+	"github.com/objectbox/objectbox-generator/v4/internal/generator/model"
 )
 
 type CGenerator struct {
diff --git a/internal/generator/c/maps.go b/internal/generator/c/maps.go
@@ -23,8 +23,8 @@ package cgenerator
 import (
 	flatbuffers "github.com/google/flatbuffers/go"
 
-	"github.com/objectbox/objectbox-generator/internal/generator/flatbuffersc/reflection"
-	"github.com/objectbox/objectbox-generator/internal/generator/model"
+	"github.com/objectbox/objectbox-generator/v4/internal/generator/flatbuffersc/reflection"
+	"github.com/objectbox/objectbox-generator/v4/internal/generator/model"
 )
 
 var fbsTypeToObxType = map[reflection.BaseType]model.PropertyType{
diff --git a/internal/generator/c/meta.go b/internal/generator/c/meta.go
@@ -25,9 +25,9 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/objectbox/objectbox-generator/internal/generator/binding"
-	"github.com/objectbox/objectbox-generator/internal/generator/flatbuffersc/reflection"
-	"github.com/objectbox/objectbox-generator/internal/generator/model"
+	"github.com/objectbox/objectbox-generator/v4/internal/generator/binding"
+	"github.com/objectbox/objectbox-generator/v4/internal/generator/flatbuffersc/reflection"
+	"github.com/objectbox/objectbox-generator/v4/internal/generator/model"
 )
 
 type fbsObject struct {
diff --git a/internal/generator/c/schema-reader.go b/internal/generator/c/schema-reader.go
@@ -26,9 +26,9 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/objectbox/objectbox-generator/internal/generator/binding"
-	"github.com/objectbox/objectbox-generator/internal/generator/flatbuffersc/reflection"
-	"github.com/objectbox/objectbox-generator/internal/generator/model"
+	"github.com/objectbox/objectbox-generator/v4/internal/generator/binding"
+	"github.com/objectbox/objectbox-generator/v4/internal/generator/flatbuffersc/reflection"
+	"github.com/objectbox/objectbox-generator/v4/internal/generator/model"
 )
 
 var supportedEntityAnnotations = map[string]bool{
diff --git a/internal/generator/c/templates/functions.go b/internal/generator/c/templates/functions.go
@@ -25,7 +25,7 @@ import (
 	"strings"
 	"text/template"
 
-	"github.com/objectbox/objectbox-generator/internal/generator/model"
+	"github.com/objectbox/objectbox-generator/v4/internal/generator/model"
 )
 
 // cccToUc converts CapitalCamelCase to UPPER_CASE - only used converty Go PropertyFlags names to C/Core names.
diff --git a/internal/generator/flatbuffersc/fbsc.go b/internal/generator/flatbuffersc/fbsc.go
@@ -37,7 +37,7 @@ import (
 	"fmt"
 	"unsafe"
 
-	"github.com/objectbox/objectbox-generator/internal/generator/flatbuffersc/reflection"
+	"github.com/objectbox/objectbox-generator/v4/internal/generator/flatbuffersc/reflection"
 )
 
 func ParseSchemaFile(filename string) (*reflection.Schema, error) {
diff --git a/internal/generator/flatbuffersc/fbsc_test.go b/internal/generator/flatbuffersc/fbsc_test.go
@@ -26,8 +26,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/objectbox/objectbox-generator/internal/generator/flatbuffersc/reflection"
-	"github.com/objectbox/objectbox-generator/test/assert"
+	"github.com/objectbox/objectbox-generator/v4/internal/generator/flatbuffersc/reflection"
+	"github.com/objectbox/objectbox-generator/v4/test/assert"
 )
 
 const testSchema = `
diff --git a/internal/generator/generator.go b/internal/generator/generator.go
@@ -31,11 +31,11 @@ import (
 	"strings"
 	"time"
 
-	"github.com/objectbox/objectbox-generator/internal/generator/model"
+	"github.com/objectbox/objectbox-generator/v4/internal/generator/model"
 )
 
 // Version specifies the current generator version.
-const Version = "4.0.0-alpha2"
+const Version = "4.0.0-beta"
 
 // VersionId specifies the current generator version identifier.
 // It is used to validate generated code compatibility and is increased when there are changes in the generated code.
diff --git a/internal/generator/go/ast-reader.go b/internal/generator/go/ast-reader.go
@@ -31,8 +31,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/objectbox/objectbox-generator/internal/generator/binding"
-	"github.com/objectbox/objectbox-generator/internal/generator/model"
+	"github.com/objectbox/objectbox-generator/v4/internal/generator/binding"
+	"github.com/objectbox/objectbox-generator/v4/internal/generator/model"
 )
 
 type uid = uint64
diff --git a/internal/generator/go/gogenerator.go b/internal/generator/go/gogenerator.go
@@ -28,9 +28,9 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/objectbox/objectbox-generator/internal/generator"
-	"github.com/objectbox/objectbox-generator/internal/generator/go/templates"
-	"github.com/objectbox/objectbox-generator/internal/generator/model"
+	"github.com/objectbox/objectbox-generator/v4/internal/generator"
+	"github.com/objectbox/objectbox-generator/v4/internal/generator/go/templates"
+	"github.com/objectbox/objectbox-generator/v4/internal/generator/model"
 )
 
 type GoGenerator struct {
diff --git a/internal/generator/merge.go b/internal/generator/merge.go
@@ -25,7 +25,7 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/objectbox/objectbox-generator/internal/generator/model"
+	"github.com/objectbox/objectbox-generator/v4/internal/generator/model"
 )
 
 func mergeBindingWithModelInfo(currentModel *model.ModelInfo, storedModel *model.ModelInfo) error {
diff --git a/test/basics_test.go b/test/basics_test.go
@@ -27,8 +27,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/objectbox/objectbox-generator/internal/generator"
-	"github.com/objectbox/objectbox-generator/test/assert"
+	"github.com/objectbox/objectbox-generator/v4/internal/generator"
+	"github.com/objectbox/objectbox-generator/v4/test/assert"
 )
 
 // Because of Go generator comparison tests, the go tool may update go.mod file to import `github.com/objectbox/objectbox-go`
diff --git a/test/build/c-compiler.go b/test/build/c-compiler.go
@@ -23,8 +23,8 @@ package build
 import (
 	"testing"
 
-	"github.com/objectbox/objectbox-generator/test/assert"
-	"github.com/objectbox/objectbox-generator/test/cmake"
+	"github.com/objectbox/objectbox-generator/v4/test/assert"
+	"github.com/objectbox/objectbox-generator/v4/test/cmake"
 )
 
 // Check verifies the C/C++ objectbox test code can be compiled - whether the required libraries are available.
diff --git a/test/cmake/libcheck_test.go b/test/cmake/libcheck_test.go
@@ -24,8 +24,8 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/objectbox/objectbox-generator/test/assert"
-	"github.com/objectbox/objectbox-generator/test/cmake"
+	"github.com/objectbox/objectbox-generator/v4/test/assert"
+	"github.com/objectbox/objectbox-generator/v4/test/cmake"
 )
 
 func TestLibExists(t *testing.T) {
diff --git a/test/comparison/c-helper.go b/test/comparison/c-helper.go
@@ -27,11 +27,11 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/objectbox/objectbox-generator/internal/generator"
-	cgenerator "github.com/objectbox/objectbox-generator/internal/generator/c"
-	"github.com/objectbox/objectbox-generator/test/assert"
-	"github.com/objectbox/objectbox-generator/test/build"
-	"github.com/objectbox/objectbox-generator/test/cmake"
+	"github.com/objectbox/objectbox-generator/v4/internal/generator"
+	cgenerator "github.com/objectbox/objectbox-generator/v4/internal/generator/c"
+	"github.com/objectbox/objectbox-generator/v4/test/assert"
+	"github.com/objectbox/objectbox-generator/v4/test/build"
+	"github.com/objectbox/objectbox-generator/v4/test/cmake"
 )
 
 type cTestHelper struct {
diff --git a/test/comparison/conf.go b/test/comparison/conf.go
@@ -23,9 +23,9 @@ package comparison
 import (
 	"testing"
 
-	"github.com/objectbox/objectbox-generator/internal/generator"
-	cgenerator "github.com/objectbox/objectbox-generator/internal/generator/c"
-	gogenerator "github.com/objectbox/objectbox-generator/internal/generator/go"
+	"github.com/objectbox/objectbox-generator/v4/internal/generator"
+	cgenerator "github.com/objectbox/objectbox-generator/v4/internal/generator/c"
+	gogenerator "github.com/objectbox/objectbox-generator/v4/internal/generator/go"
 )
 
 type testHelper interface {
diff --git a/test/comparison/generator_test.go b/test/comparison/generator_test.go
@@ -25,7 +25,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/objectbox/objectbox-generator/test/assert"
+	"github.com/objectbox/objectbox-generator/v4/test/assert"
 )
 
 // used during development of generator to overwrite the "golden" files
diff --git a/test/comparison/go-helper.go b/test/comparison/go-helper.go
@@ -30,9 +30,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/objectbox/objectbox-generator/internal/generator"
-	gogenerator "github.com/objectbox/objectbox-generator/internal/generator/go"
-	"github.com/objectbox/objectbox-generator/test/assert"
+	"github.com/objectbox/objectbox-generator/v4/internal/generator"
+	gogenerator "github.com/objectbox/objectbox-generator/v4/internal/generator/go"
+	"github.com/objectbox/objectbox-generator/v4/test/assert"
 )
 
 // this containing module name - used for test case modules
diff --git a/test/comparison/test-all.go b/test/comparison/test-all.go
@@ -32,8 +32,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/objectbox/objectbox-generator/internal/generator"
-	"github.com/objectbox/objectbox-generator/test/assert"
+	"github.com/objectbox/objectbox-generator/v4/internal/generator"
+	"github.com/objectbox/objectbox-generator/v4/test/assert"
 )
 
 func typesFromConfKey(confKey string) (srcType, genType string) {
diff --git a/test/comparison/testdata/go/embedding/E.go b/test/comparison/testdata/go/embedding/E.go
@@ -1,6 +1,6 @@
 package object
 
-import "github.com/objectbox/objectbox-generator/test/comparison/testdata/go/embedding/other"
+import "github.com/objectbox/objectbox-generator/v4/test/comparison/testdata/go/embedding/other"
 
 type E struct {
 	other.Trackable `objectbox:"inline"`
diff --git a/test/comparison/testdata/go/embedding/E.obx.go.expected b/test/comparison/testdata/go/embedding/E.obx.go.expected
@@ -6,7 +6,7 @@ package object
 import (
 	"errors"
 	"github.com/google/flatbuffers/go"
-	"github.com/objectbox/objectbox-generator/test/comparison/testdata/go/embedding/other"
+	"github.com/objectbox/objectbox-generator/v4/test/comparison/testdata/go/embedding/other"
 	"github.com/objectbox/objectbox-go/objectbox"
 	"github.com/objectbox/objectbox-go/objectbox/fbutils"
 )
diff --git a/test/comparison/testdata/go/property-update/compile-error.expected b/test/comparison/testdata/go/property-update/compile-error.expected
@@ -1,5 +1,5 @@
 
-# github.com/objectbox/objectbox-generator/test/comparison/testdata/go/property-update
+# github.com/objectbox/objectbox-generator/v4/test/comparison/testdata/go/property-update
 ./objectbox-model.go:16:24: undefined: ABinding
 
 exit status 2
diff --git a/test/comparison/testdata/go/rename-property/compile-error.expected b/test/comparison/testdata/go/rename-property/compile-error.expected
@@ -1,5 +1,5 @@
 
-# github.com/objectbox/objectbox-generator/test/comparison/testdata/go/rename-property
+# github.com/objectbox/objectbox-generator/v4/test/comparison/testdata/go/rename-property
 ./objectbox-model.go:16:24: undefined: CBinding
 
 exit status 2
diff --git a/test/comparison/testdata/go/rename-relation/compile-error.expected b/test/comparison/testdata/go/rename-relation/compile-error.expected
@@ -1,5 +1,5 @@
 
-# github.com/objectbox/objectbox-generator/test/comparison/testdata/go/rename-relation
+# github.com/objectbox/objectbox-generator/v4/test/comparison/testdata/go/rename-relation
 ./objectbox-model.go:22:24: undefined: NegTaskRelIdBinding
 ./objectbox-model.go:23:24: undefined: NegTaskRelPtrBinding
 ./objectbox-model.go:24:24: undefined: NegTaskRelValueBinding
diff --git a/test/comparison/testdata/go/typeful/aliases.go b/test/comparison/testdata/go/typeful/aliases.go
@@ -1,8 +1,8 @@
 package object
 
 import (
-	"github.com/objectbox/objectbox-generator/test/comparison/testdata/go/typeful/other"
-	ot "github.com/objectbox/objectbox-generator/test/comparison/testdata/go/typeful/other"
+	"github.com/objectbox/objectbox-generator/v4/test/comparison/testdata/go/typeful/other"
+	ot "github.com/objectbox/objectbox-generator/v4/test/comparison/testdata/go/typeful/other"
 )
 
 // Tests type aliases and definitions of named types
diff --git a/test/comparison/testdata/go/typeful/aliases.obx.go.expected b/test/comparison/testdata/go/typeful/aliases.obx.go.expected
@@ -6,7 +6,7 @@ package object
 import (
 	"errors"
 	"github.com/google/flatbuffers/go"
-	ot "github.com/objectbox/objectbox-generator/test/comparison/testdata/go/typeful/other"
+	ot "github.com/objectbox/objectbox-generator/v4/test/comparison/testdata/go/typeful/other"
 	"github.com/objectbox/objectbox-go/objectbox"
 	"github.com/objectbox/objectbox-go/objectbox/fbutils"
 )
diff --git a/test/comparison/util.go b/test/comparison/util.go
@@ -28,7 +28,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/objectbox/objectbox-generator/test/assert"
+	"github.com/objectbox/objectbox-generator/v4/test/assert"
 )
 
 func checkBuildError(t *testing.T, errorTransformer func(err error) error, stdOut []byte, stdErr []byte, err error, expectedError error) {
diff --git a/test/integration/cmake/cmake_test.go b/test/integration/cmake/cmake_test.go
@@ -11,8 +11,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/objectbox/objectbox-generator/test/assert"
-	"github.com/objectbox/objectbox-generator/test/cmake"
+	"github.com/objectbox/objectbox-generator/v4/test/assert"
+	"github.com/objectbox/objectbox-generator/v4/test/cmake"
 )
 
 // excluded: cpp-multiple-targets,cpp-tree-multiple-targets (Visual Studio and XCode)
diff --git a/test/integration/integration.go b/test/integration/integration.go
diff --git a/test/integration/optional/integration_test.go b/test/integration/optional/integration_test.go
diff --git a/test/integration/property-clear/property_clear_test.go b/test/integration/property-clear/property_clear_test.go
diff --git a/test/integration/removes/remove_test.go b/test/integration/removes/remove_test.go
diff --git a/test/integration/renames/rename_test.go b/test/integration/renames/rename_test.go
diff --git a/test/integration/sync/integration_test.go b/test/integration/sync/integration_test.go
diff --git a/test/integration/typeful/integration_test.go b/test/integration/typeful/integration_test.go

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ import (`
`28`	`28`	`"fmt"`
`29`	`29`	`"os"`
`30`	`30`
`31`		`- "github.com/objectbox/objectbox-generator/internal/generator"`
	`31`	`+ "github.com/objectbox/objectbox-generator/v4/internal/generator"`
`32`	`32`	`)`
`33`	`33`
`34`	`34`	`const defaultErrorCode = 2`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-module github.com/objectbox/objectbox-generator`
	`1`	`+module github.com/objectbox/objectbox-generator/v4`
`2`	`2`
`3`	`3`	`go 1.11`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ import (`
`27`	`27`	`"strconv"`
`28`	`28`	`"strings"`
`29`	`29`
`30`		`- "github.com/objectbox/objectbox-generator/internal/generator/model"`
	`30`	`+ "github.com/objectbox/objectbox-generator/v4/internal/generator/model"`
`31`	`31`	`)`
`32`	`32`
`33`	`33`	`// Field holds common field/property information used by specialized code parsers/generators.`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,8 @@ package cgenerator`
`23`	`23`	`import (`
`24`	`24`	`flatbuffers "github.com/google/flatbuffers/go"`
`25`	`25`
`26`		`- "github.com/objectbox/objectbox-generator/internal/generator/flatbuffersc/reflection"`
`27`		`- "github.com/objectbox/objectbox-generator/internal/generator/model"`
	`26`	`+ "github.com/objectbox/objectbox-generator/v4/internal/generator/flatbuffersc/reflection"`
	`27`	`+ "github.com/objectbox/objectbox-generator/v4/internal/generator/model"`
`28`	`28`	`)`
`29`	`29`
`30`	`30`	`var fbsTypeToObxType = map[reflection.BaseType]model.PropertyType{`