Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to latest core #7837

Merged
merged 11 commits into from
Oct 11, 2023
Merged

Update to latest core #7837

merged 11 commits into from
Oct 11, 2023

Conversation

rorbech
Copy link
Contributor

@rorbech rorbech commented Jul 31, 2023

Closes #7775

@@ -51,10 +50,6 @@ public static OsAppCredentials apiKey(String key) {
return new OsAppCredentials(nativeCreate(TYPE_API_KEY, key));
}

public static OsAppCredentials serverApiKey(String key) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This wasn't really used and not exposed in the SDK. Removed from core in realm/realm-core#5914

Copy link
Collaborator

@clementetb clementetb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@cmelchior cmelchior marked this pull request as draft October 2, 2023 08:24
@cmelchior cmelchior self-assigned this Oct 2, 2023
# Conflicts:
#	CHANGELOG.md
@cmelchior cmelchior changed the base branch from releases to main October 2, 2023 08:27
Christian Melchior added 2 commits October 2, 2023 15:57
@cmelchior cmelchior marked this pull request as ready for review October 3, 2023 10:39
@cmelchior
Copy link
Contributor

Ready for review

@@ -401,11 +400,11 @@ public void isEmpty_acrossLink() {
case LINKING_OBJECTS:
// Rows 0 and 1 are not included as they are linked to another row through FIELD_OBJECT
// Row 2 is included (no link)
assertEquals(1, realm.where(AllJavaTypesUnsupportedTypes.class).isEmpty(AllJavaTypesUnsupportedTypes.FIELD_OBJECT + "." + AllJavaTypesUnsupportedTypes.FIELD_LO_OBJECT).count());
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why the expected values changed for these tests?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was changed after realm/realm-core#6867. There was a lot of discussion about this, but in the end, we determined that the old behavior was buggy and subsequently fixed.

java_error_message = JavaLocalRef<jstring>(env, env->NewStringUTF(
status.reason().c_str()));
java_error_code = JavaLocalRef<jobject>(env, JavaClassGlobalDef::new_long(env, static_cast<int32_t>(status.code())));
java_error_message = JavaLocalRef<jstring>(env, env->NewStringUTF( status.reason().c_str()));
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe use to_jstring?

realm/realm-library/src/main/cpp/util.cpp Show resolved Hide resolved
@cmelchior cmelchior merged commit f866781 into main Oct 11, 2023
4 checks passed
@cmelchior cmelchior deleted the cr/core-update branch October 11, 2023 14:22
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 14, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
4 participants