Merge pull request #9 from TransitApp/lepiju/fix-xcode-14.3

Update to bazel 6.2.0
TransitApp · May 18, 2023 · 4903edb · 4903edb
2 parents 3cdc310 + d6c7329
commit 4903edb
Show file tree

Hide file tree

Showing 139 changed files with 673 additions and 463 deletions.
diff --git a/.bazelversion b/.bazelversion
@@ -1 +1 @@
-6.0.0
+6.2.0
diff --git a/WORKSPACE b/WORKSPACE
@@ -1,20 +1,85 @@
 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",
+    ],
+)
+
+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")
+scala_config(scala_version = "2.11.12")
+
+load("@io_bazel_rules_scala//scala:scala.bzl", "rules_scala_setup", "rules_scala_toolchain_deps_repositories")
+
+rules_scala_setup()
+
+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()
+
+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
 
-# 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,
@@ -24,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
diff --git a/bzl/scala_config.bzl b/bzl/scala_config.bzl
diff --git a/bzl/setup_deps.bzl b/bzl/setup_deps.bzl
diff --git 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<NativeAssortedPrimitives>::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<std::experimental::optional, ::djinni::Bool>::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mOB)),
-            ::djinni::Optional<std::experimental::optional, ::djinni::I8>::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mOEight)),
-            ::djinni::Optional<std::experimental::optional, ::djinni::I16>::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mOSixteen)),
-            ::djinni::Optional<std::experimental::optional, ::djinni::I32>::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mOThirtytwo)),
-            ::djinni::Optional<std::experimental::optional, ::djinni::I64>::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mOSixtyfour)),
-            ::djinni::Optional<std::experimental::optional, ::djinni::F32>::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mOFthirtytwo)),
-            ::djinni::Optional<std::experimental::optional, ::djinni::F64>::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<std::experimental::optional, ::djinni::Bool>::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mOB));
+    model.mOEight = ::djinni::Optional<std::experimental::optional, ::djinni::I8>::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mOEight));
+    model.mOSixteen = ::djinni::Optional<std::experimental::optional, ::djinni::I16>::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mOSixteen));
+    model.mOThirtytwo = ::djinni::Optional<std::experimental::optional, ::djinni::I32>::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mOThirtytwo));
+    model.mOSixtyfour = ::djinni::Optional<std::experimental::optional, ::djinni::I64>::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mOSixtyfour));
+    model.mOFthirtytwo = ::djinni::Optional<std::experimental::optional, ::djinni::F32>::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mOFthirtytwo));
+    model.mOFsixtyfour = ::djinni::Optional<std::experimental::optional, ::djinni::F64>::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
@@ -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<NativeClientReturnedRecord>::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<std::experimental::optional, ::djinni::String>::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<std::experimental::optional, ::djinni::String>::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
@@ -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<NativeConstantRecord>::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
@@ -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
@@ -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
@@ -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<NativeDateRecord>::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
@@ -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
@@ -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<NativeEnumUsageRecord>::get();
-    return {::djinni_generated::NativeColor::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mE)),
-            ::djinni::Optional<std::experimental::optional, ::djinni_generated::NativeColor>::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<std::experimental::optional, ::djinni_generated::NativeColor>::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
@@ -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<NativeExtendedRecord>::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
@@ -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<NativeExternRecordWithDerivings>::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
@@ -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<NativeMapDateRecord>::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
@@ -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<NativeMapListRecord>::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
@@ -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<NativeMapRecord>::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
@@ -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<NativeNestedCollection>::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
@@ -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<NativeNestedOutcome>::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