From 742b52a5f404cd595fa689eda61a773737e228f4 Mon Sep 17 00:00:00 2001 From: Julien Date: Thu, 18 May 2023 16:31:46 -0400 Subject: [PATCH 1/4] It builds? --- .bazelversion | 2 +- WORKSPACE | 93 +++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 88 insertions(+), 7 deletions(-) diff --git a/.bazelversion b/.bazelversion index 09b254e9..6abaeb2f 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -6.0.0 +6.2.0 diff --git a/WORKSPACE b/WORKSPACE index 3c543673..fce3ac89 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -1,11 +1,92 @@ workspace(name="snap_djinni") -load("//bzl:deps.bzl", "djinni_deps") -djinni_deps() -load("//bzl:scala_config.bzl", "djinni_scala_config") -djinni_scala_config() -load("//bzl:setup_deps.bzl", "djinni_setup_deps") -djinni_setup_deps() +# WORKSPACE +load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") + +http_archive( + name = "bazel_skylib", + sha256 = "b8a1527901774180afc798aeb28c4634bdccf19c4d98e7bdd1ce79d1fe9aaad7", + urls = [ + "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.4.1/bazel-skylib-1.4.1.tar.gz", + "https://github.com/bazelbuild/bazel-skylib/releases/download/1.4.1/bazel-skylib-1.4.1.tar.gz", + ], +) + +# See https://github.com/bazelbuild/rules_scala/releases for up to date version information. +rules_scala_version = "c711b4d1f0d1cc386c63ef748c9df14d2f3a187e" +http_archive( + name = "io_bazel_rules_scala", + sha256 = "556677f505634da64efc41912d280895e61f5da109d82bdee41cde4120a190a1", + strip_prefix = "rules_scala-%s" % rules_scala_version, + type = "zip", + url = "https://github.com/bazelbuild/rules_scala/archive/%s.zip" % rules_scala_version, +) + +load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config") +# Stores Scala version and other configuration +# 2.12 is a default version, other versions can be use by passing them explicitly: +# scala_config(scala_version = "2.11.12") +# Scala 3 requires extras... +# 3.2 should be supported on master. Please note that Scala artifacts for version (3.2.2) are not defined in +# Rules Scala, they need to be provided by your WORKSPACE. You can use external loader like +# https://github.com/bazelbuild/rules_jvm_external +scala_config() + +load("@io_bazel_rules_scala//scala:scala.bzl", "rules_scala_setup", "rules_scala_toolchain_deps_repositories") + +# loads other rules Rules Scala depends on +rules_scala_setup() + +# Loads Maven deps like Scala compiler and standard libs. On production projects you should consider +# defining a custom deps toolchains to use your project libs instead +rules_scala_toolchain_deps_repositories(fetch_sources = True) + +load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains") +rules_proto_dependencies() +rules_proto_toolchains() + +load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_register_toolchains") +scala_register_toolchains() + +# optional: setup ScalaTest toolchain and dependencies +load("@io_bazel_rules_scala//testing:scalatest.bzl", "scalatest_repositories", "scalatest_toolchain") +scalatest_repositories() +scalatest_toolchain() + +load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") + +RULES_JVM_EXTERNAL_TAG = "4.5" +RULES_JVM_EXTERNAL_SHA = "b17d7388feb9bfa7f2fa09031b32707df529f26c91ab9e5d909eb1676badd9a6" + +http_archive( + name = "rules_jvm_external", + strip_prefix = "rules_jvm_external-%s" % RULES_JVM_EXTERNAL_TAG, + sha256 = RULES_JVM_EXTERNAL_SHA, + url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % RULES_JVM_EXTERNAL_TAG, +) + +load("@rules_jvm_external//:repositories.bzl", "rules_jvm_external_deps") + +rules_jvm_external_deps() + +load("@rules_jvm_external//:setup.bzl", "rules_jvm_external_setup") + +rules_jvm_external_setup() + +load("@rules_jvm_external//:defs.bzl", "maven_install") + +maven_install( + name = "maven_djinni", + artifacts = [ + "com.google.code.findbugs:jsr305:3.0.2", + "junit:junit:4.12", + "org.scala-lang.modules:scala-parser-combinators_2.11:1.0.1", + "org.yaml:snakeyaml:1.15", + "com.github.scopt:scopt_2.11:3.2.0", + "io.reactivex.rxjava2:rxjava:2.2.21" + ], + repositories = ["https://maven.google.com", "https://repo1.maven.org/maven2"], +) # --- Everything below is only used for examples and tests From f26ae7c0d5b907f1afb07adafb0b1b42cfb8a3c6 Mon Sep 17 00:00:00 2001 From: Julien Date: Thu, 18 May 2023 16:34:46 -0400 Subject: [PATCH 2/4] Use scala 2.11 --- WORKSPACE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WORKSPACE b/WORKSPACE index fce3ac89..87643322 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -30,7 +30,7 @@ load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config") # 3.2 should be supported on master. Please note that Scala artifacts for version (3.2.2) are not defined in # Rules Scala, they need to be provided by your WORKSPACE. You can use external loader like # https://github.com/bazelbuild/rules_jvm_external -scala_config() +scala_config(scala_version = "2.11.12") load("@io_bazel_rules_scala//scala:scala.bzl", "rules_scala_setup", "rules_scala_toolchain_deps_repositories") From 7fe05b4be0c9e2cf53041ec0defb7e9b74c55faf Mon Sep 17 00:00:00 2001 From: Julien Date: Thu, 18 May 2023 16:44:31 -0400 Subject: [PATCH 3/4] Cleanup --- WORKSPACE | 22 ++-------------------- bzl/deps.bzl | 43 ------------------------------------------- bzl/scala_config.bzl | 4 ---- bzl/setup_deps.bzl | 23 ----------------------- 4 files changed, 2 insertions(+), 90 deletions(-) delete mode 100644 bzl/deps.bzl delete mode 100644 bzl/scala_config.bzl delete mode 100644 bzl/setup_deps.bzl diff --git a/WORKSPACE b/WORKSPACE index 87643322..b970a270 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -12,7 +12,6 @@ http_archive( ], ) -# See https://github.com/bazelbuild/rules_scala/releases for up to date version information. rules_scala_version = "c711b4d1f0d1cc386c63ef748c9df14d2f3a187e" http_archive( name = "io_bazel_rules_scala", @@ -23,22 +22,12 @@ http_archive( ) load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config") -# Stores Scala version and other configuration -# 2.12 is a default version, other versions can be use by passing them explicitly: -# scala_config(scala_version = "2.11.12") -# Scala 3 requires extras... -# 3.2 should be supported on master. Please note that Scala artifacts for version (3.2.2) are not defined in -# Rules Scala, they need to be provided by your WORKSPACE. You can use external loader like -# https://github.com/bazelbuild/rules_jvm_external scala_config(scala_version = "2.11.12") load("@io_bazel_rules_scala//scala:scala.bzl", "rules_scala_setup", "rules_scala_toolchain_deps_repositories") -# loads other rules Rules Scala depends on rules_scala_setup() -# Loads Maven deps like Scala compiler and standard libs. On production projects you should consider -# defining a custom deps toolchains to use your project libs instead rules_scala_toolchain_deps_repositories(fetch_sources = True) load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains") @@ -48,11 +37,6 @@ rules_proto_toolchains() load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_register_toolchains") scala_register_toolchains() -# optional: setup ScalaTest toolchain and dependencies -load("@io_bazel_rules_scala//testing:scalatest.bzl", "scalatest_repositories", "scalatest_toolchain") -scalatest_repositories() -scalatest_toolchain() - load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") RULES_JVM_EXTERNAL_TAG = "4.5" @@ -90,12 +74,12 @@ maven_install( # --- Everything below is only used for examples and tests -# android_sdk_repository fails to find build_tools if we don't explicitly set a version. +load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") + android_sdk_repository(name = "androidsdk", build_tools_version = "32.0.0") RULES_ANDROID_NDK_COMMIT= "81ec8b79dc50ee97e336a25724fdbb28e33b8d41" RULES_ANDROID_NDK_SHA = "b29409496439cdcdb50a8e161c4953ca78a548e16d3ee729a1b5cd719ffdacbf" -load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") http_archive( name = "rules_android_ndk", url = "https://github.com/bazelbuild/rules_android_ndk/archive/%s.zip" % RULES_ANDROID_NDK_COMMIT, @@ -105,8 +89,6 @@ http_archive( load("@rules_android_ndk//:rules.bzl", "android_ndk_repository") android_ndk_repository(name = "androidndk") -load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") - build_bazel_rules_apple_version = "1.0.1" http_archive( name = "build_bazel_rules_apple", diff --git a/bzl/deps.bzl b/bzl/deps.bzl deleted file mode 100644 index 4e531a4f..00000000 --- a/bzl/deps.bzl +++ /dev/null @@ -1,43 +0,0 @@ -load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") -load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe") - -def djinni_deps(): - # Bazel Skylib needed for Scala rules - bazel_skylib_version = "1.0.3" - maybe( - name = "bazel_skylib", - repo_rule = http_archive, - urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/{0}/bazel-skylib-{0}.tar.gz" - .format(bazel_skylib_version), - "https://github.com/bazelbuild/bazel-skylib/releases/download/{0}/bazel-skylib-{0}.tar.gz" - .format(bazel_skylib_version), - ], - sha256 = "1c531376ac7e5a180e0237938a2536de0c54d93f5c278634818e0efc952dd56c", - ) - rules_scala_version = "e7a948ad1948058a7a5ddfbd9d1629d6db839933" - maybe( - name = "io_bazel_rules_scala", - repo_rule = http_archive, - strip_prefix = "rules_scala-{}".format(rules_scala_version), - type = "zip", - url = "https://github.com/bazelbuild/rules_scala/archive/{}.zip".format(rules_scala_version), - sha256 = "76e1abb8a54f61ada974e6e9af689c59fd9f0518b49be6be7a631ce9fa45f236", - ) - protobuf_version = "3.12.4" - maybe( - name = "com_google_protobuf", - repo_rule = http_archive, - url = "https://github.com/protocolbuffers/protobuf/archive/v{}.tar.gz".format(protobuf_version), - strip_prefix = "protobuf-{}".format(protobuf_version), - sha256 = "512e5a674bf31f8b7928a64d8adf73ee67b8fe88339ad29adaa3b84dbaa570d8", - ) - - rules_jvm_external_tag = "3.0" - maybe( - name = "rules_jvm_external", - repo_rule = http_archive, - strip_prefix = "rules_jvm_external-{}".format(rules_jvm_external_tag), - url = "https://github.com/bazelbuild/rules_jvm_external/archive/{}.zip".format(rules_jvm_external_tag), - sha256 = "62133c125bf4109dfd9d2af64830208356ce4ef8b165a6ef15bbff7460b35c3a", - ) diff --git a/bzl/scala_config.bzl b/bzl/scala_config.bzl deleted file mode 100644 index 3ddd5440..00000000 --- a/bzl/scala_config.bzl +++ /dev/null @@ -1,4 +0,0 @@ -load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config") - -def djinni_scala_config(): - scala_config(scala_version = "2.11.12") diff --git a/bzl/setup_deps.bzl b/bzl/setup_deps.bzl deleted file mode 100644 index d38bb099..00000000 --- a/bzl/setup_deps.bzl +++ /dev/null @@ -1,23 +0,0 @@ -load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace") -load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_register_toolchains") -load("@io_bazel_rules_scala//scala:scala.bzl", "scala_repositories") -load("@rules_jvm_external//:defs.bzl", "maven_install") - -def djinni_setup_deps(): - bazel_skylib_workspace() - - scala_register_toolchains() - scala_repositories() - - maven_install( - name = "maven_djinni", - artifacts = [ - "com.google.code.findbugs:jsr305:3.0.2", - "junit:junit:4.12", - "org.scala-lang.modules:scala-parser-combinators_2.11:1.0.1", - "org.yaml:snakeyaml:1.15", - "com.github.scopt:scopt_2.11:3.2.0", - "io.reactivex.rxjava2:rxjava:2.2.21" - ], - repositories = ["https://maven.google.com", "https://repo1.maven.org/maven2"], - ) From d6c732932658dad604fa4a4c858f9927e2ad8289 Mon Sep 17 00:00:00 2001 From: Julien Date: Thu, 18 May 2023 17:08:52 -0400 Subject: [PATCH 4/4] Update test run --- .../jni/NativeAssortedPrimitives.cpp | 30 +++++---- .../jni/NativeClientReturnedRecord.cpp | 8 ++- .../jni/NativeConstantRecord.cpp | 6 +- .../jni/NativeConstantWithEnum.cpp | 3 +- .../generated-src/jni/NativeConstants.cpp | 3 +- .../generated-src/jni/NativeDateRecord.cpp | 4 +- .../generated-src/jni/NativeEmptyRecord.cpp | 3 +- .../jni/NativeEnumUsageRecord.cpp | 12 ++-- .../jni/NativeExtendedRecord.cpp | 4 +- .../jni/NativeExternRecordWithDerivings.cpp | 6 +- .../generated-src/jni/NativeMapDateRecord.cpp | 4 +- .../generated-src/jni/NativeMapListRecord.cpp | 4 +- .../generated-src/jni/NativeMapRecord.cpp | 6 +- .../jni/NativeNestedCollection.cpp | 4 +- .../generated-src/jni/NativeNestedOutcome.cpp | 4 +- .../generated-src/jni/NativePrimitiveList.cpp | 4 +- .../jni/NativeRecordUsingExtendedRecord.cpp | 4 +- .../jni/NativeRecordWithDerivings.cpp | 18 +++--- .../NativeRecordWithDurationAndDerivings.cpp | 4 +- .../jni/NativeRecordWithEmbeddedCppProto.cpp | 4 +- .../jni/NativeRecordWithEmbeddedProto.cpp | 4 +- .../jni/NativeRecordWithFlags.cpp | 4 +- .../jni/NativeRecordWithNestedDerivings.cpp | 6 +- .../generated-src/jni/NativeSetRecord.cpp | 6 +- .../jni/NativeSupportCopying.cpp | 4 +- ...ativeTestOptionalExternInterfaceRecord.cpp | 4 +- .../generated-src/jni/NativeVarnameRecord.cpp | 4 +- test-suite/generated-src/jni/NativeVec2.cpp | 6 +- .../generated-src/jni/NativeWcharTestRec.cpp | 4 +- .../jni/NoConstructorRecordNative.cpp | 6 +- .../jni/TestIdentRecordNative.cpp | 6 +- .../com/dropbox/djinni/test/AccessFlags.kt | 2 +- .../dropbox/djinni/test/AssortedPrimitives.kt | 6 +- .../com/dropbox/djinni/test/AsyncInterface.kt | 2 +- .../dropbox/djinni/test/ClientInterface.kt | 2 +- .../djinni/test/ClientReturnedRecord.kt | 4 +- .../kotlin/com/dropbox/djinni/test/Color.kt | 2 +- .../com/dropbox/djinni/test/Conflict.kt | 6 +- .../com/dropbox/djinni/test/ConflictUser.kt | 12 ++-- .../com/dropbox/djinni/test/ConstantEnum.kt | 2 +- .../djinni/test/ConstantInterfaceWithEnum.kt | 6 +- .../com/dropbox/djinni/test/ConstantRecord.kt | 4 +- .../dropbox/djinni/test/ConstantWithEnum.kt | 4 +- .../com/dropbox/djinni/test/Constants.kt | 4 +- .../dropbox/djinni/test/ConstantsInterface.kt | 12 ++-- .../com/dropbox/djinni/test/CppException.kt | 13 ++-- .../com/dropbox/djinni/test/DataRefTest.kt | 31 ++++----- .../com/dropbox/djinni/test/DateRecord.kt | 6 +- .../com/dropbox/djinni/test/EmptyFlags.kt | 2 +- .../com/dropbox/djinni/test/EmptyRecord.kt | 4 +- .../dropbox/djinni/test/EnumUsageInterface.kt | 22 +++---- .../dropbox/djinni/test/EnumUsageRecord.kt | 12 ++-- .../com/dropbox/djinni/test/ExtendedRecord.kt | 4 +- .../dropbox/djinni/test/ExternInterface1.kt | 10 +-- .../dropbox/djinni/test/ExternInterface2.kt | 2 +- .../djinni/test/ExternRecordWithDerivings.kt | 6 +- .../com/dropbox/djinni/test/FirstListener.kt | 4 +- .../com/dropbox/djinni/test/FlagRoundtrip.kt | 12 ++-- .../djinni/test/FunctionPrologueHelper.kt | 7 +- .../test/InterfaceUsingExtendedRecord.kt | 8 +-- .../dropbox/djinni/test/JavaOnlyListener.kt | 2 +- .../com/dropbox/djinni/test/ListenerCaller.kt | 19 +++--- .../com/dropbox/djinni/test/MapDateRecord.kt | 6 +- .../com/dropbox/djinni/test/MapListRecord.kt | 8 +-- .../com/dropbox/djinni/test/MapRecord.kt | 6 +- .../dropbox/djinni/test/NestedCollection.kt | 10 +-- .../com/dropbox/djinni/test/NestedOutcome.kt | 4 +- .../djinni/test/NoConstructorRecordNative.kt | 4 +- .../dropbox/djinni/test/ObjcOnlyListener.kt | 2 +- .../com/dropbox/djinni/test/PrimitiveList.kt | 6 +- .../com/dropbox/djinni/test/ProtoTests.kt | 27 ++++++-- .../djinni/test/RecordUsingExtendedRecord.kt | 4 +- .../djinni/test/RecordWithDerivings.kt | 8 +-- .../test/RecordWithDurationAndDerivings.kt | 6 +- .../djinni/test/RecordWithEmbeddedCppProto.kt | 6 +- .../djinni/test/RecordWithEmbeddedProto.kt | 6 +- .../dropbox/djinni/test/RecordWithFlags.kt | 6 +- .../djinni/test/RecordWithNestedDerivings.kt | 6 +- .../com/dropbox/djinni/test/ReturnOne.kt | 9 +-- .../com/dropbox/djinni/test/ReturnTwo.kt | 9 +-- .../djinni/test/ReverseClientInterface.kt | 13 ++-- .../dropbox/djinni/test/SampleInterface.kt | 6 +- .../com/dropbox/djinni/test/SecondListener.kt | 4 +- .../com/dropbox/djinni/test/SetRecord.kt | 6 +- .../com/dropbox/djinni/test/SupportCopying.kt | 4 +- .../com/dropbox/djinni/test/TestArray.kt | 10 ++- .../com/dropbox/djinni/test/TestDuration.kt | 26 +++++++- .../com/dropbox/djinni/test/TestHelpers.kt | 64 +++++++++++++++---- .../djinni/test/TestIdentEnumNative.kt | 2 +- .../djinni/test/TestIdentRecordNative.kt | 4 +- .../djinni/test/TestJavaAbstractClassOnly.kt | 7 +- .../djinni/test/TestJavaInterfaceOnly.kt | 2 +- .../test/TestOptionalExternInterfaceRecord.kt | 4 +- .../com/dropbox/djinni/test/TestOutcome.kt | 14 +++- .../djinni/test/TestStaticMethodLanguage.kt | 6 +- .../dropbox/djinni/test/ThrowingInterface.kt | 4 +- .../com/dropbox/djinni/test/UserToken.kt | 8 +-- .../test/UsesSingleLanguageListeners.kt | 22 +++---- .../dropbox/djinni/test/VarnameInterface.kt | 10 +-- .../com/dropbox/djinni/test/VarnameRecord.kt | 4 +- .../kotlin/com/dropbox/djinni/test/Vec2.kt | 4 +- .../dropbox/djinni/test/WcharTestHelpers.kt | 10 ++- .../com/dropbox/djinni/test/WcharTestRec.kt | 4 +- .../objc/DBAssortedPrimitives+Private.mm | 30 +++++---- .../objc/DBClientReturnedRecord+Private.mm | 8 ++- .../objc/DBConstantRecord+Private.mm | 6 +- .../objc/DBConstantWithEnum+Private.mm | 3 +- .../generated-src/objc/DBConstants+Private.mm | 3 +- .../objc/DBDateRecord+Private.mm | 4 +- .../objc/DBEmptyRecord+Private.mm | 3 +- .../objc/DBEnumUsageRecord+Private.mm | 12 ++-- .../objc/DBExtendedRecord+Private.mm | 4 +- .../DBExternRecordWithDerivings+Private.mm | 6 +- .../objc/DBMapDateRecord+Private.mm | 4 +- .../objc/DBMapListRecord+Private.mm | 4 +- .../generated-src/objc/DBMapRecord+Private.mm | 6 +- .../objc/DBNestedCollection+Private.mm | 4 +- .../objc/DBNestedOutcome+Private.mm | 4 +- .../objc/DBNoConstructorRecord+Private.mm | 6 +- .../objc/DBPrimitiveList+Private.mm | 4 +- .../DBRecordUsingExtendedRecord+Private.mm | 4 +- .../objc/DBRecordWithDerivings+Private.mm | 18 +++--- ...BRecordWithDurationAndDerivings+Private.mm | 4 +- .../DBRecordWithEmbeddedCppProto+Private.mm | 4 +- .../objc/DBRecordWithEmbeddedProto+Private.mm | 4 +- .../objc/DBRecordWithFlags+Private.mm | 4 +- .../DBRecordWithNestedDerivings+Private.mm | 6 +- .../generated-src/objc/DBSetRecord+Private.mm | 6 +- .../objc/DBSupportCopying+Private.mm | 4 +- .../objc/DBTestIdentRecord+Private.mm | 6 +- ...stOptionalExternInterfaceRecord+Private.mm | 4 +- .../objc/DBVarnameRecord+Private.mm | 4 +- .../generated-src/objc/DBVec2+Private.mm | 6 +- .../objc/DBWcharTestRec+Private.mm | 4 +- 134 files changed, 599 insertions(+), 382 deletions(-) diff --git a/test-suite/generated-src/jni/NativeAssortedPrimitives.cpp b/test-suite/generated-src/jni/NativeAssortedPrimitives.cpp index 0b4c0efc..6cbfb7e1 100644 --- a/test-suite/generated-src/jni/NativeAssortedPrimitives.cpp +++ b/test-suite/generated-src/jni/NativeAssortedPrimitives.cpp @@ -35,20 +35,22 @@ auto NativeAssortedPrimitives::toCpp(JNIEnv* jniEnv, JniType j) -> CppType { ::djinni::JniLocalScope jscope(jniEnv, 15); assert(j != nullptr); const auto& data = ::djinni::JniClass::get(); - return {::djinni::Bool::toCpp(jniEnv, jniEnv->GetBooleanField(j, data.field_mB)), - ::djinni::I8::toCpp(jniEnv, jniEnv->GetByteField(j, data.field_mEight)), - ::djinni::I16::toCpp(jniEnv, jniEnv->GetShortField(j, data.field_mSixteen)), - ::djinni::I32::toCpp(jniEnv, jniEnv->GetIntField(j, data.field_mThirtytwo)), - ::djinni::I64::toCpp(jniEnv, jniEnv->GetLongField(j, data.field_mSixtyfour)), - ::djinni::F32::toCpp(jniEnv, jniEnv->GetFloatField(j, data.field_mFthirtytwo)), - ::djinni::F64::toCpp(jniEnv, jniEnv->GetDoubleField(j, data.field_mFsixtyfour)), - ::djinni::Optional::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mOB)), - ::djinni::Optional::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mOEight)), - ::djinni::Optional::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mOSixteen)), - ::djinni::Optional::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mOThirtytwo)), - ::djinni::Optional::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mOSixtyfour)), - ::djinni::Optional::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mOFthirtytwo)), - ::djinni::Optional::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mOFsixtyfour))}; + ::testsuite::AssortedPrimitives model; + model.mB = ::djinni::Bool::toCpp(jniEnv, jniEnv->GetBooleanField(j, data.field_mB)); + model.mEight = ::djinni::I8::toCpp(jniEnv, jniEnv->GetByteField(j, data.field_mEight)); + model.mSixteen = ::djinni::I16::toCpp(jniEnv, jniEnv->GetShortField(j, data.field_mSixteen)); + model.mThirtytwo = ::djinni::I32::toCpp(jniEnv, jniEnv->GetIntField(j, data.field_mThirtytwo)); + model.mSixtyfour = ::djinni::I64::toCpp(jniEnv, jniEnv->GetLongField(j, data.field_mSixtyfour)); + model.mFthirtytwo = ::djinni::F32::toCpp(jniEnv, jniEnv->GetFloatField(j, data.field_mFthirtytwo)); + model.mFsixtyfour = ::djinni::F64::toCpp(jniEnv, jniEnv->GetDoubleField(j, data.field_mFsixtyfour)); + model.mOB = ::djinni::Optional::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mOB)); + model.mOEight = ::djinni::Optional::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mOEight)); + model.mOSixteen = ::djinni::Optional::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mOSixteen)); + model.mOThirtytwo = ::djinni::Optional::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mOThirtytwo)); + model.mOSixtyfour = ::djinni::Optional::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mOSixtyfour)); + model.mOFthirtytwo = ::djinni::Optional::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mOFthirtytwo)); + model.mOFsixtyfour = ::djinni::Optional::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mOFsixtyfour)); + return model; } } // namespace djinni_generated diff --git a/test-suite/generated-src/jni/NativeClientReturnedRecord.cpp b/test-suite/generated-src/jni/NativeClientReturnedRecord.cpp index bb5d184f..f351ea57 100644 --- a/test-suite/generated-src/jni/NativeClientReturnedRecord.cpp +++ b/test-suite/generated-src/jni/NativeClientReturnedRecord.cpp @@ -24,9 +24,11 @@ auto NativeClientReturnedRecord::toCpp(JNIEnv* jniEnv, JniType j) -> CppType { ::djinni::JniLocalScope jscope(jniEnv, 4); assert(j != nullptr); const auto& data = ::djinni::JniClass::get(); - return {::djinni::I64::toCpp(jniEnv, jniEnv->GetLongField(j, data.field_mRecordId)), - ::djinni::String::toCpp(jniEnv, (jstring)jniEnv->GetObjectField(j, data.field_mContent)), - ::djinni::Optional::toCpp(jniEnv, (jstring)jniEnv->GetObjectField(j, data.field_mMisc))}; + ::testsuite::ClientReturnedRecord model; + model.mRecordId = ::djinni::I64::toCpp(jniEnv, jniEnv->GetLongField(j, data.field_mRecordId)); + model.mContent = ::djinni::String::toCpp(jniEnv, (jstring)jniEnv->GetObjectField(j, data.field_mContent)); + model.mMisc = ::djinni::Optional::toCpp(jniEnv, (jstring)jniEnv->GetObjectField(j, data.field_mMisc)); + return model; } } // namespace djinni_generated diff --git a/test-suite/generated-src/jni/NativeConstantRecord.cpp b/test-suite/generated-src/jni/NativeConstantRecord.cpp index 07e06913..a34e769b 100644 --- a/test-suite/generated-src/jni/NativeConstantRecord.cpp +++ b/test-suite/generated-src/jni/NativeConstantRecord.cpp @@ -23,8 +23,10 @@ auto NativeConstantRecord::toCpp(JNIEnv* jniEnv, JniType j) -> CppType { ::djinni::JniLocalScope jscope(jniEnv, 3); assert(j != nullptr); const auto& data = ::djinni::JniClass::get(); - return {::djinni::I32::toCpp(jniEnv, jniEnv->GetIntField(j, data.field_mSomeInteger)), - ::djinni::String::toCpp(jniEnv, (jstring)jniEnv->GetObjectField(j, data.field_mSomeString))}; + ::testsuite::ConstantRecord model; + model.mSomeInteger = ::djinni::I32::toCpp(jniEnv, jniEnv->GetIntField(j, data.field_mSomeInteger)); + model.mSomeString = ::djinni::String::toCpp(jniEnv, (jstring)jniEnv->GetObjectField(j, data.field_mSomeString)); + return model; } } // namespace djinni_generated diff --git a/test-suite/generated-src/jni/NativeConstantWithEnum.cpp b/test-suite/generated-src/jni/NativeConstantWithEnum.cpp index 89423d9d..2691afaa 100644 --- a/test-suite/generated-src/jni/NativeConstantWithEnum.cpp +++ b/test-suite/generated-src/jni/NativeConstantWithEnum.cpp @@ -21,7 +21,8 @@ auto NativeConstantWithEnum::toCpp(JNIEnv* jniEnv, JniType j) -> CppType { ::djinni::JniLocalScope jscope(jniEnv, 1); assert(j != nullptr); (void)j; // Suppress warnings in release builds for empty records - return {}; + ::testsuite::ConstantWithEnum model; + return model; } } // namespace djinni_generated diff --git a/test-suite/generated-src/jni/NativeConstants.cpp b/test-suite/generated-src/jni/NativeConstants.cpp index 8dd779d6..a5839125 100644 --- a/test-suite/generated-src/jni/NativeConstants.cpp +++ b/test-suite/generated-src/jni/NativeConstants.cpp @@ -21,7 +21,8 @@ auto NativeConstants::toCpp(JNIEnv* jniEnv, JniType j) -> CppType { ::djinni::JniLocalScope jscope(jniEnv, 1); assert(j != nullptr); (void)j; // Suppress warnings in release builds for empty records - return {}; + ::testsuite::Constants model; + return model; } } // namespace djinni_generated diff --git a/test-suite/generated-src/jni/NativeDateRecord.cpp b/test-suite/generated-src/jni/NativeDateRecord.cpp index 79aea563..4f54707c 100644 --- a/test-suite/generated-src/jni/NativeDateRecord.cpp +++ b/test-suite/generated-src/jni/NativeDateRecord.cpp @@ -22,7 +22,9 @@ auto NativeDateRecord::toCpp(JNIEnv* jniEnv, JniType j) -> CppType { ::djinni::JniLocalScope jscope(jniEnv, 2); assert(j != nullptr); const auto& data = ::djinni::JniClass::get(); - return {::djinni::Date::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mCreatedAt))}; + ::testsuite::DateRecord model; + model.mCreatedAt = ::djinni::Date::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mCreatedAt)); + return model; } } // namespace djinni_generated diff --git a/test-suite/generated-src/jni/NativeEmptyRecord.cpp b/test-suite/generated-src/jni/NativeEmptyRecord.cpp index 092e1613..70f08c01 100644 --- a/test-suite/generated-src/jni/NativeEmptyRecord.cpp +++ b/test-suite/generated-src/jni/NativeEmptyRecord.cpp @@ -21,7 +21,8 @@ auto NativeEmptyRecord::toCpp(JNIEnv* jniEnv, JniType j) -> CppType { ::djinni::JniLocalScope jscope(jniEnv, 1); assert(j != nullptr); (void)j; // Suppress warnings in release builds for empty records - return {}; + ::testsuite::EmptyRecord model; + return model; } } // namespace djinni_generated diff --git a/test-suite/generated-src/jni/NativeEnumUsageRecord.cpp b/test-suite/generated-src/jni/NativeEnumUsageRecord.cpp index c79cc947..47ddd574 100644 --- a/test-suite/generated-src/jni/NativeEnumUsageRecord.cpp +++ b/test-suite/generated-src/jni/NativeEnumUsageRecord.cpp @@ -27,11 +27,13 @@ auto NativeEnumUsageRecord::toCpp(JNIEnv* jniEnv, JniType j) -> CppType { ::djinni::JniLocalScope jscope(jniEnv, 6); assert(j != nullptr); const auto& data = ::djinni::JniClass::get(); - return {::djinni_generated::NativeColor::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mE)), - ::djinni::Optional::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mO)), - ::djinni::List<::djinni_generated::NativeColor>::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mL)), - ::djinni::Set<::djinni_generated::NativeColor>::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mS)), - ::djinni::Map<::djinni_generated::NativeColor, ::djinni_generated::NativeColor>::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mM))}; + ::testsuite::EnumUsageRecord model; + model.mE = ::djinni_generated::NativeColor::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mE)); + model.mO = ::djinni::Optional::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mO)); + model.mL = ::djinni::List<::djinni_generated::NativeColor>::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mL)); + model.mS = ::djinni::Set<::djinni_generated::NativeColor>::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mS)); + model.mM = ::djinni::Map<::djinni_generated::NativeColor, ::djinni_generated::NativeColor>::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mM)); + return model; } } // namespace djinni_generated diff --git a/test-suite/generated-src/jni/NativeExtendedRecord.cpp b/test-suite/generated-src/jni/NativeExtendedRecord.cpp index 55b4c407..6fb35afe 100644 --- a/test-suite/generated-src/jni/NativeExtendedRecord.cpp +++ b/test-suite/generated-src/jni/NativeExtendedRecord.cpp @@ -22,7 +22,9 @@ auto NativeExtendedRecord::toCpp(JNIEnv* jniEnv, JniType j) -> CppType { ::djinni::JniLocalScope jscope(jniEnv, 2); assert(j != nullptr); const auto& data = ::djinni::JniClass::get(); - return {::djinni::Bool::toCpp(jniEnv, jniEnv->GetBooleanField(j, data.field_mFoo))}; + ::testsuite::ExtendedRecord model; + model.mFoo = ::djinni::Bool::toCpp(jniEnv, jniEnv->GetBooleanField(j, data.field_mFoo)); + return model; } } // namespace djinni_generated diff --git a/test-suite/generated-src/jni/NativeExternRecordWithDerivings.cpp b/test-suite/generated-src/jni/NativeExternRecordWithDerivings.cpp index dd9c68ca..ea0b64ec 100644 --- a/test-suite/generated-src/jni/NativeExternRecordWithDerivings.cpp +++ b/test-suite/generated-src/jni/NativeExternRecordWithDerivings.cpp @@ -24,8 +24,10 @@ auto NativeExternRecordWithDerivings::toCpp(JNIEnv* jniEnv, JniType j) -> CppTyp ::djinni::JniLocalScope jscope(jniEnv, 3); assert(j != nullptr); const auto& data = ::djinni::JniClass::get(); - return {::djinni_generated::NativeRecordWithDerivings::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mMember)), - ::djinni_generated::NativeColor::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mE))}; + ::ExternRecordWithDerivings model; + model.mMember = ::djinni_generated::NativeRecordWithDerivings::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mMember)); + model.mE = ::djinni_generated::NativeColor::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mE)); + return model; } } // namespace djinni_generated diff --git a/test-suite/generated-src/jni/NativeMapDateRecord.cpp b/test-suite/generated-src/jni/NativeMapDateRecord.cpp index ed39876f..7add22eb 100644 --- a/test-suite/generated-src/jni/NativeMapDateRecord.cpp +++ b/test-suite/generated-src/jni/NativeMapDateRecord.cpp @@ -22,7 +22,9 @@ auto NativeMapDateRecord::toCpp(JNIEnv* jniEnv, JniType j) -> CppType { ::djinni::JniLocalScope jscope(jniEnv, 2); assert(j != nullptr); const auto& data = ::djinni::JniClass::get(); - return {::djinni::Map<::djinni::String, ::djinni::Date>::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mDatesById))}; + ::testsuite::MapDateRecord model; + model.mDatesById = ::djinni::Map<::djinni::String, ::djinni::Date>::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mDatesById)); + return model; } } // namespace djinni_generated diff --git a/test-suite/generated-src/jni/NativeMapListRecord.cpp b/test-suite/generated-src/jni/NativeMapListRecord.cpp index 319c6d9d..793f2a7c 100644 --- a/test-suite/generated-src/jni/NativeMapListRecord.cpp +++ b/test-suite/generated-src/jni/NativeMapListRecord.cpp @@ -22,7 +22,9 @@ auto NativeMapListRecord::toCpp(JNIEnv* jniEnv, JniType j) -> CppType { ::djinni::JniLocalScope jscope(jniEnv, 2); assert(j != nullptr); const auto& data = ::djinni::JniClass::get(); - return {::djinni::List<::djinni::Map<::djinni::String, ::djinni::I64>>::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mMapList))}; + ::testsuite::MapListRecord model; + model.mMapList = ::djinni::List<::djinni::Map<::djinni::String, ::djinni::I64>>::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mMapList)); + return model; } } // namespace djinni_generated diff --git a/test-suite/generated-src/jni/NativeMapRecord.cpp b/test-suite/generated-src/jni/NativeMapRecord.cpp index 43ac7b5b..5207925e 100644 --- a/test-suite/generated-src/jni/NativeMapRecord.cpp +++ b/test-suite/generated-src/jni/NativeMapRecord.cpp @@ -23,8 +23,10 @@ auto NativeMapRecord::toCpp(JNIEnv* jniEnv, JniType j) -> CppType { ::djinni::JniLocalScope jscope(jniEnv, 3); assert(j != nullptr); const auto& data = ::djinni::JniClass::get(); - return {::djinni::Map<::djinni::String, ::djinni::I64>::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mMap)), - ::djinni::Map<::djinni::I32, ::djinni::I32>::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mImap))}; + ::testsuite::MapRecord model; + model.mMap = ::djinni::Map<::djinni::String, ::djinni::I64>::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mMap)); + model.mImap = ::djinni::Map<::djinni::I32, ::djinni::I32>::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mImap)); + return model; } } // namespace djinni_generated diff --git a/test-suite/generated-src/jni/NativeNestedCollection.cpp b/test-suite/generated-src/jni/NativeNestedCollection.cpp index 854d5f2f..4ed646bd 100644 --- a/test-suite/generated-src/jni/NativeNestedCollection.cpp +++ b/test-suite/generated-src/jni/NativeNestedCollection.cpp @@ -22,7 +22,9 @@ auto NativeNestedCollection::toCpp(JNIEnv* jniEnv, JniType j) -> CppType { ::djinni::JniLocalScope jscope(jniEnv, 2); assert(j != nullptr); const auto& data = ::djinni::JniClass::get(); - return {::djinni::List<::djinni::Set<::djinni::String>>::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mSetList))}; + ::testsuite::NestedCollection model; + model.mSetList = ::djinni::List<::djinni::Set<::djinni::String>>::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mSetList)); + return model; } } // namespace djinni_generated diff --git a/test-suite/generated-src/jni/NativeNestedOutcome.cpp b/test-suite/generated-src/jni/NativeNestedOutcome.cpp index 93097797..2941841b 100644 --- a/test-suite/generated-src/jni/NativeNestedOutcome.cpp +++ b/test-suite/generated-src/jni/NativeNestedOutcome.cpp @@ -23,7 +23,9 @@ auto NativeNestedOutcome::toCpp(JNIEnv* jniEnv, JniType j) -> CppType { ::djinni::JniLocalScope jscope(jniEnv, 2); assert(j != nullptr); const auto& data = ::djinni::JniClass::get(); - return {::djinni::Outcome<::djinni::I32, ::djinni::String>::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mO))}; + ::testsuite::NestedOutcome model; + model.mO = ::djinni::Outcome<::djinni::I32, ::djinni::String>::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mO)); + return model; } } // namespace djinni_generated diff --git a/test-suite/generated-src/jni/NativePrimitiveList.cpp b/test-suite/generated-src/jni/NativePrimitiveList.cpp index 3a4974ad..9318f5ea 100644 --- a/test-suite/generated-src/jni/NativePrimitiveList.cpp +++ b/test-suite/generated-src/jni/NativePrimitiveList.cpp @@ -22,7 +22,9 @@ auto NativePrimitiveList::toCpp(JNIEnv* jniEnv, JniType j) -> CppType { ::djinni::JniLocalScope jscope(jniEnv, 2); assert(j != nullptr); const auto& data = ::djinni::JniClass::get(); - return {::djinni::List<::djinni::I64>::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mList))}; + ::testsuite::PrimitiveList model; + model.mList = ::djinni::List<::djinni::I64>::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mList)); + return model; } } // namespace djinni_generated diff --git a/test-suite/generated-src/jni/NativeRecordUsingExtendedRecord.cpp b/test-suite/generated-src/jni/NativeRecordUsingExtendedRecord.cpp index 86541b1f..14bc10fe 100644 --- a/test-suite/generated-src/jni/NativeRecordUsingExtendedRecord.cpp +++ b/test-suite/generated-src/jni/NativeRecordUsingExtendedRecord.cpp @@ -22,7 +22,9 @@ auto NativeRecordUsingExtendedRecord::toCpp(JNIEnv* jniEnv, JniType j) -> CppTyp ::djinni::JniLocalScope jscope(jniEnv, 2); assert(j != nullptr); const auto& data = ::djinni::JniClass::get(); - return {::djinni_generated::NativeExtendedRecord::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mEr))}; + ::testsuite::RecordUsingExtendedRecord model; + model.mEr = ::djinni_generated::NativeExtendedRecord::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mEr)); + return model; } } // namespace djinni_generated diff --git a/test-suite/generated-src/jni/NativeRecordWithDerivings.cpp b/test-suite/generated-src/jni/NativeRecordWithDerivings.cpp index d082cf24..40c50a9d 100644 --- a/test-suite/generated-src/jni/NativeRecordWithDerivings.cpp +++ b/test-suite/generated-src/jni/NativeRecordWithDerivings.cpp @@ -29,14 +29,16 @@ auto NativeRecordWithDerivings::toCpp(JNIEnv* jniEnv, JniType j) -> CppType { ::djinni::JniLocalScope jscope(jniEnv, 9); assert(j != nullptr); const auto& data = ::djinni::JniClass::get(); - return {::djinni::I8::toCpp(jniEnv, jniEnv->GetByteField(j, data.field_mEight)), - ::djinni::I16::toCpp(jniEnv, jniEnv->GetShortField(j, data.field_mSixteen)), - ::djinni::I32::toCpp(jniEnv, jniEnv->GetIntField(j, data.field_mThirtytwo)), - ::djinni::I64::toCpp(jniEnv, jniEnv->GetLongField(j, data.field_mSixtyfour)), - ::djinni::F32::toCpp(jniEnv, jniEnv->GetFloatField(j, data.field_mFthirtytwo)), - ::djinni::F64::toCpp(jniEnv, jniEnv->GetDoubleField(j, data.field_mFsixtyfour)), - ::djinni::Date::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mD)), - ::djinni::String::toCpp(jniEnv, (jstring)jniEnv->GetObjectField(j, data.field_mS))}; + ::testsuite::RecordWithDerivings model; + model.mEight = ::djinni::I8::toCpp(jniEnv, jniEnv->GetByteField(j, data.field_mEight)); + model.mSixteen = ::djinni::I16::toCpp(jniEnv, jniEnv->GetShortField(j, data.field_mSixteen)); + model.mThirtytwo = ::djinni::I32::toCpp(jniEnv, jniEnv->GetIntField(j, data.field_mThirtytwo)); + model.mSixtyfour = ::djinni::I64::toCpp(jniEnv, jniEnv->GetLongField(j, data.field_mSixtyfour)); + model.mFthirtytwo = ::djinni::F32::toCpp(jniEnv, jniEnv->GetFloatField(j, data.field_mFthirtytwo)); + model.mFsixtyfour = ::djinni::F64::toCpp(jniEnv, jniEnv->GetDoubleField(j, data.field_mFsixtyfour)); + model.mD = ::djinni::Date::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mD)); + model.mS = ::djinni::String::toCpp(jniEnv, (jstring)jniEnv->GetObjectField(j, data.field_mS)); + return model; } } // namespace djinni_generated diff --git a/test-suite/generated-src/jni/NativeRecordWithDurationAndDerivings.cpp b/test-suite/generated-src/jni/NativeRecordWithDurationAndDerivings.cpp index 3fc6f51f..f5be9ed2 100644 --- a/test-suite/generated-src/jni/NativeRecordWithDurationAndDerivings.cpp +++ b/test-suite/generated-src/jni/NativeRecordWithDurationAndDerivings.cpp @@ -23,7 +23,9 @@ auto NativeRecordWithDurationAndDerivings::toCpp(JNIEnv* jniEnv, JniType j) -> C ::djinni::JniLocalScope jscope(jniEnv, 2); assert(j != nullptr); const auto& data = ::djinni::JniClass::get(); - return {::djinni::Duration<::djinni::F64, ::djinni::Duration_ns>::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mDt))}; + ::testsuite::RecordWithDurationAndDerivings model; + model.mDt = ::djinni::Duration<::djinni::F64, ::djinni::Duration_ns>::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mDt)); + return model; } } // namespace djinni_generated diff --git a/test-suite/generated-src/jni/NativeRecordWithEmbeddedCppProto.cpp b/test-suite/generated-src/jni/NativeRecordWithEmbeddedCppProto.cpp index b6278281..7a5e1938 100644 --- a/test-suite/generated-src/jni/NativeRecordWithEmbeddedCppProto.cpp +++ b/test-suite/generated-src/jni/NativeRecordWithEmbeddedCppProto.cpp @@ -22,7 +22,9 @@ auto NativeRecordWithEmbeddedCppProto::toCpp(JNIEnv* jniEnv, JniType j) -> CppTy ::djinni::JniLocalScope jscope(jniEnv, 2); assert(j != nullptr); const auto& data = ::djinni::JniClass::get(); - return {::djinni::Protobuf<::djinni::test2::PersistingState, ::djinni::JavaClassName<'d','j','i','n','n','i','/','t','e','s','t','2','/','T','e','s','t','2','$','P','e','r','s','i','s','t','i','n','g','S','t','a','t','e'>>::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mState))}; + ::testsuite::RecordWithEmbeddedCppProto model; + model.mState = ::djinni::Protobuf<::djinni::test2::PersistingState, ::djinni::JavaClassName<'d','j','i','n','n','i','/','t','e','s','t','2','/','T','e','s','t','2','$','P','e','r','s','i','s','t','i','n','g','S','t','a','t','e'>>::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mState)); + return model; } } // namespace djinni_generated diff --git a/test-suite/generated-src/jni/NativeRecordWithEmbeddedProto.cpp b/test-suite/generated-src/jni/NativeRecordWithEmbeddedProto.cpp index 7e3c0a6f..52ee7b95 100644 --- a/test-suite/generated-src/jni/NativeRecordWithEmbeddedProto.cpp +++ b/test-suite/generated-src/jni/NativeRecordWithEmbeddedProto.cpp @@ -22,7 +22,9 @@ auto NativeRecordWithEmbeddedProto::toCpp(JNIEnv* jniEnv, JniType j) -> CppType ::djinni::JniLocalScope jscope(jniEnv, 2); assert(j != nullptr); const auto& data = ::djinni::JniClass::get(); - return {::djinni::Protobuf<::djinni::test::Person, ::djinni::JavaClassName<'d','j','i','n','n','i','/','t','e','s','t','/','T','e','s','t','$','P','e','r','s','o','n'>>::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mPerson))}; + ::testsuite::RecordWithEmbeddedProto model; + model.mPerson = ::djinni::Protobuf<::djinni::test::Person, ::djinni::JavaClassName<'d','j','i','n','n','i','/','t','e','s','t','/','T','e','s','t','$','P','e','r','s','o','n'>>::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mPerson)); + return model; } } // namespace djinni_generated diff --git a/test-suite/generated-src/jni/NativeRecordWithFlags.cpp b/test-suite/generated-src/jni/NativeRecordWithFlags.cpp index ab5cfed4..913de3b9 100644 --- a/test-suite/generated-src/jni/NativeRecordWithFlags.cpp +++ b/test-suite/generated-src/jni/NativeRecordWithFlags.cpp @@ -22,7 +22,9 @@ auto NativeRecordWithFlags::toCpp(JNIEnv* jniEnv, JniType j) -> CppType { ::djinni::JniLocalScope jscope(jniEnv, 2); assert(j != nullptr); const auto& data = ::djinni::JniClass::get(); - return {::djinni_generated::NativeAccessFlags::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mAccess))}; + ::testsuite::RecordWithFlags model; + model.mAccess = ::djinni_generated::NativeAccessFlags::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mAccess)); + return model; } } // namespace djinni_generated diff --git a/test-suite/generated-src/jni/NativeRecordWithNestedDerivings.cpp b/test-suite/generated-src/jni/NativeRecordWithNestedDerivings.cpp index 49dde0fb..ab1f2254 100644 --- a/test-suite/generated-src/jni/NativeRecordWithNestedDerivings.cpp +++ b/test-suite/generated-src/jni/NativeRecordWithNestedDerivings.cpp @@ -24,8 +24,10 @@ auto NativeRecordWithNestedDerivings::toCpp(JNIEnv* jniEnv, JniType j) -> CppTyp ::djinni::JniLocalScope jscope(jniEnv, 3); assert(j != nullptr); const auto& data = ::djinni::JniClass::get(); - return {::djinni::I32::toCpp(jniEnv, jniEnv->GetIntField(j, data.field_mKey)), - ::djinni_generated::NativeRecordWithDerivings::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mRec))}; + ::testsuite::RecordWithNestedDerivings model; + model.mKey = ::djinni::I32::toCpp(jniEnv, jniEnv->GetIntField(j, data.field_mKey)); + model.mRec = ::djinni_generated::NativeRecordWithDerivings::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mRec)); + return model; } } // namespace djinni_generated diff --git a/test-suite/generated-src/jni/NativeSetRecord.cpp b/test-suite/generated-src/jni/NativeSetRecord.cpp index 4a58d0a9..80cac621 100644 --- a/test-suite/generated-src/jni/NativeSetRecord.cpp +++ b/test-suite/generated-src/jni/NativeSetRecord.cpp @@ -23,8 +23,10 @@ auto NativeSetRecord::toCpp(JNIEnv* jniEnv, JniType j) -> CppType { ::djinni::JniLocalScope jscope(jniEnv, 3); assert(j != nullptr); const auto& data = ::djinni::JniClass::get(); - return {::djinni::Set<::djinni::String>::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mSet)), - ::djinni::Set<::djinni::I32>::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mIset))}; + ::testsuite::SetRecord model; + model.mSet = ::djinni::Set<::djinni::String>::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mSet)); + model.mIset = ::djinni::Set<::djinni::I32>::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mIset)); + return model; } } // namespace djinni_generated diff --git a/test-suite/generated-src/jni/NativeSupportCopying.cpp b/test-suite/generated-src/jni/NativeSupportCopying.cpp index a6dfd0c2..698bc3ac 100644 --- a/test-suite/generated-src/jni/NativeSupportCopying.cpp +++ b/test-suite/generated-src/jni/NativeSupportCopying.cpp @@ -22,7 +22,9 @@ auto NativeSupportCopying::toCpp(JNIEnv* jniEnv, JniType j) -> CppType { ::djinni::JniLocalScope jscope(jniEnv, 2); assert(j != nullptr); const auto& data = ::djinni::JniClass::get(); - return {::djinni::I32::toCpp(jniEnv, jniEnv->GetIntField(j, data.field_mX))}; + ::testsuite::SupportCopying model; + model.mX = ::djinni::I32::toCpp(jniEnv, jniEnv->GetIntField(j, data.field_mX)); + return model; } } // namespace djinni_generated diff --git a/test-suite/generated-src/jni/NativeTestOptionalExternInterfaceRecord.cpp b/test-suite/generated-src/jni/NativeTestOptionalExternInterfaceRecord.cpp index ee67479d..9957cdba 100644 --- a/test-suite/generated-src/jni/NativeTestOptionalExternInterfaceRecord.cpp +++ b/test-suite/generated-src/jni/NativeTestOptionalExternInterfaceRecord.cpp @@ -23,7 +23,9 @@ auto NativeTestOptionalExternInterfaceRecord::toCpp(JNIEnv* jniEnv, JniType j) - ::djinni::JniLocalScope jscope(jniEnv, 2); assert(j != nullptr); const auto& data = ::djinni::JniClass::get(); - return {::djinni::Optional::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mSampleInterface))}; + ::TestOptionalExternInterfaceRecord model; + model.mSampleInterface = ::djinni::Optional::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mSampleInterface)); + return model; } } // namespace djinni_generated diff --git a/test-suite/generated-src/jni/NativeVarnameRecord.cpp b/test-suite/generated-src/jni/NativeVarnameRecord.cpp index e536ff9e..d3cfb99b 100644 --- a/test-suite/generated-src/jni/NativeVarnameRecord.cpp +++ b/test-suite/generated-src/jni/NativeVarnameRecord.cpp @@ -22,7 +22,9 @@ auto NativeVarnameRecord::toCpp(JNIEnv* jniEnv, JniType j) -> CppType { ::djinni::JniLocalScope jscope(jniEnv, 2); assert(j != nullptr); const auto& data = ::djinni::JniClass::get(); - return {::djinni::I8::toCpp(jniEnv, jniEnv->GetByteField(j, data.field_mField))}; + ::testsuite::VarnameRecord model; + model.mField = ::djinni::I8::toCpp(jniEnv, jniEnv->GetByteField(j, data.field_mField)); + return model; } } // namespace djinni_generated diff --git a/test-suite/generated-src/jni/NativeVec2.cpp b/test-suite/generated-src/jni/NativeVec2.cpp index ad8dad19..e86fbda0 100644 --- a/test-suite/generated-src/jni/NativeVec2.cpp +++ b/test-suite/generated-src/jni/NativeVec2.cpp @@ -23,8 +23,10 @@ auto NativeVec2::toCpp(JNIEnv* jniEnv, JniType j) -> CppType { ::djinni::JniLocalScope jscope(jniEnv, 3); assert(j != nullptr); const auto& data = ::djinni::JniClass::get(); - return {::djinni::I32::toCpp(jniEnv, jniEnv->GetIntField(j, data.field_mX)), - ::djinni::I32::toCpp(jniEnv, jniEnv->GetIntField(j, data.field_mY))}; + ::testsuite::Vec2 model; + model.mX = ::djinni::I32::toCpp(jniEnv, jniEnv->GetIntField(j, data.field_mX)); + model.mY = ::djinni::I32::toCpp(jniEnv, jniEnv->GetIntField(j, data.field_mY)); + return model; } } // namespace djinni_generated diff --git a/test-suite/generated-src/jni/NativeWcharTestRec.cpp b/test-suite/generated-src/jni/NativeWcharTestRec.cpp index 72feca57..a259c0f1 100644 --- a/test-suite/generated-src/jni/NativeWcharTestRec.cpp +++ b/test-suite/generated-src/jni/NativeWcharTestRec.cpp @@ -22,7 +22,9 @@ auto NativeWcharTestRec::toCpp(JNIEnv* jniEnv, JniType j) -> CppType { ::djinni::JniLocalScope jscope(jniEnv, 2); assert(j != nullptr); const auto& data = ::djinni::JniClass::get(); - return {::djinni::WString::toCpp(jniEnv, (jstring)jniEnv->GetObjectField(j, data.field_mS))}; + ::testsuite::WcharTestRec model; + model.mS = ::djinni::WString::toCpp(jniEnv, (jstring)jniEnv->GetObjectField(j, data.field_mS)); + return model; } } // namespace djinni_generated diff --git a/test-suite/generated-src/jni/NoConstructorRecordNative.cpp b/test-suite/generated-src/jni/NoConstructorRecordNative.cpp index 6631a0b9..7fbeb256 100644 --- a/test-suite/generated-src/jni/NoConstructorRecordNative.cpp +++ b/test-suite/generated-src/jni/NoConstructorRecordNative.cpp @@ -23,8 +23,10 @@ auto NoConstructorRecordNative::toCpp(JNIEnv* jniEnv, JniType j) -> CppType { ::djinni::JniLocalScope jscope(jniEnv, 3); assert(j != nullptr); const auto& data = ::djinni::JniClass::get(); - return {::djinni::I32::toCpp(jniEnv, jniEnv->GetIntField(j, data.field_mFirstValue)), - ::djinni::String::toCpp(jniEnv, (jstring)jniEnv->GetObjectField(j, data.field_mSecondValue))}; + ::testsuite::NoConstructorRecord model; + model.mFirstValue = ::djinni::I32::toCpp(jniEnv, jniEnv->GetIntField(j, data.field_mFirstValue)); + model.mSecondValue = ::djinni::String::toCpp(jniEnv, (jstring)jniEnv->GetObjectField(j, data.field_mSecondValue)); + return model; } } // namespace djinni_generated diff --git a/test-suite/generated-src/jni/TestIdentRecordNative.cpp b/test-suite/generated-src/jni/TestIdentRecordNative.cpp index b96ceb5b..ca3533e2 100644 --- a/test-suite/generated-src/jni/TestIdentRecordNative.cpp +++ b/test-suite/generated-src/jni/TestIdentRecordNative.cpp @@ -23,8 +23,10 @@ auto TestIdentRecordNative::toCpp(JNIEnv* jniEnv, JniType j) -> CppType { ::djinni::JniLocalScope jscope(jniEnv, 3); assert(j != nullptr); const auto& data = ::djinni::JniClass::get(); - return {::djinni::I32::toCpp(jniEnv, jniEnv->GetIntField(j, data.field_mFirstValue)), - ::djinni::String::toCpp(jniEnv, (jstring)jniEnv->GetObjectField(j, data.field_mSecondValue))}; + ::testsuite::TestIdentRecord model; + model.mFirstValue = ::djinni::I32::toCpp(jniEnv, jniEnv->GetIntField(j, data.field_mFirstValue)); + model.mSecondValue = ::djinni::String::toCpp(jniEnv, (jstring)jniEnv->GetObjectField(j, data.field_mSecondValue)); + return model; } } // namespace djinni_generated diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/AccessFlags.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/AccessFlags.kt index 9687fe66..4b84033e 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/AccessFlags.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/AccessFlags.kt @@ -1,7 +1,7 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from enum_flags.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test enum class AccessFlags { OWNER_READ, diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/AssortedPrimitives.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/AssortedPrimitives.kt index 4d640f01..fc93a283 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/AssortedPrimitives.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/AssortedPrimitives.kt @@ -1,7 +1,7 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from primtypes.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test @kotlinx.android.parcel.Parcelize data class AssortedPrimitives( @@ -18,8 +18,8 @@ data class AssortedPrimitives( val mOThirtytwo: Int?, val mOSixtyfour: Long?, val mOFthirtytwo: Float?, - val mOFsixtyfour: Double?, -) : android.os.Parcelable { + val mOFsixtyfour: Double? +) : android.os.Parcelable : android.os.Parcelable { override fun equals(other: Any?): Boolean { if (this === other) return true diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/AsyncInterface.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/AsyncInterface.kt index d85c0c34..d91080c2 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/AsyncInterface.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/AsyncInterface.kt @@ -1,7 +1,7 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from test.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test abstract class AsyncInterface { abstract fun futureRoundtrip(f: com.snapchat.djinni.Future): com.snapchat.djinni.Future diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ClientInterface.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ClientInterface.kt index be6cb305..b5dae793 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ClientInterface.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ClientInterface.kt @@ -1,7 +1,7 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from client_interface.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test /** Client interface */ abstract class ClientInterface { diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ClientReturnedRecord.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ClientReturnedRecord.kt index c98b739f..60e069fd 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ClientReturnedRecord.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ClientReturnedRecord.kt @@ -1,13 +1,13 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from client_interface.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test /** Record returned by a client */ data class ClientReturnedRecord( val mRecordId: Long, val mContent: String, - val mMisc: String?, + val mMisc: String? ) { override fun toString(): String { diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/Color.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/Color.kt index 1c64bc3b..9288f6d9 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/Color.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/Color.kt @@ -1,7 +1,7 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from enum.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test enum class Color { RED, diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/Conflict.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/Conflict.kt index 7ff3a282..c10dc079 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/Conflict.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/Conflict.kt @@ -1,10 +1,10 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from test.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test -import com.snapchat.djinni.NativeObjectManager; -import java.util.concurrent.atomic.AtomicBoolean; +import com.snapchat.djinni.NativeObjectManager +import java.util.concurrent.atomic.AtomicBoolean /** * Test for conflict of method name with an interface name. diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ConflictUser.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ConflictUser.kt index 0922f843..5b1c772a 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ConflictUser.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ConflictUser.kt @@ -1,11 +1,11 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from test.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test -import com.snapchat.djinni.NativeObjectManager; -import java.util.HashSet; -import java.util.concurrent.atomic.AtomicBoolean; +import com.snapchat.djinni.NativeObjectManager +import java.util.HashSet +import java.util.concurrent.atomic.AtomicBoolean abstract class ConflictUser { abstract fun Conflict(): Conflict @@ -25,13 +25,13 @@ abstract class ConflictUser { external fun nativeDestroy(nativeRef: Long) } - override fun Conflict(): Conflict { + override fun Conflict(): Conflict { assert(!destroyed.get()) { "trying to use a destroyed object" } return native_Conflict(nativeRef) } private external fun native_Conflict(_nativeRef: Long): Conflict - override fun conflictArg(cs: HashSet): Boolean { + override fun conflictArg(cs: HashSet): Boolean { assert(!destroyed.get()) { "trying to use a destroyed object" } return native_conflictArg(nativeRef, cs) } diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ConstantEnum.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ConstantEnum.kt index 52171ae6..557e7536 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ConstantEnum.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ConstantEnum.kt @@ -1,7 +1,7 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from constant_enum.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test /** enum for use in constants */ enum class ConstantEnum { diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ConstantInterfaceWithEnum.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ConstantInterfaceWithEnum.kt index e00e1e6b..62b89724 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ConstantInterfaceWithEnum.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ConstantInterfaceWithEnum.kt @@ -1,10 +1,10 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from constant_enum.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test -import com.snapchat.djinni.NativeObjectManager; -import java.util.concurrent.atomic.AtomicBoolean; +import com.snapchat.djinni.NativeObjectManager +import java.util.concurrent.atomic.AtomicBoolean /** Interface containing enum constant */ abstract class ConstantInterfaceWithEnum { diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ConstantRecord.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ConstantRecord.kt index 8d980074..13399f1c 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ConstantRecord.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ConstantRecord.kt @@ -1,12 +1,12 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from constants.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test /** Record for use in constants */ data class ConstantRecord( val mSomeInteger: Int, - val mSomeString: String, + val mSomeString: String ) { override fun toString(): String { diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ConstantWithEnum.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ConstantWithEnum.kt index cf5fe4ed..dee71c2d 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ConstantWithEnum.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ConstantWithEnum.kt @@ -1,10 +1,10 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from constant_enum.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test /** Record containing enum constant */ -class ConstantWithEnum { +open class ConstantWithEnum { companion object { val CONST_ENUM: ConstantEnum = ConstantEnum.SOME_VALUE } diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/Constants.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/Constants.kt index 67a7553c..37281b8b 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/Constants.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/Constants.kt @@ -1,10 +1,10 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from constants.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test /** Record containing constants */ -class Constants { +open class Constants { companion object { /** bool_constant has documentation. */ val BOOL_CONSTANT: Boolean = true diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ConstantsInterface.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ConstantsInterface.kt index 60ffb9d0..f267f3de 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ConstantsInterface.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ConstantsInterface.kt @@ -1,10 +1,10 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from constants.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test -import com.snapchat.djinni.NativeObjectManager; -import java.util.concurrent.atomic.AtomicBoolean; +import com.snapchat.djinni.NativeObjectManager +import java.util.concurrent.atomic.AtomicBoolean /** Interface containing constants */ abstract class ConstantsInterface { @@ -51,7 +51,7 @@ abstract class ConstantsInterface { * No support for optional constant records * No support for constant binary, list, set, map */ - abstract fun dummy(): Void + abstract fun dummy() class CppProxy(private val nativeRef: Long) : ConstantsInterface() { private val destroyed = AtomicBoolean(false) @@ -66,10 +66,10 @@ abstract class ConstantsInterface { external fun nativeDestroy(nativeRef: Long) } - override fun dummy(): Void { + override fun dummy() { assert(!destroyed.get()) { "trying to use a destroyed object" } native_dummy(nativeRef) } - private external fun native_dummy(_nativeRef: Long): Void + private external fun native_dummy(_nativeRef: Long) } } diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/CppException.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/CppException.kt index 1597e228..de1dfb07 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/CppException.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/CppException.kt @@ -1,10 +1,10 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from exception.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test -import com.snapchat.djinni.NativeObjectManager; -import java.util.concurrent.atomic.AtomicBoolean; +import com.snapchat.djinni.NativeObjectManager +import java.util.concurrent.atomic.AtomicBoolean abstract class CppException { abstract fun throwAnException(): Int @@ -15,6 +15,7 @@ abstract class CppException { companion object { + @kotlin.jvm.JvmStatic external fun get(): CppException } @@ -31,19 +32,19 @@ abstract class CppException { external fun nativeDestroy(nativeRef: Long) } - override fun throwAnException(): Int { + override fun throwAnException(): Int { assert(!destroyed.get()) { "trying to use a destroyed object" } return native_throwAnException(nativeRef) } private external fun native_throwAnException(_nativeRef: Long): Int - override fun callThrowingInterface(cb: ThrowingInterface): Int { + override fun callThrowingInterface(cb: ThrowingInterface): Int { assert(!destroyed.get()) { "trying to use a destroyed object" } return native_callThrowingInterface(nativeRef, cb) } private external fun native_callThrowingInterface(_nativeRef: Long, cb: ThrowingInterface): Int - override fun callThrowingAndCatch(cb: ThrowingInterface): String { + override fun callThrowingAndCatch(cb: ThrowingInterface): String { assert(!destroyed.get()) { "trying to use a destroyed object" } return native_callThrowingAndCatch(nativeRef, cb) } diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/DataRefTest.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/DataRefTest.kt index a002d368..f197d982 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/DataRefTest.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/DataRefTest.kt @@ -1,17 +1,17 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from data_ref_view.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test -import com.snapchat.djinni.NativeObjectManager; -import java.util.concurrent.atomic.AtomicBoolean; +import com.snapchat.djinni.NativeObjectManager +import java.util.concurrent.atomic.AtomicBoolean abstract class DataRefTest { - abstract fun sendData(data: java.nio.ByteBuffer): Void + abstract fun sendData(data: java.nio.ByteBuffer) abstract fun retriveAsBin(): ByteArray - abstract fun sendMutableData(data: java.nio.ByteBuffer): Void + abstract fun sendMutableData(data: java.nio.ByteBuffer) abstract fun generateData(): java.nio.ByteBuffer @@ -25,6 +25,7 @@ abstract class DataRefTest { companion object { + @kotlin.jvm.JvmStatic external fun create(): DataRefTest } @@ -41,49 +42,49 @@ abstract class DataRefTest { external fun nativeDestroy(nativeRef: Long) } - override fun sendData(data: java.nio.ByteBuffer): Void { + override fun sendData(data: java.nio.ByteBuffer) { assert(!destroyed.get()) { "trying to use a destroyed object" } native_sendData(nativeRef, data) } - private external fun native_sendData(_nativeRef: Long, data: java.nio.ByteBuffer): Void + private external fun native_sendData(_nativeRef: Long, data: java.nio.ByteBuffer) - override fun retriveAsBin(): ByteArray { + override fun retriveAsBin(): ByteArray { assert(!destroyed.get()) { "trying to use a destroyed object" } return native_retriveAsBin(nativeRef) } private external fun native_retriveAsBin(_nativeRef: Long): ByteArray - override fun sendMutableData(data: java.nio.ByteBuffer): Void { + override fun sendMutableData(data: java.nio.ByteBuffer) { assert(!destroyed.get()) { "trying to use a destroyed object" } native_sendMutableData(nativeRef, data) } - private external fun native_sendMutableData(_nativeRef: Long, data: java.nio.ByteBuffer): Void + private external fun native_sendMutableData(_nativeRef: Long, data: java.nio.ByteBuffer) - override fun generateData(): java.nio.ByteBuffer { + override fun generateData(): java.nio.ByteBuffer { assert(!destroyed.get()) { "trying to use a destroyed object" } return native_generateData(nativeRef) } private external fun native_generateData(_nativeRef: Long): java.nio.ByteBuffer - override fun dataFromVec(): java.nio.ByteBuffer { + override fun dataFromVec(): java.nio.ByteBuffer { assert(!destroyed.get()) { "trying to use a destroyed object" } return native_dataFromVec(nativeRef) } private external fun native_dataFromVec(_nativeRef: Long): java.nio.ByteBuffer - override fun dataFromStr(): java.nio.ByteBuffer { + override fun dataFromStr(): java.nio.ByteBuffer { assert(!destroyed.get()) { "trying to use a destroyed object" } return native_dataFromStr(nativeRef) } private external fun native_dataFromStr(_nativeRef: Long): java.nio.ByteBuffer - override fun sendDataView(data: java.nio.ByteBuffer): ByteArray { + override fun sendDataView(data: java.nio.ByteBuffer): ByteArray { assert(!destroyed.get()) { "trying to use a destroyed object" } return native_sendDataView(nativeRef, data) } private external fun native_sendDataView(_nativeRef: Long, data: java.nio.ByteBuffer): ByteArray - override fun recvDataView(): java.nio.ByteBuffer { + override fun recvDataView(): java.nio.ByteBuffer { assert(!destroyed.get()) { "trying to use a destroyed object" } return native_recvDataView(nativeRef) } diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/DateRecord.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/DateRecord.kt index 4c96393e..260bb72d 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/DateRecord.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/DateRecord.kt @@ -1,12 +1,12 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from date.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test @kotlinx.android.parcel.Parcelize data class DateRecord( - val mCreatedAt: java.util.Date, -) : Comparable, android.os.Parcelable { + val mCreatedAt: java.util.Date +) : Comparable, android.os.Parcelable : Comparable, android.os.Parcelable { override fun equals(other: Any?): Boolean { if (this === other) return true diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/EmptyFlags.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/EmptyFlags.kt index defc2cf9..90972d34 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/EmptyFlags.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/EmptyFlags.kt @@ -1,7 +1,7 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from enum_flags.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test enum class EmptyFlags { } diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/EmptyRecord.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/EmptyRecord.kt index 4dca1ad1..0bcd6f43 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/EmptyRecord.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/EmptyRecord.kt @@ -1,14 +1,14 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from test.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test /** * Empty record * (Second line of multi-line documentation. * Indented third line of multi-line documentation.) */ -class EmptyRecord { +open class EmptyRecord { override fun toString(): String { return "EmptyRecord {" + diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/EnumUsageInterface.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/EnumUsageInterface.kt index 7a5d1130..ec82cd3a 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/EnumUsageInterface.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/EnumUsageInterface.kt @@ -1,13 +1,13 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from enum.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test -import com.snapchat.djinni.NativeObjectManager; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.concurrent.atomic.AtomicBoolean; +import com.snapchat.djinni.NativeObjectManager +import java.util.ArrayList +import java.util.HashMap +import java.util.HashSet +import java.util.concurrent.atomic.AtomicBoolean abstract class EnumUsageInterface { abstract fun e(e: Color): Color @@ -33,31 +33,31 @@ abstract class EnumUsageInterface { external fun nativeDestroy(nativeRef: Long) } - override fun e(e: Color): Color { + override fun e(e: Color): Color { assert(!destroyed.get()) { "trying to use a destroyed object" } return native_e(nativeRef, e) } private external fun native_e(_nativeRef: Long, e: Color): Color - override fun o(o: Color?): Color? { + override fun o(o: Color?): Color? { assert(!destroyed.get()) { "trying to use a destroyed object" } return native_o(nativeRef, o) } private external fun native_o(_nativeRef: Long, o: Color?): Color? - override fun l(l: ArrayList): ArrayList { + override fun l(l: ArrayList): ArrayList { assert(!destroyed.get()) { "trying to use a destroyed object" } return native_l(nativeRef, l) } private external fun native_l(_nativeRef: Long, l: ArrayList): ArrayList - override fun s(s: HashSet): HashSet { + override fun s(s: HashSet): HashSet { assert(!destroyed.get()) { "trying to use a destroyed object" } return native_s(nativeRef, s) } private external fun native_s(_nativeRef: Long, s: HashSet): HashSet - override fun m(m: HashMap): HashMap { + override fun m(m: HashMap): HashMap { assert(!destroyed.get()) { "trying to use a destroyed object" } return native_m(nativeRef, m) } diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/EnumUsageRecord.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/EnumUsageRecord.kt index ae0467a1..9f2bbb67 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/EnumUsageRecord.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/EnumUsageRecord.kt @@ -1,11 +1,11 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from enum.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; +import java.util.ArrayList +import java.util.HashMap +import java.util.HashSet @kotlinx.android.parcel.Parcelize data class EnumUsageRecord( @@ -13,8 +13,8 @@ data class EnumUsageRecord( val mO: Color?, val mL: ArrayList, val mS: HashSet, - val mM: HashMap, -) : android.os.Parcelable { + val mM: HashMap +) : android.os.Parcelable : android.os.Parcelable { override fun toString(): String { return "EnumUsageRecord {" + diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ExtendedRecord.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ExtendedRecord.kt index 69edcfc2..1caab476 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ExtendedRecord.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ExtendedRecord.kt @@ -1,11 +1,11 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from extended_record.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test /** Extended record */ data class ExtendedRecord( - val mFoo: Boolean, + val mFoo: Boolean ) { companion object { val EXTENDED_RECORD_CONST: ExtendedRecord = ExtendedRecord( diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ExternInterface1.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ExternInterface1.kt index 8c6f9dd8..fc6589d4 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ExternInterface1.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ExternInterface1.kt @@ -1,10 +1,10 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from yaml-test.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test -import com.snapchat.djinni.NativeObjectManager; -import java.util.concurrent.atomic.AtomicBoolean; +import com.snapchat.djinni.NativeObjectManager +import java.util.concurrent.atomic.AtomicBoolean abstract class ExternInterface1 { abstract fun foo(i: com.dropbox.djinni.test.ClientInterface): com.dropbox.djinni.test.ClientReturnedRecord @@ -24,13 +24,13 @@ abstract class ExternInterface1 { external fun nativeDestroy(nativeRef: Long) } - override fun foo(i: com.dropbox.djinni.test.ClientInterface): com.dropbox.djinni.test.ClientReturnedRecord { + override fun foo(i: com.dropbox.djinni.test.ClientInterface): com.dropbox.djinni.test.ClientReturnedRecord { assert(!destroyed.get()) { "trying to use a destroyed object" } return native_foo(nativeRef, i) } private external fun native_foo(_nativeRef: Long, i: com.dropbox.djinni.test.ClientInterface): com.dropbox.djinni.test.ClientReturnedRecord - override fun bar(e: com.dropbox.djinni.test.Color): com.dropbox.djinni.test.Color { + override fun bar(e: com.dropbox.djinni.test.Color): com.dropbox.djinni.test.Color { assert(!destroyed.get()) { "trying to use a destroyed object" } return native_bar(nativeRef, e) } diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ExternInterface2.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ExternInterface2.kt index 22f7c156..52ed7b2e 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ExternInterface2.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ExternInterface2.kt @@ -1,7 +1,7 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from yaml-test.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test abstract class ExternInterface2 { abstract fun foo(i: com.dropbox.djinni.test.TestHelpers): ExternRecordWithDerivings diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ExternRecordWithDerivings.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ExternRecordWithDerivings.kt index 5b89ce82..48d0f4f9 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ExternRecordWithDerivings.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ExternRecordWithDerivings.kt @@ -1,13 +1,13 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from yaml-test.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test /** This file tests YAML dumped by Djinni can be parsed back in */ data class ExternRecordWithDerivings( val mMember: com.dropbox.djinni.test.RecordWithDerivings, - val mE: com.dropbox.djinni.test.Color, -) : Comparable { + val mE: com.dropbox.djinni.test.Color +) : Comparable : Comparable { override fun equals(other: Any?): Boolean { if (this === other) return true diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/FirstListener.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/FirstListener.kt index efcfeb64..93c5269d 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/FirstListener.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/FirstListener.kt @@ -1,9 +1,9 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from multiple_inheritance.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test /** Used for ObjC multiple inheritance tests */ abstract class FirstListener { - abstract fun first(): Void + abstract fun first() } diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/FlagRoundtrip.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/FlagRoundtrip.kt index 9354d6fa..c72a081d 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/FlagRoundtrip.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/FlagRoundtrip.kt @@ -1,21 +1,25 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from enum_flags.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test -import com.snapchat.djinni.NativeObjectManager; -import java.util.EnumSet; -import java.util.concurrent.atomic.AtomicBoolean; +import com.snapchat.djinni.NativeObjectManager +import java.util.EnumSet +import java.util.concurrent.atomic.AtomicBoolean abstract class FlagRoundtrip { companion object { + @kotlin.jvm.JvmStatic external fun roundtripAccess(flag: EnumSet): EnumSet + @kotlin.jvm.JvmStatic external fun roundtripEmpty(flag: EnumSet): EnumSet + @kotlin.jvm.JvmStatic external fun roundtripAccessBoxed(flag: EnumSet): EnumSet + @kotlin.jvm.JvmStatic external fun roundtripEmptyBoxed(flag: EnumSet): EnumSet } diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/FunctionPrologueHelper.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/FunctionPrologueHelper.kt index ba12446b..44916942 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/FunctionPrologueHelper.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/FunctionPrologueHelper.kt @@ -1,14 +1,15 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from function_prologue.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test -import com.snapchat.djinni.NativeObjectManager; -import java.util.concurrent.atomic.AtomicBoolean; +import com.snapchat.djinni.NativeObjectManager +import java.util.concurrent.atomic.AtomicBoolean abstract class FunctionPrologueHelper { companion object { + @kotlin.jvm.JvmStatic external fun foo(): String } diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/InterfaceUsingExtendedRecord.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/InterfaceUsingExtendedRecord.kt index f7311213..c4938970 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/InterfaceUsingExtendedRecord.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/InterfaceUsingExtendedRecord.kt @@ -1,10 +1,10 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from extended_record.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test -import com.snapchat.djinni.NativeObjectManager; -import java.util.concurrent.atomic.AtomicBoolean; +import com.snapchat.djinni.NativeObjectManager +import java.util.concurrent.atomic.AtomicBoolean abstract class InterfaceUsingExtendedRecord { companion object { @@ -27,7 +27,7 @@ abstract class InterfaceUsingExtendedRecord { external fun nativeDestroy(nativeRef: Long) } - override fun meth(er: ExtendedRecord): ExtendedRecord { + override fun meth(er: ExtendedRecord): ExtendedRecord { assert(!destroyed.get()) { "trying to use a destroyed object" } return native_meth(nativeRef, er) } diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/JavaOnlyListener.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/JavaOnlyListener.kt index 47b4a92a..207fc59f 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/JavaOnlyListener.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/JavaOnlyListener.kt @@ -1,7 +1,7 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from single_language_interfaces.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test abstract class JavaOnlyListener { } diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ListenerCaller.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ListenerCaller.kt index 84761933..e4b9e575 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ListenerCaller.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ListenerCaller.kt @@ -1,10 +1,10 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from multiple_inheritance.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test -import com.snapchat.djinni.NativeObjectManager; -import java.util.concurrent.atomic.AtomicBoolean; +import com.snapchat.djinni.NativeObjectManager +import java.util.concurrent.atomic.AtomicBoolean /** * Tester for the ability to call two interfaces which might be @@ -13,12 +13,13 @@ import java.util.concurrent.atomic.AtomicBoolean; * comparison. */ abstract class ListenerCaller { - abstract fun callFirst(): Void + abstract fun callFirst() - abstract fun callSecond(): Void + abstract fun callSecond() companion object { + @kotlin.jvm.JvmStatic external fun init(firstL: FirstListener, secondL: SecondListener): ListenerCaller } @@ -35,16 +36,16 @@ abstract class ListenerCaller { external fun nativeDestroy(nativeRef: Long) } - override fun callFirst(): Void { + override fun callFirst() { assert(!destroyed.get()) { "trying to use a destroyed object" } native_callFirst(nativeRef) } - private external fun native_callFirst(_nativeRef: Long): Void + private external fun native_callFirst(_nativeRef: Long) - override fun callSecond(): Void { + override fun callSecond() { assert(!destroyed.get()) { "trying to use a destroyed object" } native_callSecond(nativeRef) } - private external fun native_callSecond(_nativeRef: Long): Void + private external fun native_callSecond(_nativeRef: Long) } } diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/MapDateRecord.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/MapDateRecord.kt index a6b389a9..19fac4c9 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/MapDateRecord.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/MapDateRecord.kt @@ -1,12 +1,12 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from date.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test -import java.util.HashMap; +import java.util.HashMap data class MapDateRecord( - val mDatesById: HashMap, + val mDatesById: HashMap ) { override fun toString(): String { diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/MapListRecord.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/MapListRecord.kt index 1d326552..0d316d4b 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/MapListRecord.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/MapListRecord.kt @@ -1,13 +1,13 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from map.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test -import java.util.ArrayList; -import java.util.HashMap; +import java.util.ArrayList +import java.util.HashMap data class MapListRecord( - val mMapList: ArrayList>, + val mMapList: ArrayList> ) { override fun toString(): String { diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/MapRecord.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/MapRecord.kt index 250efff2..cf5dfe19 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/MapRecord.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/MapRecord.kt @@ -1,13 +1,13 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from map.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test -import java.util.HashMap; +import java.util.HashMap data class MapRecord( val mMap: HashMap, - val mImap: HashMap, + val mImap: HashMap ) { override fun toString(): String { diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/NestedCollection.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/NestedCollection.kt index 4829b5fc..0d5dfb3e 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/NestedCollection.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/NestedCollection.kt @@ -1,15 +1,15 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from nested_collection.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test -import java.util.ArrayList; -import java.util.HashSet; +import java.util.ArrayList +import java.util.HashSet @kotlinx.android.parcel.Parcelize data class NestedCollection( - val mSetList: ArrayList>, -) : android.os.Parcelable { + val mSetList: ArrayList> +) : android.os.Parcelable : android.os.Parcelable { override fun toString(): String { return "NestedCollection {" + diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/NestedOutcome.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/NestedOutcome.kt index 3b16dcf4..c1c40b07 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/NestedOutcome.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/NestedOutcome.kt @@ -1,10 +1,10 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from outcome.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test data class NestedOutcome( - val mO: com.snapchat.djinni.Outcome, + val mO: com.snapchat.djinni.Outcome ) { override fun equals(other: Any?): Boolean { diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/NoConstructorRecordNative.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/NoConstructorRecordNative.kt index b0598806..f644fedc 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/NoConstructorRecordNative.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/NoConstructorRecordNative.kt @@ -1,11 +1,11 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from no_constructor.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test data class NoConstructorRecordNative( val mFirstValue: Int, - val mSecondValue: String, + val mSecondValue: String ) { companion object { val RECORD_CONST_VALUE: String = "test" diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ObjcOnlyListener.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ObjcOnlyListener.kt index f2164378..f7a96af8 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ObjcOnlyListener.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ObjcOnlyListener.kt @@ -1,7 +1,7 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from single_language_interfaces.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test abstract class ObjcOnlyListener { } diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/PrimitiveList.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/PrimitiveList.kt index fd65e207..60b0dce5 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/PrimitiveList.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/PrimitiveList.kt @@ -1,12 +1,12 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from primitive_list.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test -import java.util.ArrayList; +import java.util.ArrayList data class PrimitiveList( - val mList: ArrayList, + val mList: ArrayList ) { override fun toString(): String { diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ProtoTests.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ProtoTests.kt index 8a228a48..a1e9873e 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ProtoTests.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ProtoTests.kt @@ -1,42 +1,55 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from proto.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test -import com.snapchat.djinni.NativeObjectManager; -import djinni.test.Test.AddressBook; -import djinni.test.Test.Person; -import djinni.test2.Test2.PersistingState; -import java.util.ArrayList; -import java.util.concurrent.atomic.AtomicBoolean; +import com.snapchat.djinni.NativeObjectManager +import djinni.test.Test.AddressBook +import djinni.test.Test.Person +import djinni.test2.Test2.PersistingState +import java.util.ArrayList +import java.util.concurrent.atomic.AtomicBoolean abstract class ProtoTests { companion object { + @kotlin.jvm.JvmStatic external fun protoToStrings(x: AddressBook): ArrayList + @kotlin.jvm.JvmStatic external fun stringsToProto(x: ArrayList): AddressBook + @kotlin.jvm.JvmStatic external fun embeddedProtoToString(x: RecordWithEmbeddedProto): String + @kotlin.jvm.JvmStatic external fun stringToEmbeddedProto(x: String): RecordWithEmbeddedProto + @kotlin.jvm.JvmStatic external fun cppProtoToString(x: PersistingState): String + @kotlin.jvm.JvmStatic external fun stringToCppProto(x: String): PersistingState + @kotlin.jvm.JvmStatic external fun embeddedCppProtoToString(x: RecordWithEmbeddedCppProto): String + @kotlin.jvm.JvmStatic external fun stringToEmbeddedCppProto(x: String): RecordWithEmbeddedCppProto + @kotlin.jvm.JvmStatic external fun protoListToStrings(x: ArrayList): ArrayList + @kotlin.jvm.JvmStatic external fun stringsToProtoList(x: ArrayList): ArrayList + @kotlin.jvm.JvmStatic external fun optionalProtoToString(x: Person?): String + @kotlin.jvm.JvmStatic external fun stringToOptionalProto(x: String): Person? + @kotlin.jvm.JvmStatic external fun stringToProtoOutcome(x: String): com.snapchat.djinni.Outcome } diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/RecordUsingExtendedRecord.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/RecordUsingExtendedRecord.kt index 677a9803..b9ac2919 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/RecordUsingExtendedRecord.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/RecordUsingExtendedRecord.kt @@ -1,10 +1,10 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from extended_record.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test data class RecordUsingExtendedRecord( - val mEr: ExtendedRecord, + val mEr: ExtendedRecord ) { companion object { val CR: RecordUsingExtendedRecord = RecordUsingExtendedRecord( diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/RecordWithDerivings.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/RecordWithDerivings.kt index 7c3ba2da..fcdf1908 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/RecordWithDerivings.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/RecordWithDerivings.kt @@ -1,9 +1,9 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from derivings.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test -import java.util.Date; +import java.util.Date data class RecordWithDerivings( val mEight: Byte, @@ -13,8 +13,8 @@ data class RecordWithDerivings( val mFthirtytwo: Float, val mFsixtyfour: Double, val mD: Date, - val mS: String, -) : Comparable { + val mS: String +) : Comparable : Comparable { override fun equals(other: Any?): Boolean { if (this === other) return true diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/RecordWithDurationAndDerivings.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/RecordWithDurationAndDerivings.kt index b60ef551..79de663b 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/RecordWithDurationAndDerivings.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/RecordWithDurationAndDerivings.kt @@ -1,11 +1,11 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from duration.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test data class RecordWithDurationAndDerivings( - val mDt: java.time.Duration, -) : Comparable { + val mDt: java.time.Duration +) : Comparable : Comparable { override fun equals(other: Any?): Boolean { if (this === other) return true diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/RecordWithEmbeddedCppProto.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/RecordWithEmbeddedCppProto.kt index b9893b1c..180f79b8 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/RecordWithEmbeddedCppProto.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/RecordWithEmbeddedCppProto.kt @@ -1,12 +1,12 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from proto.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test -import djinni.test2.Test2.PersistingState; +import djinni.test2.Test2.PersistingState data class RecordWithEmbeddedCppProto( - val mState: PersistingState, + val mState: PersistingState ) { override fun toString(): String { diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/RecordWithEmbeddedProto.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/RecordWithEmbeddedProto.kt index 9d4eaadd..762eba5f 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/RecordWithEmbeddedProto.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/RecordWithEmbeddedProto.kt @@ -1,12 +1,12 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from proto.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test -import djinni.test.Test.Person; +import djinni.test.Test.Person data class RecordWithEmbeddedProto( - val mPerson: Person, + val mPerson: Person ) { override fun toString(): String { diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/RecordWithFlags.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/RecordWithFlags.kt index f695fa41..2fdb29ee 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/RecordWithFlags.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/RecordWithFlags.kt @@ -1,12 +1,12 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from enum_flags.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test -import java.util.EnumSet; +import java.util.EnumSet data class RecordWithFlags( - val mAccess: EnumSet, + val mAccess: EnumSet ) { override fun toString(): String { diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/RecordWithNestedDerivings.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/RecordWithNestedDerivings.kt index 18b0adf0..b4652750 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/RecordWithNestedDerivings.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/RecordWithNestedDerivings.kt @@ -1,12 +1,12 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from derivings.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test data class RecordWithNestedDerivings( val mKey: Int, - val mRec: RecordWithDerivings, -) : Comparable { + val mRec: RecordWithDerivings +) : Comparable : Comparable { override fun equals(other: Any?): Boolean { if (this === other) return true diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ReturnOne.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ReturnOne.kt index 84b05b5c..09d2839e 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ReturnOne.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ReturnOne.kt @@ -1,10 +1,10 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from multiple_inheritance.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test -import com.snapchat.djinni.NativeObjectManager; -import java.util.concurrent.atomic.AtomicBoolean; +import com.snapchat.djinni.NativeObjectManager +import java.util.concurrent.atomic.AtomicBoolean /** Used for C++ multiple inheritance tests */ abstract class ReturnOne { @@ -12,6 +12,7 @@ abstract class ReturnOne { companion object { + @kotlin.jvm.JvmStatic external fun getInstance(): ReturnOne } @@ -28,7 +29,7 @@ abstract class ReturnOne { external fun nativeDestroy(nativeRef: Long) } - override fun returnOne(): Byte { + override fun returnOne(): Byte { assert(!destroyed.get()) { "trying to use a destroyed object" } return native_returnOne(nativeRef) } diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ReturnTwo.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ReturnTwo.kt index 9cfe2f5a..2338e6bb 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ReturnTwo.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ReturnTwo.kt @@ -1,10 +1,10 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from multiple_inheritance.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test -import com.snapchat.djinni.NativeObjectManager; -import java.util.concurrent.atomic.AtomicBoolean; +import com.snapchat.djinni.NativeObjectManager +import java.util.concurrent.atomic.AtomicBoolean /** Used for C++ multiple inheritance tests */ abstract class ReturnTwo { @@ -12,6 +12,7 @@ abstract class ReturnTwo { companion object { + @kotlin.jvm.JvmStatic external fun getInstance(): ReturnTwo } @@ -28,7 +29,7 @@ abstract class ReturnTwo { external fun nativeDestroy(nativeRef: Long) } - override fun returnTwo(): Byte { + override fun returnTwo(): Byte { assert(!destroyed.get()) { "trying to use a destroyed object" } return native_returnTwo(nativeRef) } diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ReverseClientInterface.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ReverseClientInterface.kt index dba77d0d..5826f653 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ReverseClientInterface.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ReverseClientInterface.kt @@ -1,10 +1,10 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from client_interface.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test -import com.snapchat.djinni.NativeObjectManager; -import java.util.concurrent.atomic.AtomicBoolean; +import com.snapchat.djinni.NativeObjectManager +import java.util.concurrent.atomic.AtomicBoolean abstract class ReverseClientInterface { abstract fun returnStr(): String @@ -15,6 +15,7 @@ abstract class ReverseClientInterface { companion object { + @kotlin.jvm.JvmStatic external fun create(): ReverseClientInterface } @@ -31,19 +32,19 @@ abstract class ReverseClientInterface { external fun nativeDestroy(nativeRef: Long) } - override fun returnStr(): String { + override fun returnStr(): String { assert(!destroyed.get()) { "trying to use a destroyed object" } return native_returnStr(nativeRef) } private external fun native_returnStr(_nativeRef: Long): String - override fun methTakingInterface(i: ReverseClientInterface): String { + override fun methTakingInterface(i: ReverseClientInterface): String { assert(!destroyed.get()) { "trying to use a destroyed object" } return native_methTakingInterface(nativeRef, i) } private external fun native_methTakingInterface(_nativeRef: Long, i: ReverseClientInterface): String - override fun methTakingOptionalInterface(i: ReverseClientInterface?): String { + override fun methTakingOptionalInterface(i: ReverseClientInterface?): String { assert(!destroyed.get()) { "trying to use a destroyed object" } return native_methTakingOptionalInterface(nativeRef, i) } diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/SampleInterface.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/SampleInterface.kt index 84ad6bed..fbc5abf1 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/SampleInterface.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/SampleInterface.kt @@ -1,10 +1,10 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from test.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test -import com.snapchat.djinni.NativeObjectManager; -import java.util.concurrent.atomic.AtomicBoolean; +import com.snapchat.djinni.NativeObjectManager +import java.util.concurrent.atomic.AtomicBoolean /** * we need to test optional interface diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/SecondListener.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/SecondListener.kt index ed4f7560..b5952aa6 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/SecondListener.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/SecondListener.kt @@ -1,9 +1,9 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from multiple_inheritance.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test /** Used for ObjC multiple inheritance tests */ abstract class SecondListener { - abstract fun second(): Void + abstract fun second() } diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/SetRecord.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/SetRecord.kt index 473123ce..e375c8c5 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/SetRecord.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/SetRecord.kt @@ -1,13 +1,13 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from set.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test -import java.util.HashSet; +import java.util.HashSet data class SetRecord( val mSet: HashSet, - val mIset: HashSet, + val mIset: HashSet ) { override fun toString(): String { diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/SupportCopying.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/SupportCopying.kt index effab073..b9e0e6ca 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/SupportCopying.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/SupportCopying.kt @@ -1,10 +1,10 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from nscopying.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test data class SupportCopying( - val mX: Int, + val mX: Int ) { override fun toString(): String { diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/TestArray.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/TestArray.kt index 40dc27c9..161772fb 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/TestArray.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/TestArray.kt @@ -1,20 +1,24 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from array.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test -import com.snapchat.djinni.NativeObjectManager; -import java.util.concurrent.atomic.AtomicBoolean; +import com.snapchat.djinni.NativeObjectManager +import java.util.concurrent.atomic.AtomicBoolean abstract class TestArray { companion object { + @kotlin.jvm.JvmStatic external fun testStringArray(a: String[]): String[] + @kotlin.jvm.JvmStatic external fun testIntArray(a: Int[]): Int[] + @kotlin.jvm.JvmStatic external fun testRecordArray(a: Vec2[]): Vec2[] + @kotlin.jvm.JvmStatic external fun testArrayOfArray(a: Int[][]): Int[][] } diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/TestDuration.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/TestDuration.kt index cbc815d5..7be72481 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/TestDuration.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/TestDuration.kt @@ -1,52 +1,72 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from duration.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test -import com.snapchat.djinni.NativeObjectManager; -import java.util.concurrent.atomic.AtomicBoolean; +import com.snapchat.djinni.NativeObjectManager +import java.util.concurrent.atomic.AtomicBoolean abstract class TestDuration { companion object { + @kotlin.jvm.JvmStatic external fun hoursString(dt: java.time.Duration): String + @kotlin.jvm.JvmStatic external fun minutesString(dt: java.time.Duration): String + @kotlin.jvm.JvmStatic external fun secondsString(dt: java.time.Duration): String + @kotlin.jvm.JvmStatic external fun millisString(dt: java.time.Duration): String + @kotlin.jvm.JvmStatic external fun microsString(dt: java.time.Duration): String + @kotlin.jvm.JvmStatic external fun nanosString(dt: java.time.Duration): String + @kotlin.jvm.JvmStatic external fun hours(count: Int): java.time.Duration + @kotlin.jvm.JvmStatic external fun minutes(count: Int): java.time.Duration + @kotlin.jvm.JvmStatic external fun seconds(count: Int): java.time.Duration + @kotlin.jvm.JvmStatic external fun millis(count: Int): java.time.Duration + @kotlin.jvm.JvmStatic external fun micros(count: Int): java.time.Duration + @kotlin.jvm.JvmStatic external fun nanos(count: Int): java.time.Duration + @kotlin.jvm.JvmStatic external fun hoursf(count: Double): java.time.Duration + @kotlin.jvm.JvmStatic external fun minutesf(count: Double): java.time.Duration + @kotlin.jvm.JvmStatic external fun secondsf(count: Double): java.time.Duration + @kotlin.jvm.JvmStatic external fun millisf(count: Double): java.time.Duration + @kotlin.jvm.JvmStatic external fun microsf(count: Double): java.time.Duration + @kotlin.jvm.JvmStatic external fun nanosf(count: Double): java.time.Duration + @kotlin.jvm.JvmStatic external fun box(count: Long): java.time.Duration? + @kotlin.jvm.JvmStatic external fun unbox(dt: java.time.Duration?): Long } diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/TestHelpers.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/TestHelpers.kt index efc221f7..b9f5f77c 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/TestHelpers.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/TestHelpers.kt @@ -1,13 +1,13 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from test.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test -import com.snapchat.djinni.NativeObjectManager; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.concurrent.atomic.AtomicBoolean; +import com.snapchat.djinni.NativeObjectManager +import java.util.ArrayList +import java.util.HashMap +import java.util.HashSet +import java.util.concurrent.atomic.AtomicBoolean /** * Helper methods used by various different tests. @@ -18,6 +18,7 @@ abstract class TestHelpers { companion object { /** Method with documentation */ + @kotlin.jvm.JvmStatic external fun getSetRecord(): SetRecord /** @@ -25,83 +26,120 @@ abstract class TestHelpers { * (Second line of multi-line documentation. * Indented third line of multi-line documentation.) */ + @kotlin.jvm.JvmStatic external fun checkSetRecord(rec: SetRecord): Boolean + @kotlin.jvm.JvmStatic external fun getPrimitiveList(): PrimitiveList + @kotlin.jvm.JvmStatic external fun checkPrimitiveList(pl: PrimitiveList): Boolean + @kotlin.jvm.JvmStatic external fun getNestedCollection(): NestedCollection + @kotlin.jvm.JvmStatic external fun checkNestedCollection(nc: NestedCollection): Boolean + @kotlin.jvm.JvmStatic external fun getMap(): HashMap + @kotlin.jvm.JvmStatic external fun checkMap(m: HashMap): Boolean + @kotlin.jvm.JvmStatic external fun getEmptyMap(): HashMap + @kotlin.jvm.JvmStatic external fun checkEmptyMap(m: HashMap): Boolean + @kotlin.jvm.JvmStatic external fun getMapListRecord(): MapListRecord + @kotlin.jvm.JvmStatic external fun checkMapListRecord(m: MapListRecord): Boolean - external fun checkClientInterfaceAscii(i: ClientInterface): Void + @kotlin.jvm.JvmStatic + external fun checkClientInterfaceAscii(i: ClientInterface): - external fun checkClientInterfaceNonascii(i: ClientInterface): Void + @kotlin.jvm.JvmStatic + external fun checkClientInterfaceNonascii(i: ClientInterface): - external fun checkClientInterfaceArgs(i: ClientInterface): Void + @kotlin.jvm.JvmStatic + external fun checkClientInterfaceArgs(i: ClientInterface): - external fun checkEnumMap(m: HashMap): Void + @kotlin.jvm.JvmStatic + external fun checkEnumMap(m: HashMap): - external fun checkEnum(c: Color): Void + @kotlin.jvm.JvmStatic + external fun checkEnum(c: Color): + @kotlin.jvm.JvmStatic external fun tokenId(t: UserToken?): UserToken? + @kotlin.jvm.JvmStatic external fun createCppToken(): UserToken - external fun checkCppToken(t: UserToken): Void + @kotlin.jvm.JvmStatic + external fun checkCppToken(t: UserToken): + @kotlin.jvm.JvmStatic external fun cppTokenId(t: UserToken): Long - external fun checkTokenType(t: UserToken, type: String): Void + @kotlin.jvm.JvmStatic + external fun checkTokenType(t: UserToken, type: String): + @kotlin.jvm.JvmStatic external fun returnNone(): Int? /** Ensures that we generate integer translation code */ + @kotlin.jvm.JvmStatic external fun assortedPrimitivesId(i: AssortedPrimitives): AssortedPrimitives + @kotlin.jvm.JvmStatic external fun idBinary(b: ByteArray): ByteArray + @kotlin.jvm.JvmStatic external fun getAsyncResult(): com.snapchat.djinni.Future + @kotlin.jvm.JvmStatic external fun futureRoundtrip(f: com.snapchat.djinni.Future): com.snapchat.djinni.Future + @kotlin.jvm.JvmStatic external fun asyncEarlyThrow(): com.snapchat.djinni.Future + @kotlin.jvm.JvmStatic external fun voidAsyncMethod(f: com.snapchat.djinni.Future): com.snapchat.djinni.Future /** * If the input is empty, returns back an empty future. * If the input is non-empty, returns back the value plus one. */ + @kotlin.jvm.JvmStatic external fun addOneIfPresent(f: com.snapchat.djinni.Future): com.snapchat.djinni.Future + @kotlin.jvm.JvmStatic external fun checkAsyncInterface(i: AsyncInterface): com.snapchat.djinni.Future + @kotlin.jvm.JvmStatic external fun checkAsyncComposition(i: AsyncInterface): com.snapchat.djinni.Future + @kotlin.jvm.JvmStatic external fun getOptionalList(): ArrayList + @kotlin.jvm.JvmStatic external fun checkOptionalList(ol: ArrayList): Boolean + @kotlin.jvm.JvmStatic external fun getOptionalSet(): HashSet + @kotlin.jvm.JvmStatic external fun checkOptionalSet(os: HashSet): Boolean + @kotlin.jvm.JvmStatic external fun getOptionalMap(): HashMap + @kotlin.jvm.JvmStatic external fun checkOptionalMap(om: HashMap): Boolean } diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/TestIdentEnumNative.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/TestIdentEnumNative.kt index 09c1cd8d..e0849dc8 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/TestIdentEnumNative.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/TestIdentEnumNative.kt @@ -1,7 +1,7 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from ident_explicit.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test enum class TestIdentEnumNative { SNAKE_ENUM, diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/TestIdentRecordNative.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/TestIdentRecordNative.kt index d5ac7004..7abc5a18 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/TestIdentRecordNative.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/TestIdentRecordNative.kt @@ -1,11 +1,11 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from ident_explicit.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test data class TestIdentRecordNative( val mFirstValue: Int, - val mSecondValue: String, + val mSecondValue: String ) { companion object { val RECORD_CONST_VALUE: String = "test" diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/TestJavaAbstractClassOnly.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/TestJavaAbstractClassOnly.kt index 5f97e4e4..556267bf 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/TestJavaAbstractClassOnly.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/TestJavaAbstractClassOnly.kt @@ -1,14 +1,15 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from interface_and_abstract_class.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test -import com.snapchat.djinni.NativeObjectManager; -import java.util.concurrent.atomic.AtomicBoolean; +import com.snapchat.djinni.NativeObjectManager +import java.util.concurrent.atomic.AtomicBoolean abstract class TestJavaAbstractClassOnly { companion object { + @kotlin.jvm.JvmStatic external fun testMethod(): Boolean } diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/TestJavaInterfaceOnly.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/TestJavaInterfaceOnly.kt index a6b573ac..4119674d 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/TestJavaInterfaceOnly.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/TestJavaInterfaceOnly.kt @@ -1,7 +1,7 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from interface_and_abstract_class.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test interface TestJavaInterfaceOnly { fun testMethod(): Boolean diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/TestOptionalExternInterfaceRecord.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/TestOptionalExternInterfaceRecord.kt index 5102be97..76fd460a 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/TestOptionalExternInterfaceRecord.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/TestOptionalExternInterfaceRecord.kt @@ -1,10 +1,10 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from yaml-test.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test data class TestOptionalExternInterfaceRecord( - val mSampleInterface: com.dropbox.djinni.test.SampleInterface?, + val mSampleInterface: com.dropbox.djinni.test.SampleInterface? ) { override fun toString(): String { diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/TestOutcome.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/TestOutcome.kt index 8850966c..27488115 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/TestOutcome.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/TestOutcome.kt @@ -1,28 +1,36 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from outcome.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test -import com.snapchat.djinni.NativeObjectManager; -import java.util.concurrent.atomic.AtomicBoolean; +import com.snapchat.djinni.NativeObjectManager +import java.util.concurrent.atomic.AtomicBoolean abstract class TestOutcome { companion object { + @kotlin.jvm.JvmStatic external fun getSuccessOutcome(): com.snapchat.djinni.Outcome + @kotlin.jvm.JvmStatic external fun getErrorOutcome(): com.snapchat.djinni.Outcome + @kotlin.jvm.JvmStatic external fun putSuccessOutcome(x: com.snapchat.djinni.Outcome): String + @kotlin.jvm.JvmStatic external fun putErrorOutcome(x: com.snapchat.djinni.Outcome): Int + @kotlin.jvm.JvmStatic external fun getNestedSuccessOutcome(): NestedOutcome + @kotlin.jvm.JvmStatic external fun getNestedErrorOutcome(): NestedOutcome + @kotlin.jvm.JvmStatic external fun putNestedSuccessOutcome(x: NestedOutcome): Int + @kotlin.jvm.JvmStatic external fun putNestedErrorOutcome(x: NestedOutcome): String } diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/TestStaticMethodLanguage.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/TestStaticMethodLanguage.kt index f0349617..e48ccd7b 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/TestStaticMethodLanguage.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/TestStaticMethodLanguage.kt @@ -1,10 +1,10 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from static_method_language.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test -import com.snapchat.djinni.NativeObjectManager; -import java.util.concurrent.atomic.AtomicBoolean; +import com.snapchat.djinni.NativeObjectManager +import java.util.concurrent.atomic.AtomicBoolean abstract class TestStaticMethodLanguage { diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ThrowingInterface.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ThrowingInterface.kt index 8a47f36c..779243e2 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ThrowingInterface.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/ThrowingInterface.kt @@ -1,8 +1,8 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from exception.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test abstract class ThrowingInterface { - abstract fun throwException(): Void + abstract fun throwException() } diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/UserToken.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/UserToken.kt index 63c370d6..8a77300e 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/UserToken.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/UserToken.kt @@ -1,10 +1,10 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from user_token.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test -import com.snapchat.djinni.NativeObjectManager; -import java.util.concurrent.atomic.AtomicBoolean; +import com.snapchat.djinni.NativeObjectManager +import java.util.concurrent.atomic.AtomicBoolean abstract class UserToken { abstract fun whoami(): String @@ -22,7 +22,7 @@ abstract class UserToken { external fun nativeDestroy(nativeRef: Long) } - override fun whoami(): String { + override fun whoami(): String { assert(!destroyed.get()) { "trying to use a destroyed object" } return native_whoami(nativeRef) } diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/UsesSingleLanguageListeners.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/UsesSingleLanguageListeners.kt index 3e7cebc4..f35617cc 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/UsesSingleLanguageListeners.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/UsesSingleLanguageListeners.kt @@ -1,21 +1,21 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from single_language_interfaces.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test -import com.snapchat.djinni.NativeObjectManager; -import java.util.concurrent.atomic.AtomicBoolean; +import com.snapchat.djinni.NativeObjectManager +import java.util.concurrent.atomic.AtomicBoolean /** * Generating and compiling this makes sure other languages don't break * on references to interfaces they don't need. */ abstract class UsesSingleLanguageListeners { - abstract fun callForObjC(l: ObjcOnlyListener): Void + abstract fun callForObjC(l: ObjcOnlyListener) abstract fun returnForObjC(): ObjcOnlyListener - abstract fun callForJava(l: JavaOnlyListener): Void + abstract fun callForJava(l: JavaOnlyListener) abstract fun returnForJava(): JavaOnlyListener @@ -32,25 +32,25 @@ abstract class UsesSingleLanguageListeners { external fun nativeDestroy(nativeRef: Long) } - override fun callForObjC(l: ObjcOnlyListener): Void { + override fun callForObjC(l: ObjcOnlyListener) { assert(!destroyed.get()) { "trying to use a destroyed object" } native_callForObjC(nativeRef, l) } - private external fun native_callForObjC(_nativeRef: Long, l: ObjcOnlyListener): Void + private external fun native_callForObjC(_nativeRef: Long, l: ObjcOnlyListener) - override fun returnForObjC(): ObjcOnlyListener { + override fun returnForObjC(): ObjcOnlyListener { assert(!destroyed.get()) { "trying to use a destroyed object" } return native_returnForObjC(nativeRef) } private external fun native_returnForObjC(_nativeRef: Long): ObjcOnlyListener - override fun callForJava(l: JavaOnlyListener): Void { + override fun callForJava(l: JavaOnlyListener) { assert(!destroyed.get()) { "trying to use a destroyed object" } native_callForJava(nativeRef, l) } - private external fun native_callForJava(_nativeRef: Long, l: JavaOnlyListener): Void + private external fun native_callForJava(_nativeRef: Long, l: JavaOnlyListener) - override fun returnForJava(): JavaOnlyListener { + override fun returnForJava(): JavaOnlyListener { assert(!destroyed.get()) { "trying to use a destroyed object" } return native_returnForJava(nativeRef) } diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/VarnameInterface.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/VarnameInterface.kt index 8866df13..cefa3101 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/VarnameInterface.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/VarnameInterface.kt @@ -1,10 +1,10 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from varnames.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test -import com.snapchat.djinni.NativeObjectManager; -import java.util.concurrent.atomic.AtomicBoolean; +import com.snapchat.djinni.NativeObjectManager +import java.util.concurrent.atomic.AtomicBoolean abstract class VarnameInterface { /** @@ -29,13 +29,13 @@ abstract class VarnameInterface { external fun nativeDestroy(nativeRef: Long) } - override fun Rmethod(RArg: VarnameRecord): VarnameRecord { + override fun Rmethod(RArg: VarnameRecord): VarnameRecord { assert(!destroyed.get()) { "trying to use a destroyed object" } return native_Rmethod(nativeRef, RArg) } private external fun native_Rmethod(_nativeRef: Long, RArg: VarnameRecord): VarnameRecord - override fun Imethod(IArg: VarnameInterface): VarnameInterface { + override fun Imethod(IArg: VarnameInterface): VarnameInterface { assert(!destroyed.get()) { "trying to use a destroyed object" } return native_Imethod(nativeRef, IArg) } diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/VarnameRecord.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/VarnameRecord.kt index 3cc6a59d..711dd1df 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/VarnameRecord.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/VarnameRecord.kt @@ -1,7 +1,7 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from varnames.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test /** * Underscore is used as a separator in Djinni names, so we don't really @@ -9,7 +9,7 @@ package com.dropbox.djinni.test; * badly when it is. However this test case ensures we at least don't crash. */ data class VarnameRecord( - val mField: Byte, + val mField: Byte ) { override fun toString(): String { diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/Vec2.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/Vec2.kt index 6bf7fae7..2819d30f 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/Vec2.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/Vec2.kt @@ -1,11 +1,11 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from array.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test data class Vec2( val mX: Int, - val mY: Int, + val mY: Int ) { override fun equals(other: Any?): Boolean { diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/WcharTestHelpers.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/WcharTestHelpers.kt index 5bf4aa51..a871261b 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/WcharTestHelpers.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/WcharTestHelpers.kt @@ -1,20 +1,24 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from wchar_test.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test -import com.snapchat.djinni.NativeObjectManager; -import java.util.concurrent.atomic.AtomicBoolean; +import com.snapchat.djinni.NativeObjectManager +import java.util.concurrent.atomic.AtomicBoolean abstract class WcharTestHelpers { companion object { + @kotlin.jvm.JvmStatic external fun getRecord(): WcharTestRec + @kotlin.jvm.JvmStatic external fun getString(): String + @kotlin.jvm.JvmStatic external fun checkString(str: String): Boolean + @kotlin.jvm.JvmStatic external fun checkRecord(rec: WcharTestRec): Boolean } diff --git a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/WcharTestRec.kt b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/WcharTestRec.kt index 95500bd7..c10b2831 100644 --- a/test-suite/generated-src/kotlin/com/dropbox/djinni/test/WcharTestRec.kt +++ b/test-suite/generated-src/kotlin/com/dropbox/djinni/test/WcharTestRec.kt @@ -1,10 +1,10 @@ // AUTOGENERATED FILE - DO NOT MODIFY! // This file was generated by Djinni from wchar_test.djinni -package com.dropbox.djinni.test; +package com.dropbox.djinni.test data class WcharTestRec( - val mS: String, + val mS: String ) { override fun toString(): String { diff --git a/test-suite/generated-src/objc/DBAssortedPrimitives+Private.mm b/test-suite/generated-src/objc/DBAssortedPrimitives+Private.mm index ec45dcda..3373e018 100644 --- a/test-suite/generated-src/objc/DBAssortedPrimitives+Private.mm +++ b/test-suite/generated-src/objc/DBAssortedPrimitives+Private.mm @@ -10,20 +10,22 @@ auto AssortedPrimitives::toCpp(ObjcType obj) -> CppType { assert(obj); - return {::djinni::Bool::toCpp(obj.b), - ::djinni::I8::toCpp(obj.eight), - ::djinni::I16::toCpp(obj.sixteen), - ::djinni::I32::toCpp(obj.thirtytwo), - ::djinni::I64::toCpp(obj.sixtyfour), - ::djinni::F32::toCpp(obj.fthirtytwo), - ::djinni::F64::toCpp(obj.fsixtyfour), - ::djinni::Optional::toCpp(obj.oB), - ::djinni::Optional::toCpp(obj.oEight), - ::djinni::Optional::toCpp(obj.oSixteen), - ::djinni::Optional::toCpp(obj.oThirtytwo), - ::djinni::Optional::toCpp(obj.oSixtyfour), - ::djinni::Optional::toCpp(obj.oFthirtytwo), - ::djinni::Optional::toCpp(obj.oFsixtyfour)}; + ::testsuite::AssortedPrimitives model; + model.mB = ::djinni::Bool::toCpp(obj.b); + model.mEight = ::djinni::I8::toCpp(obj.eight); + model.mSixteen = ::djinni::I16::toCpp(obj.sixteen); + model.mThirtytwo = ::djinni::I32::toCpp(obj.thirtytwo); + model.mSixtyfour = ::djinni::I64::toCpp(obj.sixtyfour); + model.mFthirtytwo = ::djinni::F32::toCpp(obj.fthirtytwo); + model.mFsixtyfour = ::djinni::F64::toCpp(obj.fsixtyfour); + model.mOB = ::djinni::Optional::toCpp(obj.oB); + model.mOEight = ::djinni::Optional::toCpp(obj.oEight); + model.mOSixteen = ::djinni::Optional::toCpp(obj.oSixteen); + model.mOThirtytwo = ::djinni::Optional::toCpp(obj.oThirtytwo); + model.mOSixtyfour = ::djinni::Optional::toCpp(obj.oSixtyfour); + model.mOFthirtytwo = ::djinni::Optional::toCpp(obj.oFthirtytwo); + model.mOFsixtyfour = ::djinni::Optional::toCpp(obj.oFsixtyfour); + return model; } auto AssortedPrimitives::fromCpp(const CppType& cpp) -> ObjcType diff --git a/test-suite/generated-src/objc/DBClientReturnedRecord+Private.mm b/test-suite/generated-src/objc/DBClientReturnedRecord+Private.mm index 5b84aef4..d8832182 100644 --- a/test-suite/generated-src/objc/DBClientReturnedRecord+Private.mm +++ b/test-suite/generated-src/objc/DBClientReturnedRecord+Private.mm @@ -10,9 +10,11 @@ auto ClientReturnedRecord::toCpp(ObjcType obj) -> CppType { assert(obj); - return {::djinni::I64::toCpp(obj.recordId), - ::djinni::String::toCpp(obj.content), - ::djinni::Optional::toCpp(obj.misc)}; + ::testsuite::ClientReturnedRecord model; + model.mRecordId = ::djinni::I64::toCpp(obj.recordId); + model.mContent = ::djinni::String::toCpp(obj.content); + model.mMisc = ::djinni::Optional::toCpp(obj.misc); + return model; } auto ClientReturnedRecord::fromCpp(const CppType& cpp) -> ObjcType diff --git a/test-suite/generated-src/objc/DBConstantRecord+Private.mm b/test-suite/generated-src/objc/DBConstantRecord+Private.mm index 698da728..b011bdcb 100644 --- a/test-suite/generated-src/objc/DBConstantRecord+Private.mm +++ b/test-suite/generated-src/objc/DBConstantRecord+Private.mm @@ -10,8 +10,10 @@ auto ConstantRecord::toCpp(ObjcType obj) -> CppType { assert(obj); - return {::djinni::I32::toCpp(obj.someInteger), - ::djinni::String::toCpp(obj.someString)}; + ::testsuite::ConstantRecord model; + model.mSomeInteger = ::djinni::I32::toCpp(obj.someInteger); + model.mSomeString = ::djinni::String::toCpp(obj.someString); + return model; } auto ConstantRecord::fromCpp(const CppType& cpp) -> ObjcType diff --git a/test-suite/generated-src/objc/DBConstantWithEnum+Private.mm b/test-suite/generated-src/objc/DBConstantWithEnum+Private.mm index 012e89f8..814050f7 100644 --- a/test-suite/generated-src/objc/DBConstantWithEnum+Private.mm +++ b/test-suite/generated-src/objc/DBConstantWithEnum+Private.mm @@ -11,7 +11,8 @@ { assert(obj); (void)obj; // Suppress warnings in relase builds for empty records - return {}; + ::testsuite::ConstantWithEnum model; + return model; } auto ConstantWithEnum::fromCpp(const CppType& cpp) -> ObjcType diff --git a/test-suite/generated-src/objc/DBConstants+Private.mm b/test-suite/generated-src/objc/DBConstants+Private.mm index 2b125a85..65bc8132 100644 --- a/test-suite/generated-src/objc/DBConstants+Private.mm +++ b/test-suite/generated-src/objc/DBConstants+Private.mm @@ -12,7 +12,8 @@ { assert(obj); (void)obj; // Suppress warnings in relase builds for empty records - return {}; + ::testsuite::Constants model; + return model; } auto Constants::fromCpp(const CppType& cpp) -> ObjcType diff --git a/test-suite/generated-src/objc/DBDateRecord+Private.mm b/test-suite/generated-src/objc/DBDateRecord+Private.mm index b6f0fe9b..ba53b7a1 100644 --- a/test-suite/generated-src/objc/DBDateRecord+Private.mm +++ b/test-suite/generated-src/objc/DBDateRecord+Private.mm @@ -10,7 +10,9 @@ auto DateRecord::toCpp(ObjcType obj) -> CppType { assert(obj); - return {::djinni::Date::toCpp(obj.createdAt)}; + ::testsuite::DateRecord model; + model.mCreatedAt = ::djinni::Date::toCpp(obj.createdAt); + return model; } auto DateRecord::fromCpp(const CppType& cpp) -> ObjcType diff --git a/test-suite/generated-src/objc/DBEmptyRecord+Private.mm b/test-suite/generated-src/objc/DBEmptyRecord+Private.mm index b4bba1f5..95b348ed 100644 --- a/test-suite/generated-src/objc/DBEmptyRecord+Private.mm +++ b/test-suite/generated-src/objc/DBEmptyRecord+Private.mm @@ -10,7 +10,8 @@ { assert(obj); (void)obj; // Suppress warnings in relase builds for empty records - return {}; + ::testsuite::EmptyRecord model; + return model; } auto EmptyRecord::fromCpp(const CppType& cpp) -> ObjcType diff --git a/test-suite/generated-src/objc/DBEnumUsageRecord+Private.mm b/test-suite/generated-src/objc/DBEnumUsageRecord+Private.mm index bf13b783..73176475 100644 --- a/test-suite/generated-src/objc/DBEnumUsageRecord+Private.mm +++ b/test-suite/generated-src/objc/DBEnumUsageRecord+Private.mm @@ -11,11 +11,13 @@ auto EnumUsageRecord::toCpp(ObjcType obj) -> CppType { assert(obj); - return {::djinni::Enum<::testsuite::color, DBColor>::toCpp(obj.e), - ::djinni::Optional>::toCpp(obj.o), - ::djinni::List<::djinni::Enum<::testsuite::color, DBColor>>::toCpp(obj.l), - ::djinni::Set<::djinni::Enum<::testsuite::color, DBColor>>::toCpp(obj.s), - ::djinni::Map<::djinni::Enum<::testsuite::color, DBColor>, ::djinni::Enum<::testsuite::color, DBColor>>::toCpp(obj.m)}; + ::testsuite::EnumUsageRecord model; + model.mE = ::djinni::Enum<::testsuite::color, DBColor>::toCpp(obj.e); + model.mO = ::djinni::Optional>::toCpp(obj.o); + model.mL = ::djinni::List<::djinni::Enum<::testsuite::color, DBColor>>::toCpp(obj.l); + model.mS = ::djinni::Set<::djinni::Enum<::testsuite::color, DBColor>>::toCpp(obj.s); + model.mM = ::djinni::Map<::djinni::Enum<::testsuite::color, DBColor>, ::djinni::Enum<::testsuite::color, DBColor>>::toCpp(obj.m); + return model; } auto EnumUsageRecord::fromCpp(const CppType& cpp) -> ObjcType diff --git a/test-suite/generated-src/objc/DBExtendedRecord+Private.mm b/test-suite/generated-src/objc/DBExtendedRecord+Private.mm index 1e02c639..424c0af0 100644 --- a/test-suite/generated-src/objc/DBExtendedRecord+Private.mm +++ b/test-suite/generated-src/objc/DBExtendedRecord+Private.mm @@ -10,7 +10,9 @@ auto ExtendedRecord::toCpp(ObjcType obj) -> CppType { assert(obj); - return {::djinni::Bool::toCpp(obj.foo)}; + ::testsuite::ExtendedRecord model; + model.mFoo = ::djinni::Bool::toCpp(obj.foo); + return model; } auto ExtendedRecord::fromCpp(const CppType& cpp) -> ObjcType diff --git a/test-suite/generated-src/objc/DBExternRecordWithDerivings+Private.mm b/test-suite/generated-src/objc/DBExternRecordWithDerivings+Private.mm index d2bd88b7..4211c977 100644 --- a/test-suite/generated-src/objc/DBExternRecordWithDerivings+Private.mm +++ b/test-suite/generated-src/objc/DBExternRecordWithDerivings+Private.mm @@ -11,8 +11,10 @@ auto ExternRecordWithDerivings::toCpp(ObjcType obj) -> CppType { assert(obj); - return {::djinni_generated::RecordWithDerivings::toCpp(obj.member), - ::djinni::Enum<::testsuite::color, DBColor>::toCpp(obj.e)}; + ::ExternRecordWithDerivings model; + model.mMember = ::djinni_generated::RecordWithDerivings::toCpp(obj.member); + model.mE = ::djinni::Enum<::testsuite::color, DBColor>::toCpp(obj.e); + return model; } auto ExternRecordWithDerivings::fromCpp(const CppType& cpp) -> ObjcType diff --git a/test-suite/generated-src/objc/DBMapDateRecord+Private.mm b/test-suite/generated-src/objc/DBMapDateRecord+Private.mm index 1c6ed348..e33a40b9 100644 --- a/test-suite/generated-src/objc/DBMapDateRecord+Private.mm +++ b/test-suite/generated-src/objc/DBMapDateRecord+Private.mm @@ -10,7 +10,9 @@ auto MapDateRecord::toCpp(ObjcType obj) -> CppType { assert(obj); - return {::djinni::Map<::djinni::String, ::djinni::Date>::toCpp(obj.datesById)}; + ::testsuite::MapDateRecord model; + model.mDatesById = ::djinni::Map<::djinni::String, ::djinni::Date>::toCpp(obj.datesById); + return model; } auto MapDateRecord::fromCpp(const CppType& cpp) -> ObjcType diff --git a/test-suite/generated-src/objc/DBMapListRecord+Private.mm b/test-suite/generated-src/objc/DBMapListRecord+Private.mm index e33d2278..00899143 100644 --- a/test-suite/generated-src/objc/DBMapListRecord+Private.mm +++ b/test-suite/generated-src/objc/DBMapListRecord+Private.mm @@ -10,7 +10,9 @@ auto MapListRecord::toCpp(ObjcType obj) -> CppType { assert(obj); - return {::djinni::List<::djinni::Map<::djinni::String, ::djinni::I64>>::toCpp(obj.mapList)}; + ::testsuite::MapListRecord model; + model.mMapList = ::djinni::List<::djinni::Map<::djinni::String, ::djinni::I64>>::toCpp(obj.mapList); + return model; } auto MapListRecord::fromCpp(const CppType& cpp) -> ObjcType diff --git a/test-suite/generated-src/objc/DBMapRecord+Private.mm b/test-suite/generated-src/objc/DBMapRecord+Private.mm index 0f0cce06..771cf0eb 100644 --- a/test-suite/generated-src/objc/DBMapRecord+Private.mm +++ b/test-suite/generated-src/objc/DBMapRecord+Private.mm @@ -10,8 +10,10 @@ auto MapRecord::toCpp(ObjcType obj) -> CppType { assert(obj); - return {::djinni::Map<::djinni::String, ::djinni::I64>::toCpp(obj.map), - ::djinni::Map<::djinni::I32, ::djinni::I32>::toCpp(obj.imap)}; + ::testsuite::MapRecord model; + model.mMap = ::djinni::Map<::djinni::String, ::djinni::I64>::toCpp(obj.map); + model.mImap = ::djinni::Map<::djinni::I32, ::djinni::I32>::toCpp(obj.imap); + return model; } auto MapRecord::fromCpp(const CppType& cpp) -> ObjcType diff --git a/test-suite/generated-src/objc/DBNestedCollection+Private.mm b/test-suite/generated-src/objc/DBNestedCollection+Private.mm index 79fc177e..8f467ae4 100644 --- a/test-suite/generated-src/objc/DBNestedCollection+Private.mm +++ b/test-suite/generated-src/objc/DBNestedCollection+Private.mm @@ -10,7 +10,9 @@ auto NestedCollection::toCpp(ObjcType obj) -> CppType { assert(obj); - return {::djinni::List<::djinni::Set<::djinni::String>>::toCpp(obj.setList)}; + ::testsuite::NestedCollection model; + model.mSetList = ::djinni::List<::djinni::Set<::djinni::String>>::toCpp(obj.setList); + return model; } auto NestedCollection::fromCpp(const CppType& cpp) -> ObjcType diff --git a/test-suite/generated-src/objc/DBNestedOutcome+Private.mm b/test-suite/generated-src/objc/DBNestedOutcome+Private.mm index 08360b1f..6158539d 100644 --- a/test-suite/generated-src/objc/DBNestedOutcome+Private.mm +++ b/test-suite/generated-src/objc/DBNestedOutcome+Private.mm @@ -11,7 +11,9 @@ auto NestedOutcome::toCpp(ObjcType obj) -> CppType { assert(obj); - return {::djinni::Outcome<::djinni::I32, ::djinni::String>::toCpp(obj.o)}; + ::testsuite::NestedOutcome model; + model.mO = ::djinni::Outcome<::djinni::I32, ::djinni::String>::toCpp(obj.o); + return model; } auto NestedOutcome::fromCpp(const CppType& cpp) -> ObjcType diff --git a/test-suite/generated-src/objc/DBNoConstructorRecord+Private.mm b/test-suite/generated-src/objc/DBNoConstructorRecord+Private.mm index 3544ebfa..27f7bb25 100644 --- a/test-suite/generated-src/objc/DBNoConstructorRecord+Private.mm +++ b/test-suite/generated-src/objc/DBNoConstructorRecord+Private.mm @@ -10,8 +10,10 @@ auto NoConstructorRecord::toCpp(ObjcType obj) -> CppType { assert(obj); - return {::djinni::I32::toCpp(obj.FirstValue), - ::djinni::String::toCpp(obj.secondValue)}; + ::testsuite::NoConstructorRecord model; + model.mFirstValue = ::djinni::I32::toCpp(obj.FirstValue); + model.mSecondValue = ::djinni::String::toCpp(obj.secondValue); + return model; } auto NoConstructorRecord::fromCpp(const CppType& cpp) -> ObjcType diff --git a/test-suite/generated-src/objc/DBPrimitiveList+Private.mm b/test-suite/generated-src/objc/DBPrimitiveList+Private.mm index c36e9ae9..54a1b626 100644 --- a/test-suite/generated-src/objc/DBPrimitiveList+Private.mm +++ b/test-suite/generated-src/objc/DBPrimitiveList+Private.mm @@ -10,7 +10,9 @@ auto PrimitiveList::toCpp(ObjcType obj) -> CppType { assert(obj); - return {::djinni::List<::djinni::I64>::toCpp(obj.list)}; + ::testsuite::PrimitiveList model; + model.mList = ::djinni::List<::djinni::I64>::toCpp(obj.list); + return model; } auto PrimitiveList::fromCpp(const CppType& cpp) -> ObjcType diff --git a/test-suite/generated-src/objc/DBRecordUsingExtendedRecord+Private.mm b/test-suite/generated-src/objc/DBRecordUsingExtendedRecord+Private.mm index de0ddce9..3d12b70f 100644 --- a/test-suite/generated-src/objc/DBRecordUsingExtendedRecord+Private.mm +++ b/test-suite/generated-src/objc/DBRecordUsingExtendedRecord+Private.mm @@ -10,7 +10,9 @@ auto RecordUsingExtendedRecord::toCpp(ObjcType obj) -> CppType { assert(obj); - return {::djinni_generated::ExtendedRecord::toCpp(obj.er)}; + ::testsuite::RecordUsingExtendedRecord model; + model.mEr = ::djinni_generated::ExtendedRecord::toCpp(obj.er); + return model; } auto RecordUsingExtendedRecord::fromCpp(const CppType& cpp) -> ObjcType diff --git a/test-suite/generated-src/objc/DBRecordWithDerivings+Private.mm b/test-suite/generated-src/objc/DBRecordWithDerivings+Private.mm index d120e8b6..a22f3b3e 100644 --- a/test-suite/generated-src/objc/DBRecordWithDerivings+Private.mm +++ b/test-suite/generated-src/objc/DBRecordWithDerivings+Private.mm @@ -10,14 +10,16 @@ auto RecordWithDerivings::toCpp(ObjcType obj) -> CppType { assert(obj); - return {::djinni::I8::toCpp(obj.eight), - ::djinni::I16::toCpp(obj.sixteen), - ::djinni::I32::toCpp(obj.thirtytwo), - ::djinni::I64::toCpp(obj.sixtyfour), - ::djinni::F32::toCpp(obj.fthirtytwo), - ::djinni::F64::toCpp(obj.fsixtyfour), - ::djinni::Date::toCpp(obj.d), - ::djinni::String::toCpp(obj.s)}; + ::testsuite::RecordWithDerivings model; + model.mEight = ::djinni::I8::toCpp(obj.eight); + model.mSixteen = ::djinni::I16::toCpp(obj.sixteen); + model.mThirtytwo = ::djinni::I32::toCpp(obj.thirtytwo); + model.mSixtyfour = ::djinni::I64::toCpp(obj.sixtyfour); + model.mFthirtytwo = ::djinni::F32::toCpp(obj.fthirtytwo); + model.mFsixtyfour = ::djinni::F64::toCpp(obj.fsixtyfour); + model.mD = ::djinni::Date::toCpp(obj.d); + model.mS = ::djinni::String::toCpp(obj.s); + return model; } auto RecordWithDerivings::fromCpp(const CppType& cpp) -> ObjcType diff --git a/test-suite/generated-src/objc/DBRecordWithDurationAndDerivings+Private.mm b/test-suite/generated-src/objc/DBRecordWithDurationAndDerivings+Private.mm index 77e8d724..4a0e971d 100644 --- a/test-suite/generated-src/objc/DBRecordWithDurationAndDerivings+Private.mm +++ b/test-suite/generated-src/objc/DBRecordWithDurationAndDerivings+Private.mm @@ -11,7 +11,9 @@ auto RecordWithDurationAndDerivings::toCpp(ObjcType obj) -> CppType { assert(obj); - return {::djinni::Duration<::djinni::F64, ::djinni::Duration_ns>::toCpp(obj.dt)}; + ::testsuite::RecordWithDurationAndDerivings model; + model.mDt = ::djinni::Duration<::djinni::F64, ::djinni::Duration_ns>::toCpp(obj.dt); + return model; } auto RecordWithDurationAndDerivings::fromCpp(const CppType& cpp) -> ObjcType diff --git a/test-suite/generated-src/objc/DBRecordWithEmbeddedCppProto+Private.mm b/test-suite/generated-src/objc/DBRecordWithEmbeddedCppProto+Private.mm index 1419fe50..5e3a52ae 100644 --- a/test-suite/generated-src/objc/DBRecordWithEmbeddedCppProto+Private.mm +++ b/test-suite/generated-src/objc/DBRecordWithEmbeddedCppProto+Private.mm @@ -10,7 +10,9 @@ auto RecordWithEmbeddedCppProto::toCpp(ObjcType obj) -> CppType { assert(obj); - return {::djinni::ProtobufPassthrough<::djinni::test2::PersistingState>::toCpp(obj.state)}; + ::testsuite::RecordWithEmbeddedCppProto model; + model.mState = ::djinni::ProtobufPassthrough<::djinni::test2::PersistingState>::toCpp(obj.state); + return model; } auto RecordWithEmbeddedCppProto::fromCpp(const CppType& cpp) -> ObjcType diff --git a/test-suite/generated-src/objc/DBRecordWithEmbeddedProto+Private.mm b/test-suite/generated-src/objc/DBRecordWithEmbeddedProto+Private.mm index 7810aee0..1ffec240 100644 --- a/test-suite/generated-src/objc/DBRecordWithEmbeddedProto+Private.mm +++ b/test-suite/generated-src/objc/DBRecordWithEmbeddedProto+Private.mm @@ -11,7 +11,9 @@ auto RecordWithEmbeddedProto::toCpp(ObjcType obj) -> CppType { assert(obj); - return {::djinni::Protobuf<::djinni::test::Person, DJTestPerson>::toCpp(obj.person)}; + ::testsuite::RecordWithEmbeddedProto model; + model.mPerson = ::djinni::Protobuf<::djinni::test::Person, DJTestPerson>::toCpp(obj.person); + return model; } auto RecordWithEmbeddedProto::fromCpp(const CppType& cpp) -> ObjcType diff --git a/test-suite/generated-src/objc/DBRecordWithFlags+Private.mm b/test-suite/generated-src/objc/DBRecordWithFlags+Private.mm index 63e69fef..1958e2a6 100644 --- a/test-suite/generated-src/objc/DBRecordWithFlags+Private.mm +++ b/test-suite/generated-src/objc/DBRecordWithFlags+Private.mm @@ -10,7 +10,9 @@ auto RecordWithFlags::toCpp(ObjcType obj) -> CppType { assert(obj); - return {::djinni::Enum<::testsuite::access_flags, DBAccessFlags>::toCpp(obj.access)}; + ::testsuite::RecordWithFlags model; + model.mAccess = ::djinni::Enum<::testsuite::access_flags, DBAccessFlags>::toCpp(obj.access); + return model; } auto RecordWithFlags::fromCpp(const CppType& cpp) -> ObjcType diff --git a/test-suite/generated-src/objc/DBRecordWithNestedDerivings+Private.mm b/test-suite/generated-src/objc/DBRecordWithNestedDerivings+Private.mm index dcbd4cce..fcbd02e6 100644 --- a/test-suite/generated-src/objc/DBRecordWithNestedDerivings+Private.mm +++ b/test-suite/generated-src/objc/DBRecordWithNestedDerivings+Private.mm @@ -11,8 +11,10 @@ auto RecordWithNestedDerivings::toCpp(ObjcType obj) -> CppType { assert(obj); - return {::djinni::I32::toCpp(obj.key), - ::djinni_generated::RecordWithDerivings::toCpp(obj.rec)}; + ::testsuite::RecordWithNestedDerivings model; + model.mKey = ::djinni::I32::toCpp(obj.key); + model.mRec = ::djinni_generated::RecordWithDerivings::toCpp(obj.rec); + return model; } auto RecordWithNestedDerivings::fromCpp(const CppType& cpp) -> ObjcType diff --git a/test-suite/generated-src/objc/DBSetRecord+Private.mm b/test-suite/generated-src/objc/DBSetRecord+Private.mm index 80c6a42d..b9c5e18d 100644 --- a/test-suite/generated-src/objc/DBSetRecord+Private.mm +++ b/test-suite/generated-src/objc/DBSetRecord+Private.mm @@ -10,8 +10,10 @@ auto SetRecord::toCpp(ObjcType obj) -> CppType { assert(obj); - return {::djinni::Set<::djinni::String>::toCpp(obj.set), - ::djinni::Set<::djinni::I32>::toCpp(obj.iset)}; + ::testsuite::SetRecord model; + model.mSet = ::djinni::Set<::djinni::String>::toCpp(obj.set); + model.mIset = ::djinni::Set<::djinni::I32>::toCpp(obj.iset); + return model; } auto SetRecord::fromCpp(const CppType& cpp) -> ObjcType diff --git a/test-suite/generated-src/objc/DBSupportCopying+Private.mm b/test-suite/generated-src/objc/DBSupportCopying+Private.mm index 864a6b79..9f275bdd 100644 --- a/test-suite/generated-src/objc/DBSupportCopying+Private.mm +++ b/test-suite/generated-src/objc/DBSupportCopying+Private.mm @@ -10,7 +10,9 @@ auto SupportCopying::toCpp(ObjcType obj) -> CppType { assert(obj); - return {::djinni::I32::toCpp(obj.x)}; + ::testsuite::SupportCopying model; + model.mX = ::djinni::I32::toCpp(obj.x); + return model; } auto SupportCopying::fromCpp(const CppType& cpp) -> ObjcType diff --git a/test-suite/generated-src/objc/DBTestIdentRecord+Private.mm b/test-suite/generated-src/objc/DBTestIdentRecord+Private.mm index dbf59a68..fb018dd7 100644 --- a/test-suite/generated-src/objc/DBTestIdentRecord+Private.mm +++ b/test-suite/generated-src/objc/DBTestIdentRecord+Private.mm @@ -10,8 +10,10 @@ auto TestIdentRecord::toCpp(ObjcType obj) -> CppType { assert(obj); - return {::djinni::I32::toCpp(obj.FirstValue), - ::djinni::String::toCpp(obj.secondValue)}; + ::testsuite::TestIdentRecord model; + model.mFirstValue = ::djinni::I32::toCpp(obj.FirstValue); + model.mSecondValue = ::djinni::String::toCpp(obj.secondValue); + return model; } auto TestIdentRecord::fromCpp(const CppType& cpp) -> ObjcType diff --git a/test-suite/generated-src/objc/DBTestOptionalExternInterfaceRecord+Private.mm b/test-suite/generated-src/objc/DBTestOptionalExternInterfaceRecord+Private.mm index f1c1bf28..7348626e 100644 --- a/test-suite/generated-src/objc/DBTestOptionalExternInterfaceRecord+Private.mm +++ b/test-suite/generated-src/objc/DBTestOptionalExternInterfaceRecord+Private.mm @@ -11,7 +11,9 @@ auto TestOptionalExternInterfaceRecord::toCpp(ObjcType obj) -> CppType { assert(obj); - return {::djinni::Optional::toCpp(obj.sampleInterface)}; + ::TestOptionalExternInterfaceRecord model; + model.mSampleInterface = ::djinni::Optional::toCpp(obj.sampleInterface); + return model; } auto TestOptionalExternInterfaceRecord::fromCpp(const CppType& cpp) -> ObjcType diff --git a/test-suite/generated-src/objc/DBVarnameRecord+Private.mm b/test-suite/generated-src/objc/DBVarnameRecord+Private.mm index 9d2379d0..d86e1eb5 100644 --- a/test-suite/generated-src/objc/DBVarnameRecord+Private.mm +++ b/test-suite/generated-src/objc/DBVarnameRecord+Private.mm @@ -10,7 +10,9 @@ auto VarnameRecord::toCpp(ObjcType obj) -> CppType { assert(obj); - return {::djinni::I8::toCpp(obj.Field)}; + ::testsuite::VarnameRecord model; + model.mField = ::djinni::I8::toCpp(obj.Field); + return model; } auto VarnameRecord::fromCpp(const CppType& cpp) -> ObjcType diff --git a/test-suite/generated-src/objc/DBVec2+Private.mm b/test-suite/generated-src/objc/DBVec2+Private.mm index 9bd48ec8..46fc4012 100644 --- a/test-suite/generated-src/objc/DBVec2+Private.mm +++ b/test-suite/generated-src/objc/DBVec2+Private.mm @@ -10,8 +10,10 @@ auto Vec2::toCpp(ObjcType obj) -> CppType { assert(obj); - return {::djinni::I32::toCpp(obj.x), - ::djinni::I32::toCpp(obj.y)}; + ::testsuite::Vec2 model; + model.mX = ::djinni::I32::toCpp(obj.x); + model.mY = ::djinni::I32::toCpp(obj.y); + return model; } auto Vec2::fromCpp(const CppType& cpp) -> ObjcType diff --git a/test-suite/generated-src/objc/DBWcharTestRec+Private.mm b/test-suite/generated-src/objc/DBWcharTestRec+Private.mm index 4079b8fe..f97f4945 100644 --- a/test-suite/generated-src/objc/DBWcharTestRec+Private.mm +++ b/test-suite/generated-src/objc/DBWcharTestRec+Private.mm @@ -10,7 +10,9 @@ auto WcharTestRec::toCpp(ObjcType obj) -> CppType { assert(obj); - return {::djinni::WString::toCpp(obj.s)}; + ::testsuite::WcharTestRec model; + model.mS = ::djinni::WString::toCpp(obj.s); + return model; } auto WcharTestRec::fromCpp(const CppType& cpp) -> ObjcType