Update C lib to 0.18.1

Author: greenrobot

build/ci.sh

@@ -7,7 +7,7 @@ cd "${script_dir}/.." # move to project root dir
 
 args="$@"
 
-bash <(curl -s https://raw.githubusercontent.com/objectbox/objectbox-c/main/download.sh) --quiet --sync 0.15.1
+bash <(curl -s https://raw.githubusercontent.com/objectbox/objectbox-c/main/download.sh) --quiet --sync 0.18.1
 export CGO_LDFLAGS="-L$(pwd -P)/lib -Wl,-rpath -Wl,$(pwd -P)/lib"
 
 if [[ "$(uname)" == MINGW* ]]; then

install.ps1

@@ -7,7 +7,7 @@ $ErrorActionPreference = "Stop"
 # Configure supported HTTPS protocols
 [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12, [Net.SecurityProtocolType]::Tls11, [Net.SecurityProtocolType]::Tls
 
-$libVersion = '0.15.1'
+$libVersion = '0.18.1'
 $libVariant = 'objectbox'  # or 'objectbox-sync'
 $downloadDir = 'download'
 $extractedLibDir = "$downloadDir\objectbox-$libVersion"

install.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-cLibVersion=0.15.1
+cLibVersion=0.18.1
 os=$(uname)
 cLibArgs="$*"
 

objectbox/c-callbacks.go

@@ -123,8 +123,8 @@ var cCallbackMutex sync.Mutex
 var cCallbackMap = make(map[cCallbackId]cCallable)
 
 // The result is actually not a memory pointer, just a number. That's also how it's used in cCallbackLookup().
-func (cbId cCallbackId) cPtrArg() C.uintptr_t {
-	return C.uintptr_t(cbId)
+func (cbId cCallbackId) cPtr() unsafe.Pointer {
+	return unsafe.Pointer(uintptr(cbId))
 }
 
 // Returns the next cCallbackId in a sequence (NOT checking its availability), skipping zero.

objectbox/objectbox-sync.h

@@ -266,15 +266,15 @@ type SyncLoginFailure uint64 // TODO enumerate possible values
 // SetConnectionListener sets or overrides a previously set listener for a "connection" event.
 func (client *SyncClient) SetConnectionListener(callback syncConnectionListener) error {
 	if callback == nil {
-		C.obx_sync_listener_connect(client.cClient, nil, 0)
+		C.obx_sync_listener_connect(client.cClient, nil, nil)
 		cCallbackUnregister(client.cCallbacks[cCallbackIndexConnection])
 	} else {
 		if cbId, err := cCallbackRegister(cVoidCallback(func() {
 			callback()
 		})); err != nil {
 			return err
 		} else {
-			C.obx_sync_listener_connect(client.cClient, (*C.OBX_sync_listener_connect)(cVoidCallbackDispatchPtr), cbId.cPtrArg())
+			C.obx_sync_listener_connect(client.cClient, (*C.OBX_sync_listener_connect)(cVoidCallbackDispatchPtr), cbId.cPtr())
 			client.swapCallbackId(cCallbackIndexConnection, cbId)
 		}
 	}
@@ -284,15 +284,15 @@ func (client *SyncClient) SetConnectionListener(callback syncConnectionListener)
 // SetDisconnectionListener sets or overrides a previously set listener for a "disconnection" event.
 func (client *SyncClient) SetDisconnectionListener(callback syncDisconnectionListener) error {
 	if callback == nil {
-		C.obx_sync_listener_disconnect(client.cClient, nil, 0)
+		C.obx_sync_listener_disconnect(client.cClient, nil, nil)
 		cCallbackUnregister(client.cCallbacks[cCallbackIndexDisconnection])
 	} else {
 		if cbId, err := cCallbackRegister(cVoidCallback(func() {
 			callback()
 		})); err != nil {
 			return err
 		} else {
-			C.obx_sync_listener_disconnect(client.cClient, (*C.OBX_sync_listener_disconnect)(cVoidCallbackDispatchPtr), cbId.cPtrArg())
+			C.obx_sync_listener_disconnect(client.cClient, (*C.OBX_sync_listener_disconnect)(cVoidCallbackDispatchPtr), cbId.cPtr())
 			client.swapCallbackId(cCallbackIndexDisconnection, cbId)
 		}
 	}
@@ -302,15 +302,15 @@ func (client *SyncClient) SetDisconnectionListener(callback syncDisconnectionLis
 // SetLoginListener sets or overrides a previously set listener for a "login" event.
 func (client *SyncClient) SetLoginListener(callback syncLoginListener) error {
 	if callback == nil {
-		C.obx_sync_listener_login(client.cClient, nil, 0)
+		C.obx_sync_listener_login(client.cClient, nil, nil)
 		cCallbackUnregister(client.cCallbacks[cCallbackIndexLogin])
 	} else {
 		if cbId, err := cCallbackRegister(cVoidCallback(func() {
 			callback()
 		})); err != nil {
 			return err
 		} else {
-			C.obx_sync_listener_login(client.cClient, (*C.OBX_sync_listener_login)(cVoidCallbackDispatchPtr), cbId.cPtrArg())
+			C.obx_sync_listener_login(client.cClient, (*C.OBX_sync_listener_login)(cVoidCallbackDispatchPtr), cbId.cPtr())
 			client.swapCallbackId(cCallbackIndexLogin, cbId)
 		}
 	}
@@ -320,15 +320,15 @@ func (client *SyncClient) SetLoginListener(callback syncLoginListener) error {
 // SetLoginFailureListener sets or overrides a previously set listener for a "login" event.
 func (client *SyncClient) SetLoginFailureListener(callback syncLoginFailureListener) error {
 	if callback == nil {
-		C.obx_sync_listener_login_failure(client.cClient, nil, 0)
+		C.obx_sync_listener_login_failure(client.cClient, nil, nil)
 		cCallbackUnregister(client.cCallbacks[cCallbackIndexLoginFailure])
 	} else {
 		if cbId, err := cCallbackRegister(cVoidUint64Callback(func(code uint64) {
 			callback(SyncLoginFailure(code))
 		})); err != nil {
 			return err
 		} else {
-			C.obx_sync_listener_login_failure(client.cClient, (*C.OBX_sync_listener_login_failure)(cVoidUint64CallbackDispatchPtr), cbId.cPtrArg())
+			C.obx_sync_listener_login_failure(client.cClient, (*C.OBX_sync_listener_login_failure)(cVoidUint64CallbackDispatchPtr), cbId.cPtr())
 			client.swapCallbackId(cCallbackIndexLoginFailure, cbId)
 		}
 	}
@@ -338,15 +338,15 @@ func (client *SyncClient) SetLoginFailureListener(callback syncLoginFailureListe
 // SetCompletionListener sets or overrides a previously set listener for a "login" event.
 func (client *SyncClient) SetCompletionListener(callback syncCompletionListener) error {
 	if callback == nil {
-		C.obx_sync_listener_complete(client.cClient, nil, 0)
+		C.obx_sync_listener_complete(client.cClient, nil, nil)
 		cCallbackUnregister(client.cCallbacks[cCallbackIndexCompletion])
 	} else {
 		if cbId, err := cCallbackRegister(cVoidCallback(func() {
 			callback()
 		})); err != nil {
 			return err
 		} else {
-			C.obx_sync_listener_complete(client.cClient, (*C.OBX_sync_listener_complete)(cVoidCallbackDispatchPtr), cbId.cPtrArg())
+			C.obx_sync_listener_complete(client.cClient, (*C.OBX_sync_listener_complete)(cVoidCallbackDispatchPtr), cbId.cPtr())
 			client.swapCallbackId(cCallbackIndexCompletion, cbId)
 		}
 	}
@@ -356,7 +356,7 @@ func (client *SyncClient) SetCompletionListener(callback syncCompletionListener)
 // SetServerTimeListener sets or overrides a previously set listener for a "login" event.
 func (client *SyncClient) SetServerTimeListener(callback syncTimeListener) error {
 	if callback == nil {
-		C.obx_sync_listener_server_time(client.cClient, nil, 0)
+		C.obx_sync_listener_server_time(client.cClient, nil, nil)
 		cCallbackUnregister(client.cCallbacks[cCallbackIndexServerTime])
 	} else {
 		if cbId, err := cCallbackRegister(cVoidInt64Callback(func(timestampNs int64) {
@@ -365,7 +365,7 @@ func (client *SyncClient) SetServerTimeListener(callback syncTimeListener) error
 		})); err != nil {
 			return err
 		} else {
-			C.obx_sync_listener_server_time(client.cClient, (*C.OBX_sync_listener_server_time)(cVoidInt64CallbackDispatchPtr), cbId.cPtrArg())
+			C.obx_sync_listener_server_time(client.cClient, (*C.OBX_sync_listener_server_time)(cVoidInt64CallbackDispatchPtr), cbId.cPtr())
 			client.swapCallbackId(cCallbackIndexServerTime, cbId)
 		}
 	}
@@ -376,15 +376,15 @@ func (client *SyncClient) SetServerTimeListener(callback syncTimeListener) error
 // SyncChange event is issued after a transaction is applied to the local database.
 func (client *SyncClient) SetChangeListener(callback syncChangeListener) error {
 	if callback == nil {
-		C.obx_sync_listener_change(client.cClient, nil, 0)
+		C.obx_sync_listener_change(client.cClient, nil, nil)
 		cCallbackUnregister(client.cCallbacks[cCallbackIndexChange])
 	} else {
 		if cbId, err := cCallbackRegister(cVoidConstVoidCallback(func(cChangeList unsafe.Pointer) {
 			callback(cSyncChangeArrayToGo((*C.OBX_sync_change_array)(cChangeList)))
 		})); err != nil {
 			return err
 		} else {
-			C.obx_sync_listener_change(client.cClient, (*C.OBX_sync_listener_change)(cVoidConstVoidCallbackDispatchPtr), cbId.cPtrArg())
+			C.obx_sync_listener_change(client.cClient, (*C.OBX_sync_listener_change)(cVoidConstVoidCallbackDispatchPtr), cbId.cPtr())
 			client.swapCallbackId(cCallbackIndexChange, cbId)
 		}
 	}

objectbox/objectbox.h

@@ -72,14 +72,14 @@ func VersionLibStatic() Version {
 
 // VersionLibMin returns the minimum Version of the dynamic linked ObjectBox library that is compatible with this Go version
 func VersionLibMin() Version {
-	return Version{0, 15, 0, ""}
+	return Version{0, 18, 0, ""}
 }
 
 // VersionLibMinRecommended returns the minimum recommended Version of the dynamic linked ObjectBox library.
 // This version not only considers compatibility with this Go version, but also known issues older (compatible) versions.
 // It is guaranteed to be at least VersionLibMin()
 func VersionLibMinRecommended() Version {
-	return Version{0, 15, 1, ""}
+	return Version{0, 18, 1, ""}
 }
 
 // VersionInfo returns a printable version string

objectbox/sync-client.go

@@ -229,12 +229,12 @@ func TestQueries(t *testing.T) {
 		{1, s{`Float32 between -1.000000 and 1.000000`}, box.Query(E.Float32.Between(-1, 1)), nil},
 		{2, s{`Float32 between 47.740002 and 95.480003`}, box.Query(E.Float32.Between(e.Float32, e.Float32*2)), nil},
 
-		{6, s{`ByteVector == byte[5]{0x01020305 08}`}, box.Query(E.ByteVector.Equals(e.ByteVector)), nil},
-		// {994, s{`ByteVector != byte[5]{0x01020305 08`}, box.Query(E.ByteVector.NotEquals(e.ByteVector)), nil},
-		{989, s{`ByteVector > byte[5]{0x01020305 08}`}, box.Query(E.ByteVector.GreaterThan(e.ByteVector)), nil},
-		{995, s{`ByteVector >= byte[5]{0x01020305 08}`}, box.Query(E.ByteVector.GreaterOrEqual(e.ByteVector)), nil},
-		{5, s{`ByteVector < byte[5]{0x01020305 08}`}, box.Query(E.ByteVector.LessThan(e.ByteVector)), nil},
-		{11, s{`ByteVector <= byte[5]{0x01020305 08}`}, box.Query(E.ByteVector.LessOrEqual(e.ByteVector)), nil},
+		{6, s{`ByteVector == byte[5]{0x0102030508}`}, box.Query(E.ByteVector.Equals(e.ByteVector)), nil},
+		// {994, s{`ByteVector != byte[5]{0x0102030508`}, box.Query(E.ByteVector.NotEquals(e.ByteVector)), nil},
+		{989, s{`ByteVector > byte[5]{0x0102030508}`}, box.Query(E.ByteVector.GreaterThan(e.ByteVector)), nil},
+		{995, s{`ByteVector >= byte[5]{0x0102030508}`}, box.Query(E.ByteVector.GreaterOrEqual(e.ByteVector)), nil},
+		{5, s{`ByteVector < byte[5]{0x0102030508}`}, box.Query(E.ByteVector.LessThan(e.ByteVector)), nil},
+		{11, s{`ByteVector <= byte[5]{0x0102030508}`}, box.Query(E.ByteVector.LessOrEqual(e.ByteVector)), nil},
 
 		{256, s{`Bool == 1`}, box.Query(E.Bool.Equals(true)), nil},
 		{744, s{`Bool == 0`}, box.Query(E.Bool.Equals(false)), nil},
@@ -384,11 +384,11 @@ func TestQueryParams(t *testing.T) {
 		{498, s{`Float32 > 47.740002`}, box.Query(E.Float32.GreaterThan(e.Float32)),
 			func(q i) error { return eq(q).SetFloat64Params(E.Float32, float64(e.Float32)) }},
 
-		{6, s{`ByteVector == byte[5]{0x01020305 08}`}, box.Query(E.ByteVector.Equals(nil)),
+		{6, s{`ByteVector == byte[5]{0x0102030508}`}, box.Query(E.ByteVector.Equals(nil)),
 			func(q i) error { return eq(q).SetBytesParams(E.ByteVector, e.ByteVector) }},
 		{1000, s{`ByteVector > byte[0]""`}, box.Query(E.ByteVector.GreaterThan(nil)),
 			func(q i) error { return eq(q).SetBytesParams(E.ByteVector, nil) }},
-		{5, s{`ByteVector < byte[5]{0x01020305 08}`}, box.Query(E.ByteVector.LessThan(nil)),
+		{5, s{`ByteVector < byte[5]{0x0102030508}`}, box.Query(E.ByteVector.LessThan(nil)),
 			func(q i) error { return eq(q).SetBytesParams(E.ByteVector, e.ByteVector) }},
 
 		{1, s{`Related == 1`}, box.Query(E.Related.Equals(0)),
@@ -566,11 +566,11 @@ func TestQueryAliasParams(t *testing.T) {
 		{498, s{`Float32 > 47.740002`}, box.Query(E.Float32.GreaterThan(e.Float32).As(alias)),
 			func(q i) error { return eq(q).SetFloat64Params(alias, float64(e.Float32)) }},
 
-		{6, s{`ByteVector == byte[5]{0x01020305 08}`}, box.Query(E.ByteVector.Equals(nil).As(alias)),
+		{6, s{`ByteVector == byte[5]{0x0102030508}`}, box.Query(E.ByteVector.Equals(nil).As(alias)),
 			func(q i) error { return eq(q).SetBytesParams(alias, e.ByteVector) }},
 		{1000, s{`ByteVector > byte[0]""`}, box.Query(E.ByteVector.GreaterThan(nil).As(alias)),
 			func(q i) error { return eq(q).SetBytesParams(alias, nil) }},
-		{5, s{`ByteVector < byte[5]{0x01020305 08}`}, box.Query(E.ByteVector.LessThan(nil).As(alias)),
+		{5, s{`ByteVector < byte[5]{0x0102030508}`}, box.Query(E.ByteVector.LessThan(nil).As(alias)),
 			func(q i) error { return eq(q).SetBytesParams(alias, e.ByteVector) }},
 	})
 }

objectbox/version.go

@@ -55,7 +55,7 @@ func TestExpectedObjectBoxVersion(t *testing.T) {
 
 	versionLib := objectbox.VersionLib()
 	versionLibInt := versionLib.Major*10000 + versionLib.Minor*100 + versionLib.Patch
-	assert.True(t, versionLibInt >= 1501) // Update with new releases (won't fail if forgotten)
+	assert.True(t, versionLibInt >= 1801) // Update with new releases (won't fail if forgotten)
 	assert.True(t, versionLibInt < 10000) // Future next major release
 }