From 64a9d3aa85347c0774c12a31f3d4c80747197f23 Mon Sep 17 00:00:00 2001
From: Kenny Kaye <kenny.kaye@greatcall.com>
Date: Wed, 13 Jul 2016 15:27:44 -0700
Subject: [PATCH 01/56] Support --idl-include-path argument to configure
 include paths

---
 example/run_djinni.sh                                    | 4 +++-
 src/.idea/runConfigurations/djinni_Main__Test_Suite_.xml | 4 ++--
 src/source/Main.scala                                    | 3 +++
 test-suite/run_djinni.sh                                 | 1 +
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/example/run_djinni.sh b/example/run_djinni.sh
index 61a4e4b04..90f4de362 100755
--- a/example/run_djinni.sh
+++ b/example/run_djinni.sh
@@ -69,7 +69,9 @@ fi
 	--objcpp-out "$temp_out/objc" \
     --objc-type-prefix TXS \
     \
-    --idl "$in"
+    --idl "$in" \
+    --idl-include-path "../../" \
+    --idl-include-path "path/to/idl"
 
 # Copy changes from "$temp_output" to final dir.
 
diff --git a/src/.idea/runConfigurations/djinni_Main__Test_Suite_.xml b/src/.idea/runConfigurations/djinni_Main__Test_Suite_.xml
index f61b4c46f..f050cc558 100644
--- a/src/.idea/runConfigurations/djinni_Main__Test_Suite_.xml
+++ b/src/.idea/runConfigurations/djinni_Main__Test_Suite_.xml
@@ -8,10 +8,10 @@
     </extension>
     <option name="MAIN_CLASS_NAME" value="djinni.Main" />
     <option name="VM_PARAMETERS" value="" />
-    <option name="PROGRAM_PARAMETERS" value="--java-out djinni-output-temp/java --java-package com.dropbox.djinni.test --java-nullable-annotation &quot;javax.annotation.CheckForNull&quot; --java-nonnull-annotation &quot;javax.annotation.Nonnull&quot; --ident-java-field mFooBar --cpp-out djinni-output-temp/cpp --cpp-namespace testsuite --ident-cpp-enum-type foo_bar --cpp-optional-template &quot;std::experimental::optional&quot; --cpp-optional-header &quot;&lt;experimental/optional&gt;&quot; --jni-out djinni-output-temp/jni --ident-jni-class NativeFooBar --ident-jni-file NativeFooBar --objc-out djinni-output-temp/objc --objcpp-out djinni-output-temp/objc --objc-type-prefix DB --list-in-files generated-src/inFileList.txt --list-out-files generated-src/outFileList.txt --yaml-out djinni-output-temp/yaml --yaml-out-file &quot;yaml-test.yaml&quot; --yaml-prefix &quot;test_&quot; --idl djinni/all.djinni" />
+    <option name="PROGRAM_PARAMETERS" value="--java-out djinni-output-temp/java --java-package com.dropbox.djinni.test --java-nullable-annotation &quot;javax.annotation.CheckForNull&quot; --java-nonnull-annotation &quot;javax.annotation.Nonnull&quot; --ident-java-field mFooBar --cpp-out djinni-output-temp/cpp --cpp-namespace testsuite --ident-cpp-enum-type foo_bar --cpp-optional-template &quot;std::experimental::optional&quot; --cpp-optional-header &quot;&lt;experimental/optional&gt;&quot; --jni-out djinni-output-temp/jni --ident-jni-class NativeFooBar --ident-jni-file NativeFooBar --objc-out djinni-output-temp/objc --objcpp-out djinni-output-temp/objc --objc-type-prefix DB --list-in-files generated-src/inFileList.txt --list-out-files generated-src/outFileList.txt --yaml-out djinni-output-temp/yaml --yaml-out-file &quot;yaml-test.yaml&quot; --yaml-prefix &quot;test_&quot; --idl djinni/all.djinni --idl-include-path djinni/vendor" />
     <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/../test-suite" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" value="" />
+    <option name="ALTERNATIVE_JRE_PATH" />
     <option name="ENABLE_SWING_INSPECTOR" value="false" />
     <option name="ENV_VARIABLES" />
     <option name="PASS_PARENT_ENVS" value="true" />
diff --git a/src/source/Main.scala b/src/source/Main.scala
index 07ab15810..0d7a189d9 100644
--- a/src/source/Main.scala
+++ b/src/source/Main.scala
@@ -24,6 +24,7 @@ object Main {
 
   def main(args: Array[String]) {
     var idlFile: File = null
+    var idlIncludePaths: List[String] = List(".")
     var cppOutFolder: Option[File] = None
     var cppNamespace: String = ""
     var cppIncludePrefix: String = ""
@@ -93,6 +94,8 @@ object Main {
       help("help")
       opt[File]("idl").valueName("<in-file>").required().foreach(idlFile = _)
         .text("The IDL file with the type definitions, typically with extension \".djinni\".")
+      opt[String]("idl-include-path").valueName("<path> ...").optional().unbounded().foreach(x => idlIncludePaths = idlIncludePaths :+ x)
+        .text("An include path to search for Djinni @import directives. Can specify multiple paths.")
       note("")
       opt[File]("java-out").valueName("<out-folder>").foreach(x => javaOutFolder = Some(x))
         .text("The output for the Java files (Generator disabled if unspecified).")
diff --git a/test-suite/run_djinni.sh b/test-suite/run_djinni.sh
index 89ef14051..7a578898a 100755
--- a/test-suite/run_djinni.sh
+++ b/test-suite/run_djinni.sh
@@ -90,6 +90,7 @@ fi
     --yaml-prefix "test_" \
     \
     --idl "$in_relative" \
+    --idl-include-path "./djinni/vendor" \
 )
 
 # Make sure we can parse back our own generated YAML file

From 1ee7a5547df05115a22db441ade48dc69aa9a0dc Mon Sep 17 00:00:00 2001
From: Kenny Kaye <kenny.kaye@greatcall.com>
Date: Wed, 13 Jul 2016 15:31:48 -0700
Subject: [PATCH 02/56] Resolve import and extern based on include provided
 include path

---
 src/source/Main.scala                         |  6 +--
 src/source/parser.scala                       | 45 +++++++++++++------
 test-suite/djinni/all.djinni                  |  2 +-
 .../{ => vendor/third-party}/duration.djinni  |  0
 .../{ => vendor/third-party}/duration.yaml    |  0
 test-suite/generated-src/inFileList.txt       |  4 +-
 6 files changed, 38 insertions(+), 19 deletions(-)
 rename test-suite/djinni/{ => vendor/third-party}/duration.djinni (100%)
 rename test-suite/djinni/{ => vendor/third-party}/duration.yaml (100%)

diff --git a/src/source/Main.scala b/src/source/Main.scala
index 0d7a189d9..b40b1857b 100644
--- a/src/source/Main.scala
+++ b/src/source/Main.scala
@@ -16,7 +16,7 @@
 
 package djinni
 
-import java.io.{IOException, FileInputStream, InputStreamReader, File, BufferedWriter, FileWriter}
+import java.io.{IOException, FileNotFoundException, FileInputStream, InputStreamReader, File, BufferedWriter, FileWriter}
 
 import djinni.generatorTools._
 
@@ -244,10 +244,10 @@ object Main {
       None
     }
     val idl = try {
-      (new Parser).parseFile(idlFile, inFileListWriter)
+      (new Parser(idlIncludePaths)).parseFile(idlFile, inFileListWriter)
     }
     catch {
-      case ex: IOException =>
+      case ex @ (_: FileNotFoundException | _: IOException) =>
         System.err.println("Error reading from --idl file: " + ex.getMessage)
         System.exit(1); return
     }
diff --git a/src/source/parser.scala b/src/source/parser.scala
index 0b1c6cea5..ccddea57e 100644
--- a/src/source/parser.scala
+++ b/src/source/parser.scala
@@ -16,7 +16,7 @@
 
 package djinni
 
-import java.io.{File, InputStreamReader, FileInputStream, Writer}
+import java.io.{File, FileNotFoundException, InputStreamReader, FileInputStream, Writer}
 
 import djinni.ast.Interface.Method
 import djinni.ast.Record.DerivingType.DerivingType
@@ -29,7 +29,7 @@ import scala.collection.mutable
 import scala.util.parsing.combinator.RegexParsers
 import scala.util.parsing.input.{Position, Positional}
 
-case class Parser() {
+case class Parser(includePaths: List[String]) {
 
 val visitedFiles = mutable.Set[File]()
 val fileStack = mutable.Stack[File]()
@@ -37,23 +37,42 @@ val fileStack = mutable.Stack[File]()
 private object IdlParser extends RegexParsers {
   override protected val whiteSpace = """[ \t\n\r]+""".r
 
-  def idlFile(origin: String): Parser[IdlFile] = rep(importFile) ~ rep(typeDecl(origin)) ^^ { case imp~types => IdlFile(imp, types) }
-
-  def importFile: Parser[FileRef] = {
-    
-	def fileParent:String = if (fileStack.top.getParent() != null) return fileStack.top.getParent() + "/" else return ""
+  def idlFile(origin: String): Parser[IdlFile] = rep(importFileRef) ~ rep(typeDecl(origin)) ^^ { case imp~types => IdlFile(imp, types) }
 
+  def importFileRef(): Parser[FileRef] = {
     ("@" ~> directive) ~ ("\"" ~> filePath <~ "\"") ^^ {
-      case "import" ~ x =>
-        val newPath = fileParent + x
-        new IdlFileRef(new File(newPath))
-      case "extern" ~ x =>
-        val newPath = fileParent + x
-        new ExternFileRef(new File(newPath))
+      case "import" ~ x => {
+        new IdlFileRef(importFile(x))
+      }
+      case "extern" ~ x => {
+        new ExternFileRef(importFile(x))
+      }
     }
   }
+
+  def importFile(fileName: String): File = {
+    var file: Option[File] = None
+
+    includePaths.foreach(path => {
+      if (file.isEmpty) {
+        var relPath = if (path == ".") fileParent else path + "/"
+        val tmp = new File(relPath + fileName);
+        if (tmp.exists)
+          file = Some(tmp)
+      }
+    })
+
+    if (file.isEmpty) throw new FileNotFoundException("Unable to find file \"" + fileName + "\" at " + fileStack.top.getCanonicalPath)
+
+    return file.get
+  }
+
   def filePath = "[^\"]*".r
 
+  def fileParent(): String = {
+    if (fileStack.top.getParent() != null) fileStack.top.getParent() + "/" else ""
+  }
+
   def directive = importDirective | externDirective
   def importDirective = "import".r
   def externDirective = "extern".r
diff --git a/test-suite/djinni/all.djinni b/test-suite/djinni/all.djinni
index 4ce80dc12..53c649cce 100644
--- a/test-suite/djinni/all.djinni
+++ b/test-suite/djinni/all.djinni
@@ -1,4 +1,4 @@
 @import "common.djinni"
 
 @import "date.djinni"
-@import "duration.djinni"
+@import "third-party/duration.djinni"
diff --git a/test-suite/djinni/duration.djinni b/test-suite/djinni/vendor/third-party/duration.djinni
similarity index 100%
rename from test-suite/djinni/duration.djinni
rename to test-suite/djinni/vendor/third-party/duration.djinni
diff --git a/test-suite/djinni/duration.yaml b/test-suite/djinni/vendor/third-party/duration.yaml
similarity index 100%
rename from test-suite/djinni/duration.yaml
rename to test-suite/djinni/vendor/third-party/duration.yaml
diff --git a/test-suite/generated-src/inFileList.txt b/test-suite/generated-src/inFileList.txt
index 6cd5682fe..16327aee2 100644
--- a/test-suite/generated-src/inFileList.txt
+++ b/test-suite/generated-src/inFileList.txt
@@ -17,5 +17,5 @@ djinni/single_language_interfaces.djinni
 djinni/extended_record.djinni
 djinni/date.djinni
 djinni/date.yaml
-djinni/duration.djinni
-djinni/duration.yaml
+./djinni/vendor/third-party/duration.djinni
+./djinni/vendor/third-party/duration.yaml

From 6c869e1f6ea7b2c48395268ee12f12015aa7d1d0 Mon Sep 17 00:00:00 2001
From: Andrew Twyman <atwyman@dropbox.com>
Date: Tue, 9 Aug 2016 20:23:30 -0700
Subject: [PATCH 03/56] Fix use of extended record include prefix

---
 src/source/CppMarshal.scala                   | 23 ++++---
 test-suite/djinni/extended_record.djinni      | 13 +++-
 .../cpp/interface_using_extended_record.cpp   | 14 ++++
 .../cpp/interface_using_extended_record.hpp   | 20 ++++++
 .../cpp/record_using_extended_record.cpp      | 12 ++++
 .../cpp/record_using_extended_record.hpp      | 21 ++++++
 .../test/InterfaceUsingExtendedRecord.java    | 50 ++++++++++++++
 .../test/RecordUsingExtendedRecord.java       | 36 ++++++++++
 .../NativeInterfaceUsingExtendedRecord.cpp    | 33 +++++++++
 .../NativeInterfaceUsingExtendedRecord.hpp    | 32 +++++++++
 .../jni/NativeRecordUsingExtendedRecord.cpp   | 28 ++++++++
 .../jni/NativeRecordUsingExtendedRecord.hpp   | 32 +++++++++
 .../DBInterfaceUsingExtendedRecord+Private.h  | 31 +++++++++
 .../DBInterfaceUsingExtendedRecord+Private.mm | 68 +++++++++++++++++++
 .../objc/DBInterfaceUsingExtendedRecord.h     | 14 ++++
 .../objc/DBInterfaceUsingExtendedRecord.mm    |  5 ++
 .../DBRecordUsingExtendedRecord+Private.h     | 24 +++++++
 .../DBRecordUsingExtendedRecord+Private.mm    | 21 ++++++
 .../objc/DBRecordUsingExtendedRecord.h        | 16 +++++
 .../objc/DBRecordUsingExtendedRecord.mm       | 33 +++++++++
 test-suite/generated-src/outFileList.txt      | 18 +++++
 .../handwritten-src/cpp/extended_record.cpp   |  8 +--
 .../DjinniObjcTest.xcodeproj/project.pbxproj  | 36 ++++++++++
 23 files changed, 572 insertions(+), 16 deletions(-)
 create mode 100644 test-suite/generated-src/cpp/interface_using_extended_record.cpp
 create mode 100644 test-suite/generated-src/cpp/interface_using_extended_record.hpp
 create mode 100644 test-suite/generated-src/cpp/record_using_extended_record.cpp
 create mode 100644 test-suite/generated-src/cpp/record_using_extended_record.hpp
 create mode 100644 test-suite/generated-src/java/com/dropbox/djinni/test/InterfaceUsingExtendedRecord.java
 create mode 100644 test-suite/generated-src/java/com/dropbox/djinni/test/RecordUsingExtendedRecord.java
 create mode 100644 test-suite/generated-src/jni/NativeInterfaceUsingExtendedRecord.cpp
 create mode 100644 test-suite/generated-src/jni/NativeInterfaceUsingExtendedRecord.hpp
 create mode 100644 test-suite/generated-src/jni/NativeRecordUsingExtendedRecord.cpp
 create mode 100644 test-suite/generated-src/jni/NativeRecordUsingExtendedRecord.hpp
 create mode 100644 test-suite/generated-src/objc/DBInterfaceUsingExtendedRecord+Private.h
 create mode 100644 test-suite/generated-src/objc/DBInterfaceUsingExtendedRecord+Private.mm
 create mode 100644 test-suite/generated-src/objc/DBInterfaceUsingExtendedRecord.h
 create mode 100644 test-suite/generated-src/objc/DBInterfaceUsingExtendedRecord.mm
 create mode 100644 test-suite/generated-src/objc/DBRecordUsingExtendedRecord+Private.h
 create mode 100644 test-suite/generated-src/objc/DBRecordUsingExtendedRecord+Private.mm
 create mode 100644 test-suite/generated-src/objc/DBRecordUsingExtendedRecord.h
 create mode 100644 test-suite/generated-src/objc/DBRecordUsingExtendedRecord.mm

diff --git a/src/source/CppMarshal.scala b/src/source/CppMarshal.scala
index fd991fa2d..2279c00b5 100644
--- a/src/source/CppMarshal.scala
+++ b/src/source/CppMarshal.scala
@@ -59,18 +59,18 @@ class CppMarshal(spec: Spec) extends Marshal(spec) {
     case MList => List(ImportRef("<vector>"))
     case MSet => List(ImportRef("<unordered_set>"))
     case MMap => List(ImportRef("<unordered_map>"))
-    case d: MDef => d.defType match {
-      case DRecord =>
+    case d: MDef => d.body match {
+      case r: Record =>
         if (d.name != exclude) {
           if (forwardDeclareOnly) {
             List(DeclRef(s"struct ${typename(d.name, d.body)};", Some(spec.cppNamespace)))
           } else {
-            List(ImportRef(include(d.name)))
+            List(ImportRef(include(d.name, r.ext.cpp)))
           }
         } else {
           List()
         }
-      case DEnum =>
+      case e: Enum =>
         if (d.name != exclude) {
           if (forwardDeclareOnly) {
             List(DeclRef(s"enum class ${typename(d.name, d.body)};", Some(spec.cppNamespace)))
@@ -80,7 +80,7 @@ class CppMarshal(spec: Spec) extends Marshal(spec) {
         } else {
           List()
         }
-      case DInterface =>
+      case i: Interface =>
         val base = if (d.name != exclude) {
           List(ImportRef("<memory>"), DeclRef(s"class ${typename(d.name, d.body)};", Some(spec.cppNamespace)))
         } else {
@@ -106,14 +106,14 @@ class CppMarshal(spec: Spec) extends Marshal(spec) {
       List()
     } else {
       m match {
-        case d: MDef => d.defType match {
-          case DRecord =>
+        case d: MDef => d.body match {
+          case r: Record =>
             if (d.name != exclude) {
-              List(ImportRef(include(d.name)))
+              List(ImportRef(include(d.name, r.ext.cpp)))
             } else {
               List()
             }
-          case DEnum =>
+          case e: Enum =>
             if (d.name != exclude) {
               List(ImportRef(include(d.name)))
             } else {
@@ -126,7 +126,10 @@ class CppMarshal(spec: Spec) extends Marshal(spec) {
     }
   }
 
-  def include(ident: String): String = q(spec.cppIncludePrefix + spec.cppFileIdentStyle(ident) + "." + spec.cppHeaderExt)
+  def include(ident: String, isExtendedRecord: Boolean = false): String = {
+    val prefix = if (isExtendedRecord) spec.cppExtendedRecordIncludePrefix else spec.cppIncludePrefix
+    q(prefix + spec.cppFileIdentStyle (ident) + "." + spec.cppHeaderExt)
+  }
 
   private def toCppType(ty: TypeRef, namespace: Option[String] = None, scopeSymbols: Seq[String] = Seq()): String =
     toCppType(ty.resolved, namespace, scopeSymbols)
diff --git a/test-suite/djinni/extended_record.djinni b/test-suite/djinni/extended_record.djinni
index 2647713a6..4ccd7b031 100644
--- a/test-suite/djinni/extended_record.djinni
+++ b/test-suite/djinni/extended_record.djinni
@@ -1,6 +1,15 @@
-
 # Extended record
 extended_record = record +c {
     foo: bool;
-    const extended_record_const: extended_record = {foo=true};
+    const extended_record_const: extended_record = { foo = true };
+}
+
+record_using_extended_record = record {
+    er: extended_record;
+    const cr: record_using_extended_record = {er = { foo = false } };
+}
+
+interface_using_extended_record = interface +c {
+    meth(er: extended_record): extended_record;
+    const cr: record_using_extended_record = {er = { foo = false } };
 }
diff --git a/test-suite/generated-src/cpp/interface_using_extended_record.cpp b/test-suite/generated-src/cpp/interface_using_extended_record.cpp
new file mode 100644
index 000000000..56d8bee71
--- /dev/null
+++ b/test-suite/generated-src/cpp/interface_using_extended_record.cpp
@@ -0,0 +1,14 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from extended_record.djinni
+
+#include "interface_using_extended_record.hpp"  // my header
+#include "../../handwritten-src/cpp/extended_record.hpp"
+#include "record_using_extended_record.hpp"
+
+namespace testsuite {
+
+RecordUsingExtendedRecord const InterfaceUsingExtendedRecord::CR = RecordUsingExtendedRecord(
+    ExtendedRecord(
+        false /* foo */ ) /* er */ );
+
+}  // namespace testsuite
diff --git a/test-suite/generated-src/cpp/interface_using_extended_record.hpp b/test-suite/generated-src/cpp/interface_using_extended_record.hpp
new file mode 100644
index 000000000..043d23ef2
--- /dev/null
+++ b/test-suite/generated-src/cpp/interface_using_extended_record.hpp
@@ -0,0 +1,20 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from extended_record.djinni
+
+#pragma once
+
+namespace testsuite {
+
+struct ExtendedRecord;
+struct RecordUsingExtendedRecord;
+
+class InterfaceUsingExtendedRecord {
+public:
+    virtual ~InterfaceUsingExtendedRecord() {}
+
+    static RecordUsingExtendedRecord const CR;
+
+    virtual ExtendedRecord meth(const ExtendedRecord & er) = 0;
+};
+
+}  // namespace testsuite
diff --git a/test-suite/generated-src/cpp/record_using_extended_record.cpp b/test-suite/generated-src/cpp/record_using_extended_record.cpp
new file mode 100644
index 000000000..a1e8ea524
--- /dev/null
+++ b/test-suite/generated-src/cpp/record_using_extended_record.cpp
@@ -0,0 +1,12 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from extended_record.djinni
+
+#include "record_using_extended_record.hpp"  // my header
+
+namespace testsuite {
+
+RecordUsingExtendedRecord const RecordUsingExtendedRecord::CR = RecordUsingExtendedRecord(
+    ExtendedRecord(
+        false /* foo */ ) /* er */ );
+
+}  // namespace testsuite
diff --git a/test-suite/generated-src/cpp/record_using_extended_record.hpp b/test-suite/generated-src/cpp/record_using_extended_record.hpp
new file mode 100644
index 000000000..fb9b35ff4
--- /dev/null
+++ b/test-suite/generated-src/cpp/record_using_extended_record.hpp
@@ -0,0 +1,21 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from extended_record.djinni
+
+#pragma once
+
+#include "../../handwritten-src/cpp/extended_record.hpp"
+#include <utility>
+
+namespace testsuite {
+
+struct RecordUsingExtendedRecord final {
+
+    static RecordUsingExtendedRecord const CR;
+    ExtendedRecord er;
+
+    RecordUsingExtendedRecord(ExtendedRecord er_)
+    : er(std::move(er_))
+    {}
+};
+
+}  // namespace testsuite
diff --git a/test-suite/generated-src/java/com/dropbox/djinni/test/InterfaceUsingExtendedRecord.java b/test-suite/generated-src/java/com/dropbox/djinni/test/InterfaceUsingExtendedRecord.java
new file mode 100644
index 000000000..682ae0cd5
--- /dev/null
+++ b/test-suite/generated-src/java/com/dropbox/djinni/test/InterfaceUsingExtendedRecord.java
@@ -0,0 +1,50 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from extended_record.djinni
+
+package com.dropbox.djinni.test;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
+public abstract class InterfaceUsingExtendedRecord {
+    @Nonnull
+    public static final RecordUsingExtendedRecord CR = new RecordUsingExtendedRecord(
+        new ExtendedRecord(
+            false /* mFoo */ ) /* mEr */ );
+
+    @Nonnull
+    public abstract ExtendedRecord meth(@Nonnull ExtendedRecord er);
+
+    private static final class CppProxy extends InterfaceUsingExtendedRecord
+    {
+        private final long nativeRef;
+        private final AtomicBoolean destroyed = new AtomicBoolean(false);
+
+        private CppProxy(long nativeRef)
+        {
+            if (nativeRef == 0) throw new RuntimeException("nativeRef is zero");
+            this.nativeRef = nativeRef;
+        }
+
+        private native void nativeDestroy(long nativeRef);
+        public void destroy()
+        {
+            boolean destroyed = this.destroyed.getAndSet(true);
+            if (!destroyed) nativeDestroy(this.nativeRef);
+        }
+        protected void finalize() throws java.lang.Throwable
+        {
+            destroy();
+            super.finalize();
+        }
+
+        @Override
+        public ExtendedRecord meth(ExtendedRecord er)
+        {
+            assert !this.destroyed.get() : "trying to use a destroyed object";
+            return native_meth(this.nativeRef, er);
+        }
+        private native ExtendedRecord native_meth(long _nativeRef, ExtendedRecord er);
+    }
+}
diff --git a/test-suite/generated-src/java/com/dropbox/djinni/test/RecordUsingExtendedRecord.java b/test-suite/generated-src/java/com/dropbox/djinni/test/RecordUsingExtendedRecord.java
new file mode 100644
index 000000000..e313bf7af
--- /dev/null
+++ b/test-suite/generated-src/java/com/dropbox/djinni/test/RecordUsingExtendedRecord.java
@@ -0,0 +1,36 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from extended_record.djinni
+
+package com.dropbox.djinni.test;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
+public class RecordUsingExtendedRecord {
+
+    @Nonnull
+    public static final RecordUsingExtendedRecord CR = new RecordUsingExtendedRecord(
+        new ExtendedRecord(
+            false /* mFoo */ ) /* mEr */ );
+
+
+    /*package*/ final ExtendedRecord mEr;
+
+    public RecordUsingExtendedRecord(
+            @Nonnull ExtendedRecord er) {
+        this.mEr = er;
+    }
+
+    @Nonnull
+    public ExtendedRecord getEr() {
+        return mEr;
+    }
+
+    @Override
+    public String toString() {
+        return "RecordUsingExtendedRecord{" +
+                "mEr=" + mEr +
+        "}";
+    }
+
+}
diff --git a/test-suite/generated-src/jni/NativeInterfaceUsingExtendedRecord.cpp b/test-suite/generated-src/jni/NativeInterfaceUsingExtendedRecord.cpp
new file mode 100644
index 000000000..2a3620f08
--- /dev/null
+++ b/test-suite/generated-src/jni/NativeInterfaceUsingExtendedRecord.cpp
@@ -0,0 +1,33 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from extended_record.djinni
+
+#include "NativeInterfaceUsingExtendedRecord.hpp"  // my header
+#include "NativeExtendedRecord.hpp"
+#include "NativeRecordUsingExtendedRecord.hpp"
+
+namespace djinni_generated {
+
+NativeInterfaceUsingExtendedRecord::NativeInterfaceUsingExtendedRecord() : ::djinni::JniInterface<::testsuite::InterfaceUsingExtendedRecord, NativeInterfaceUsingExtendedRecord>("com/dropbox/djinni/test/InterfaceUsingExtendedRecord$CppProxy") {}
+
+NativeInterfaceUsingExtendedRecord::~NativeInterfaceUsingExtendedRecord() = default;
+
+
+CJNIEXPORT void JNICALL Java_com_dropbox_djinni_test_InterfaceUsingExtendedRecord_00024CppProxy_nativeDestroy(JNIEnv* jniEnv, jobject /*this*/, jlong nativeRef)
+{
+    try {
+        DJINNI_FUNCTION_PROLOGUE1(jniEnv, nativeRef);
+        delete reinterpret_cast<::djinni::CppProxyHandle<::testsuite::InterfaceUsingExtendedRecord>*>(nativeRef);
+    } JNI_TRANSLATE_EXCEPTIONS_RETURN(jniEnv, )
+}
+
+CJNIEXPORT jobject JNICALL Java_com_dropbox_djinni_test_InterfaceUsingExtendedRecord_00024CppProxy_native_1meth(JNIEnv* jniEnv, jobject /*this*/, jlong nativeRef, jobject j_er)
+{
+    try {
+        DJINNI_FUNCTION_PROLOGUE1(jniEnv, nativeRef);
+        const auto& ref = ::djinni::objectFromHandleAddress<::testsuite::InterfaceUsingExtendedRecord>(nativeRef);
+        auto r = ref->meth(::djinni_generated::NativeExtendedRecord::toCpp(jniEnv, j_er));
+        return ::djinni::release(::djinni_generated::NativeExtendedRecord::fromCpp(jniEnv, r));
+    } JNI_TRANSLATE_EXCEPTIONS_RETURN(jniEnv, 0 /* value doesn't matter */)
+}
+
+}  // namespace djinni_generated
diff --git a/test-suite/generated-src/jni/NativeInterfaceUsingExtendedRecord.hpp b/test-suite/generated-src/jni/NativeInterfaceUsingExtendedRecord.hpp
new file mode 100644
index 000000000..dc20f6f82
--- /dev/null
+++ b/test-suite/generated-src/jni/NativeInterfaceUsingExtendedRecord.hpp
@@ -0,0 +1,32 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from extended_record.djinni
+
+#pragma once
+
+#include "djinni_support.hpp"
+#include "interface_using_extended_record.hpp"
+
+namespace djinni_generated {
+
+class NativeInterfaceUsingExtendedRecord final : ::djinni::JniInterface<::testsuite::InterfaceUsingExtendedRecord, NativeInterfaceUsingExtendedRecord> {
+public:
+    using CppType = std::shared_ptr<::testsuite::InterfaceUsingExtendedRecord>;
+    using CppOptType = std::shared_ptr<::testsuite::InterfaceUsingExtendedRecord>;
+    using JniType = jobject;
+
+    using Boxed = NativeInterfaceUsingExtendedRecord;
+
+    ~NativeInterfaceUsingExtendedRecord();
+
+    static CppType toCpp(JNIEnv* jniEnv, JniType j) { return ::djinni::JniClass<NativeInterfaceUsingExtendedRecord>::get()._fromJava(jniEnv, j); }
+    static ::djinni::LocalRef<JniType> fromCppOpt(JNIEnv* jniEnv, const CppOptType& c) { return {jniEnv, ::djinni::JniClass<NativeInterfaceUsingExtendedRecord>::get()._toJava(jniEnv, c)}; }
+    static ::djinni::LocalRef<JniType> fromCpp(JNIEnv* jniEnv, const CppType& c) { return fromCppOpt(jniEnv, c); }
+
+private:
+    NativeInterfaceUsingExtendedRecord();
+    friend ::djinni::JniClass<NativeInterfaceUsingExtendedRecord>;
+    friend ::djinni::JniInterface<::testsuite::InterfaceUsingExtendedRecord, NativeInterfaceUsingExtendedRecord>;
+
+};
+
+}  // namespace djinni_generated
diff --git a/test-suite/generated-src/jni/NativeRecordUsingExtendedRecord.cpp b/test-suite/generated-src/jni/NativeRecordUsingExtendedRecord.cpp
new file mode 100644
index 000000000..05713778b
--- /dev/null
+++ b/test-suite/generated-src/jni/NativeRecordUsingExtendedRecord.cpp
@@ -0,0 +1,28 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from extended_record.djinni
+
+#include "NativeRecordUsingExtendedRecord.hpp"  // my header
+#include "NativeExtendedRecord.hpp"
+
+namespace djinni_generated {
+
+NativeRecordUsingExtendedRecord::NativeRecordUsingExtendedRecord() = default;
+
+NativeRecordUsingExtendedRecord::~NativeRecordUsingExtendedRecord() = default;
+
+auto NativeRecordUsingExtendedRecord::fromCpp(JNIEnv* jniEnv, const CppType& c) -> ::djinni::LocalRef<JniType> {
+    const auto& data = ::djinni::JniClass<NativeRecordUsingExtendedRecord>::get();
+    auto r = ::djinni::LocalRef<JniType>{jniEnv->NewObject(data.clazz.get(), data.jconstructor,
+                                                           ::djinni::get(::djinni_generated::NativeExtendedRecord::fromCpp(jniEnv, c.er)))};
+    ::djinni::jniExceptionCheck(jniEnv);
+    return r;
+}
+
+auto NativeRecordUsingExtendedRecord::toCpp(JNIEnv* jniEnv, JniType j) -> CppType {
+    ::djinni::JniLocalScope jscope(jniEnv, 2);
+    assert(j != nullptr);
+    const auto& data = ::djinni::JniClass<NativeRecordUsingExtendedRecord>::get();
+    return {::djinni_generated::NativeExtendedRecord::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mEr))};
+}
+
+}  // namespace djinni_generated
diff --git a/test-suite/generated-src/jni/NativeRecordUsingExtendedRecord.hpp b/test-suite/generated-src/jni/NativeRecordUsingExtendedRecord.hpp
new file mode 100644
index 000000000..d295f5cb0
--- /dev/null
+++ b/test-suite/generated-src/jni/NativeRecordUsingExtendedRecord.hpp
@@ -0,0 +1,32 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from extended_record.djinni
+
+#pragma once
+
+#include "djinni_support.hpp"
+#include "record_using_extended_record.hpp"
+
+namespace djinni_generated {
+
+class NativeRecordUsingExtendedRecord final {
+public:
+    using CppType = ::testsuite::RecordUsingExtendedRecord;
+    using JniType = jobject;
+
+    using Boxed = NativeRecordUsingExtendedRecord;
+
+    ~NativeRecordUsingExtendedRecord();
+
+    static CppType toCpp(JNIEnv* jniEnv, JniType j);
+    static ::djinni::LocalRef<JniType> fromCpp(JNIEnv* jniEnv, const CppType& c);
+
+private:
+    NativeRecordUsingExtendedRecord();
+    friend ::djinni::JniClass<NativeRecordUsingExtendedRecord>;
+
+    const ::djinni::GlobalRef<jclass> clazz { ::djinni::jniFindClass("com/dropbox/djinni/test/RecordUsingExtendedRecord") };
+    const jmethodID jconstructor { ::djinni::jniGetMethodID(clazz.get(), "<init>", "(Lcom/dropbox/djinni/test/ExtendedRecord;)V") };
+    const jfieldID field_mEr { ::djinni::jniGetFieldID(clazz.get(), "mEr", "Lcom/dropbox/djinni/test/ExtendedRecord;") };
+};
+
+}  // namespace djinni_generated
diff --git a/test-suite/generated-src/objc/DBInterfaceUsingExtendedRecord+Private.h b/test-suite/generated-src/objc/DBInterfaceUsingExtendedRecord+Private.h
new file mode 100644
index 000000000..4153b353c
--- /dev/null
+++ b/test-suite/generated-src/objc/DBInterfaceUsingExtendedRecord+Private.h
@@ -0,0 +1,31 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from extended_record.djinni
+
+#include "interface_using_extended_record.hpp"
+#include <memory>
+
+static_assert(__has_feature(objc_arc), "Djinni requires ARC to be enabled for this file");
+
+@class DBInterfaceUsingExtendedRecord;
+
+namespace djinni_generated {
+
+class InterfaceUsingExtendedRecord
+{
+public:
+    using CppType = std::shared_ptr<::testsuite::InterfaceUsingExtendedRecord>;
+    using CppOptType = std::shared_ptr<::testsuite::InterfaceUsingExtendedRecord>;
+    using ObjcType = DBInterfaceUsingExtendedRecord*;
+
+    using Boxed = InterfaceUsingExtendedRecord;
+
+    static CppType toCpp(ObjcType objc);
+    static ObjcType fromCppOpt(const CppOptType& cpp);
+    static ObjcType fromCpp(const CppType& cpp) { return fromCppOpt(cpp); }
+
+private:
+    class ObjcProxy;
+};
+
+}  // namespace djinni_generated
+
diff --git a/test-suite/generated-src/objc/DBInterfaceUsingExtendedRecord+Private.mm b/test-suite/generated-src/objc/DBInterfaceUsingExtendedRecord+Private.mm
new file mode 100644
index 000000000..20048f849
--- /dev/null
+++ b/test-suite/generated-src/objc/DBInterfaceUsingExtendedRecord+Private.mm
@@ -0,0 +1,68 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from extended_record.djinni
+
+#import "DBInterfaceUsingExtendedRecord+Private.h"
+#import "DBInterfaceUsingExtendedRecord.h"
+#import "DBExtendedRecord+Private.h"
+#import "DBRecordUsingExtendedRecord+Private.h"
+#import "DJICppWrapperCache+Private.h"
+#import "DJIError.h"
+#include <exception>
+#include <stdexcept>
+#include <utility>
+
+static_assert(__has_feature(objc_arc), "Djinni requires ARC to be enabled for this file");
+
+@interface DBInterfaceUsingExtendedRecord ()
+
+- (id)initWithCpp:(const std::shared_ptr<::testsuite::InterfaceUsingExtendedRecord>&)cppRef;
+
+@end
+
+@implementation DBInterfaceUsingExtendedRecord {
+    ::djinni::CppProxyCache::Handle<std::shared_ptr<::testsuite::InterfaceUsingExtendedRecord>> _cppRefHandle;
+}
+
+- (id)initWithCpp:(const std::shared_ptr<::testsuite::InterfaceUsingExtendedRecord>&)cppRef
+{
+    if (self = [super init]) {
+        _cppRefHandle.assign(cppRef);
+    }
+    return self;
+}
+
+- (nonnull DBExtendedRecord *)meth:(nonnull DBExtendedRecord *)er {
+    try {
+        auto objcpp_result_ = _cppRefHandle.get()->meth(::djinni_generated::ExtendedRecord::toCpp(er));
+        return ::djinni_generated::ExtendedRecord::fromCpp(objcpp_result_);
+    } DJINNI_TRANSLATE_EXCEPTIONS()
+}
+
++ (DBRecordUsingExtendedRecord * __nonnull)cr
+{
+    static DBRecordUsingExtendedRecord * const s_cr = [[DBRecordUsingExtendedRecord alloc] initWithEr:[[DBExtendedRecord alloc] initWithFoo:NO]];
+    return s_cr;
+}
+
+
+namespace djinni_generated {
+
+auto InterfaceUsingExtendedRecord::toCpp(ObjcType objc) -> CppType
+{
+    if (!objc) {
+        return nullptr;
+    }
+    return objc->_cppRefHandle.get();
+}
+
+auto InterfaceUsingExtendedRecord::fromCppOpt(const CppOptType& cpp) -> ObjcType
+{
+    if (!cpp) {
+        return nil;
+    }
+    return ::djinni::get_cpp_proxy<DBInterfaceUsingExtendedRecord>(cpp);
+}
+
+}  // namespace djinni_generated
+
+@end
diff --git a/test-suite/generated-src/objc/DBInterfaceUsingExtendedRecord.h b/test-suite/generated-src/objc/DBInterfaceUsingExtendedRecord.h
new file mode 100644
index 000000000..db6d69a2b
--- /dev/null
+++ b/test-suite/generated-src/objc/DBInterfaceUsingExtendedRecord.h
@@ -0,0 +1,14 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from extended_record.djinni
+
+#import "DBExtendedRecord.h"
+#import "DBRecordUsingExtendedRecord.h"
+#import <Foundation/Foundation.h>
+
+
+@interface DBInterfaceUsingExtendedRecord : NSObject
+
+- (nonnull DBExtendedRecord *)meth:(nonnull DBExtendedRecord *)er;
+
++ (DBRecordUsingExtendedRecord * __nonnull)cr;
+@end
diff --git a/test-suite/generated-src/objc/DBInterfaceUsingExtendedRecord.mm b/test-suite/generated-src/objc/DBInterfaceUsingExtendedRecord.mm
new file mode 100644
index 000000000..56cf13802
--- /dev/null
+++ b/test-suite/generated-src/objc/DBInterfaceUsingExtendedRecord.mm
@@ -0,0 +1,5 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from extended_record.djinni
+
+#import "DBInterfaceUsingExtendedRecord.h"
+
diff --git a/test-suite/generated-src/objc/DBRecordUsingExtendedRecord+Private.h b/test-suite/generated-src/objc/DBRecordUsingExtendedRecord+Private.h
new file mode 100644
index 000000000..153a0f343
--- /dev/null
+++ b/test-suite/generated-src/objc/DBRecordUsingExtendedRecord+Private.h
@@ -0,0 +1,24 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from extended_record.djinni
+
+#import "DBRecordUsingExtendedRecord.h"
+#include "record_using_extended_record.hpp"
+
+static_assert(__has_feature(objc_arc), "Djinni requires ARC to be enabled for this file");
+
+@class DBRecordUsingExtendedRecord;
+
+namespace djinni_generated {
+
+struct RecordUsingExtendedRecord
+{
+    using CppType = ::testsuite::RecordUsingExtendedRecord;
+    using ObjcType = DBRecordUsingExtendedRecord*;
+
+    using Boxed = RecordUsingExtendedRecord;
+
+    static CppType toCpp(ObjcType objc);
+    static ObjcType fromCpp(const CppType& cpp);
+};
+
+}  // namespace djinni_generated
diff --git a/test-suite/generated-src/objc/DBRecordUsingExtendedRecord+Private.mm b/test-suite/generated-src/objc/DBRecordUsingExtendedRecord+Private.mm
new file mode 100644
index 000000000..991c855bb
--- /dev/null
+++ b/test-suite/generated-src/objc/DBRecordUsingExtendedRecord+Private.mm
@@ -0,0 +1,21 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from extended_record.djinni
+
+#import "DBRecordUsingExtendedRecord+Private.h"
+#import "DBExtendedRecord+Private.h"
+#include <cassert>
+
+namespace djinni_generated {
+
+auto RecordUsingExtendedRecord::toCpp(ObjcType obj) -> CppType
+{
+    assert(obj);
+    return {::djinni_generated::ExtendedRecord::toCpp(obj.er)};
+}
+
+auto RecordUsingExtendedRecord::fromCpp(const CppType& cpp) -> ObjcType
+{
+    return [[DBRecordUsingExtendedRecord alloc] initWithEr:(::djinni_generated::ExtendedRecord::fromCpp(cpp.er))];
+}
+
+}  // namespace djinni_generated
diff --git a/test-suite/generated-src/objc/DBRecordUsingExtendedRecord.h b/test-suite/generated-src/objc/DBRecordUsingExtendedRecord.h
new file mode 100644
index 000000000..c62deea4a
--- /dev/null
+++ b/test-suite/generated-src/objc/DBRecordUsingExtendedRecord.h
@@ -0,0 +1,16 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from extended_record.djinni
+
+#import "DBExtendedRecord.h"
+#import "DBRecordUsingExtendedRecord.h"
+#import <Foundation/Foundation.h>
+
+@interface DBRecordUsingExtendedRecord : NSObject
+- (nonnull instancetype)initWithEr:(nonnull DBExtendedRecord *)er;
++ (nonnull instancetype)recordUsingExtendedRecordWithEr:(nonnull DBExtendedRecord *)er;
+
++ (DBRecordUsingExtendedRecord * __nonnull)cr;
+@property (nonatomic, readonly, nonnull) DBExtendedRecord * er;
+
+@end
+
diff --git a/test-suite/generated-src/objc/DBRecordUsingExtendedRecord.mm b/test-suite/generated-src/objc/DBRecordUsingExtendedRecord.mm
new file mode 100644
index 000000000..82e3e5e7b
--- /dev/null
+++ b/test-suite/generated-src/objc/DBRecordUsingExtendedRecord.mm
@@ -0,0 +1,33 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from extended_record.djinni
+
+#import "DBRecordUsingExtendedRecord.h"
+
+
+@implementation DBRecordUsingExtendedRecord
+
+- (nonnull instancetype)initWithEr:(nonnull DBExtendedRecord *)er
+{
+    if (self = [super init]) {
+        _er = er;
+    }
+    return self;
+}
+
++ (nonnull instancetype)recordUsingExtendedRecordWithEr:(nonnull DBExtendedRecord *)er
+{
+    return [[self alloc] initWithEr:er];
+}
+
++ (DBRecordUsingExtendedRecord * __nonnull)cr
+{
+    static DBRecordUsingExtendedRecord * const s_cr = [[DBRecordUsingExtendedRecord alloc] initWithEr:[[DBExtendedRecord alloc] initWithFoo:NO]];
+    return s_cr;
+}
+
+- (NSString *)description
+{
+    return [NSString stringWithFormat:@"<%@ %p er:%@>", self.class, (void *)self, self.er];
+}
+
+@end
diff --git a/test-suite/generated-src/outFileList.txt b/test-suite/generated-src/outFileList.txt
index 3f28125dc..0229246a0 100644
--- a/test-suite/generated-src/outFileList.txt
+++ b/test-suite/generated-src/outFileList.txt
@@ -8,6 +8,10 @@ djinni-output-temp/cpp/_varname_record_.hpp
 djinni-output-temp/cpp/_varname_interface_.hpp
 djinni-output-temp/cpp/extended_record_base.hpp
 djinni-output-temp/cpp/extended_record_base.cpp
+djinni-output-temp/cpp/record_using_extended_record.hpp
+djinni-output-temp/cpp/record_using_extended_record.cpp
+djinni-output-temp/cpp/interface_using_extended_record.hpp
+djinni-output-temp/cpp/interface_using_extended_record.cpp
 djinni-output-temp/cpp/objc_only_listener.hpp
 djinni-output-temp/cpp/java_only_listener.hpp
 djinni-output-temp/cpp/uses_single_language_listeners.hpp
@@ -51,6 +55,8 @@ djinni-output-temp/java/MapDateRecord.java
 djinni-output-temp/java/VarnameRecord.java
 djinni-output-temp/java/VarnameInterface.java
 djinni-output-temp/java/ExtendedRecord.java
+djinni-output-temp/java/RecordUsingExtendedRecord.java
+djinni-output-temp/java/InterfaceUsingExtendedRecord.java
 djinni-output-temp/java/ObjcOnlyListener.java
 djinni-output-temp/java/JavaOnlyListener.java
 djinni-output-temp/java/UsesSingleLanguageListeners.java
@@ -96,6 +102,10 @@ djinni-output-temp/jni/NativeVarnameInterface.hpp
 djinni-output-temp/jni/NativeVarnameInterface.cpp
 djinni-output-temp/jni/NativeExtendedRecord.hpp
 djinni-output-temp/jni/NativeExtendedRecord.cpp
+djinni-output-temp/jni/NativeRecordUsingExtendedRecord.hpp
+djinni-output-temp/jni/NativeRecordUsingExtendedRecord.cpp
+djinni-output-temp/jni/NativeInterfaceUsingExtendedRecord.hpp
+djinni-output-temp/jni/NativeInterfaceUsingExtendedRecord.cpp
 djinni-output-temp/jni/NativeObjcOnlyListener.hpp
 djinni-output-temp/jni/NativeObjcOnlyListener.cpp
 djinni-output-temp/jni/NativeJavaOnlyListener.hpp
@@ -169,6 +179,10 @@ djinni-output-temp/objc/DBVarnameRecord.mm
 djinni-output-temp/objc/DBVarnameInterface.h
 djinni-output-temp/objc/DBExtendedRecord.h
 djinni-output-temp/objc/DBExtendedRecord.mm
+djinni-output-temp/objc/DBRecordUsingExtendedRecord.h
+djinni-output-temp/objc/DBRecordUsingExtendedRecord.mm
+djinni-output-temp/objc/DBInterfaceUsingExtendedRecord.h
+djinni-output-temp/objc/DBInterfaceUsingExtendedRecord.mm
 djinni-output-temp/objc/DBObjcOnlyListener.h
 djinni-output-temp/objc/DBJavaOnlyListener.h
 djinni-output-temp/objc/DBUsesSingleLanguageListeners.h
@@ -228,6 +242,10 @@ djinni-output-temp/objc/DBVarnameInterface+Private.h
 djinni-output-temp/objc/DBVarnameInterface+Private.mm
 djinni-output-temp/objc/DBExtendedRecord+Private.h
 djinni-output-temp/objc/DBExtendedRecord+Private.mm
+djinni-output-temp/objc/DBRecordUsingExtendedRecord+Private.h
+djinni-output-temp/objc/DBRecordUsingExtendedRecord+Private.mm
+djinni-output-temp/objc/DBInterfaceUsingExtendedRecord+Private.h
+djinni-output-temp/objc/DBInterfaceUsingExtendedRecord+Private.mm
 djinni-output-temp/objc/DBObjcOnlyListener+Private.h
 djinni-output-temp/objc/DBObjcOnlyListener+Private.mm
 djinni-output-temp/objc/DBJavaOnlyListener+Private.h
diff --git a/test-suite/handwritten-src/cpp/extended_record.cpp b/test-suite/handwritten-src/cpp/extended_record.cpp
index e342e71e2..9bfc93ae8 100644
--- a/test-suite/handwritten-src/cpp/extended_record.cpp
+++ b/test-suite/handwritten-src/cpp/extended_record.cpp
@@ -1,9 +1,9 @@
-
-
 #include "extended_record.hpp"
 
+// Validate these generated headers are compilable.
+#include "record_using_extended_record.hpp"
+#include "interface_using_extended_record.hpp"
+
 using namespace testsuite;
 
 ExtendedRecord::ExtendedRecord() : ExtendedRecordBase(true) {}
-
-
diff --git a/test-suite/objc/DjinniObjcTest.xcodeproj/project.pbxproj b/test-suite/objc/DjinniObjcTest.xcodeproj/project.pbxproj
index d4e54ea11..498d67c09 100644
--- a/test-suite/objc/DjinniObjcTest.xcodeproj/project.pbxproj
+++ b/test-suite/objc/DjinniObjcTest.xcodeproj/project.pbxproj
@@ -76,6 +76,12 @@
 		B52DA56B1B103F75005CE75F /* DBAssortedPrimitives+Private.mm in Sources */ = {isa = PBXBuildFile; fileRef = B52DA5671B103F6D005CE75F /* DBAssortedPrimitives+Private.mm */; };
 		B52DA56E1B103FC5005CE75F /* assorted_primitives.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B52DA56C1B103FBE005CE75F /* assorted_primitives.cpp */; };
 		B52DA5701B104025005CE75F /* DBPrimitivesTests.m in Sources */ = {isa = PBXBuildFile; fileRef = B52DA56F1B104025005CE75F /* DBPrimitivesTests.m */; };
+		B58B16AF1D5AC9BC00EF92B5 /* DBRecordUsingExtendedRecord+Private.mm in Sources */ = {isa = PBXBuildFile; fileRef = B58B16A81D5AC9BC00EF92B5 /* DBRecordUsingExtendedRecord+Private.mm */; };
+		B58B16B01D5AC9BC00EF92B5 /* DBRecordUsingExtendedRecord.mm in Sources */ = {isa = PBXBuildFile; fileRef = B58B16AA1D5AC9BC00EF92B5 /* DBRecordUsingExtendedRecord.mm */; };
+		B58B16B11D5AC9BC00EF92B5 /* DBInterfaceUsingExtendedRecord+Private.mm in Sources */ = {isa = PBXBuildFile; fileRef = B58B16AC1D5AC9BC00EF92B5 /* DBInterfaceUsingExtendedRecord+Private.mm */; };
+		B58B16B41D5AD55B00EF92B5 /* record_using_extended_record.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B58B16B21D5AD55B00EF92B5 /* record_using_extended_record.cpp */; };
+		B58B16B51D5AD55B00EF92B5 /* interface_using_extended_record.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B58B16B31D5AD55B00EF92B5 /* interface_using_extended_record.cpp */; };
+		B58B16B71D5AD56600EF92B5 /* DBInterfaceUsingExtendedRecord.mm in Sources */ = {isa = PBXBuildFile; fileRef = B58B16B61D5AD56600EF92B5 /* DBInterfaceUsingExtendedRecord.mm */; };
 		B5D8FC361C23E2F40045ADCF /* DBConstantRecord.mm in Sources */ = {isa = PBXBuildFile; fileRef = B5D8FC331C23E2F40045ADCF /* DBConstantRecord.mm */; };
 		B5D8FC371C23E2F40045ADCF /* DBConstantRecord+Private.mm in Sources */ = {isa = PBXBuildFile; fileRef = B5D8FC351C23E2F40045ADCF /* DBConstantRecord+Private.mm */; };
 		B5E9C93B1C1F9D9D0073C123 /* reverse_client_interface_impl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5E9C9391C1F9D9D0073C123 /* reverse_client_interface_impl.cpp */; };
@@ -309,6 +315,18 @@
 		B52DA56C1B103FBE005CE75F /* assorted_primitives.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = assorted_primitives.cpp; sourceTree = "<group>"; };
 		B52DA56D1B103FBE005CE75F /* assorted_primitives.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = assorted_primitives.hpp; sourceTree = "<group>"; };
 		B52DA56F1B104025005CE75F /* DBPrimitivesTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DBPrimitivesTests.m; sourceTree = "<group>"; };
+		B58B16A61D5AC9AD00EF92B5 /* record_using_extended_record.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = record_using_extended_record.hpp; sourceTree = "<group>"; };
+		B58B16A71D5AC9AD00EF92B5 /* interface_using_extended_record.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = interface_using_extended_record.hpp; sourceTree = "<group>"; };
+		B58B16A81D5AC9BC00EF92B5 /* DBRecordUsingExtendedRecord+Private.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "DBRecordUsingExtendedRecord+Private.mm"; sourceTree = "<group>"; };
+		B58B16A91D5AC9BC00EF92B5 /* DBRecordUsingExtendedRecord+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "DBRecordUsingExtendedRecord+Private.h"; sourceTree = "<group>"; };
+		B58B16AA1D5AC9BC00EF92B5 /* DBRecordUsingExtendedRecord.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DBRecordUsingExtendedRecord.mm; sourceTree = "<group>"; };
+		B58B16AB1D5AC9BC00EF92B5 /* DBRecordUsingExtendedRecord.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DBRecordUsingExtendedRecord.h; sourceTree = "<group>"; };
+		B58B16AC1D5AC9BC00EF92B5 /* DBInterfaceUsingExtendedRecord+Private.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "DBInterfaceUsingExtendedRecord+Private.mm"; sourceTree = "<group>"; };
+		B58B16AD1D5AC9BC00EF92B5 /* DBInterfaceUsingExtendedRecord+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "DBInterfaceUsingExtendedRecord+Private.h"; sourceTree = "<group>"; };
+		B58B16AE1D5AC9BC00EF92B5 /* DBInterfaceUsingExtendedRecord.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DBInterfaceUsingExtendedRecord.h; sourceTree = "<group>"; };
+		B58B16B21D5AD55B00EF92B5 /* record_using_extended_record.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = record_using_extended_record.cpp; sourceTree = "<group>"; };
+		B58B16B31D5AD55B00EF92B5 /* interface_using_extended_record.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = interface_using_extended_record.cpp; sourceTree = "<group>"; };
+		B58B16B61D5AD56600EF92B5 /* DBInterfaceUsingExtendedRecord.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DBInterfaceUsingExtendedRecord.mm; sourceTree = "<group>"; };
 		B5D8FC321C23E2F40045ADCF /* DBConstantRecord.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DBConstantRecord.h; sourceTree = "<group>"; };
 		B5D8FC331C23E2F40045ADCF /* DBConstantRecord.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DBConstantRecord.mm; sourceTree = "<group>"; };
 		B5D8FC341C23E2F40045ADCF /* DBConstantRecord+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "DBConstantRecord+Private.h"; sourceTree = "<group>"; };
@@ -530,6 +548,14 @@
 		A24249181AF192E0003BF8F0 /* generated-objc */ = {
 			isa = PBXGroup;
 			children = (
+				B58B16B61D5AD56600EF92B5 /* DBInterfaceUsingExtendedRecord.mm */,
+				B58B16A81D5AC9BC00EF92B5 /* DBRecordUsingExtendedRecord+Private.mm */,
+				B58B16A91D5AC9BC00EF92B5 /* DBRecordUsingExtendedRecord+Private.h */,
+				B58B16AA1D5AC9BC00EF92B5 /* DBRecordUsingExtendedRecord.mm */,
+				B58B16AB1D5AC9BC00EF92B5 /* DBRecordUsingExtendedRecord.h */,
+				B58B16AC1D5AC9BC00EF92B5 /* DBInterfaceUsingExtendedRecord+Private.mm */,
+				B58B16AD1D5AC9BC00EF92B5 /* DBInterfaceUsingExtendedRecord+Private.h */,
+				B58B16AE1D5AC9BC00EF92B5 /* DBInterfaceUsingExtendedRecord.h */,
 				B51911491D555EE900772DFE /* DBVarnameRecord+Private.mm */,
 				B519114A1D555EE900772DFE /* DBVarnameRecord+Private.h */,
 				B519114B1D555EE900772DFE /* DBVarnameRecord.mm */,
@@ -687,6 +713,10 @@
 		A242495D1AF192FC003BF8F0 /* generated-cpp */ = {
 			isa = PBXGroup;
 			children = (
+				B58B16B21D5AD55B00EF92B5 /* record_using_extended_record.cpp */,
+				B58B16B31D5AD55B00EF92B5 /* interface_using_extended_record.cpp */,
+				B58B16A61D5AC9AD00EF92B5 /* record_using_extended_record.hpp */,
+				B58B16A71D5AC9AD00EF92B5 /* interface_using_extended_record.hpp */,
 				B51911471D555EDC00772DFE /* _varname_record_.hpp */,
 				B51911481D555EDC00772DFE /* _varname_interface_.hpp */,
 				B51911191D542AEC00772DFE /* wchar_test_helpers.hpp */,
@@ -844,6 +874,7 @@
 				B5F06AA51D4987EF005BE736 /* DBEnumUsageInterface+Private.mm in Sources */,
 				CFFD588D1B019E79001E10B6 /* DBCppException+Private.mm in Sources */,
 				A238CA921AF84B7100CDDCE5 /* DBDateRecord+Private.mm in Sources */,
+				B58B16AF1D5AC9BC00EF92B5 /* DBRecordUsingExtendedRecord+Private.mm in Sources */,
 				A248502B1AF96EBC00AFE907 /* DBMapListRecord.mm in Sources */,
 				6536CD7819A6C98800DD7715 /* cpp_exception_impl.cpp in Sources */,
 				A248502C1AF96EBC00AFE907 /* DBMapRecord.mm in Sources */,
@@ -856,6 +887,7 @@
 				CFC5D9FC1B152E4300BF2DF8 /* TranslateDuration.cpp in Sources */,
 				B51911511D555EE900772DFE /* DBVarnameRecord.mm in Sources */,
 				A248502F1AF96EBC00AFE907 /* DBRecordWithDerivings.mm in Sources */,
+				B58B16B51D5AD55B00EF92B5 /* interface_using_extended_record.cpp in Sources */,
 				B5F06A851D4973BD005BE736 /* DBConflict+Private.mm in Sources */,
 				A24249741AF192FC003BF8F0 /* constants.cpp in Sources */,
 				CFFD588B1B019E79001E10B6 /* DBClientInterface+Private.mm in Sources */,
@@ -870,6 +902,8 @@
 				B5F06A9A1D497A66005BE736 /* extended_record.cpp in Sources */,
 				A2CB54B419BA6E6000A9E600 /* DJIError.mm in Sources */,
 				B5E9C9401C1F9E9E0073C123 /* DBReverseClientInterface+Private.mm in Sources */,
+				B58B16B41D5AD55B00EF92B5 /* record_using_extended_record.cpp in Sources */,
+				B58B16B11D5AC9BC00EF92B5 /* DBInterfaceUsingExtendedRecord+Private.mm in Sources */,
 				B5F06A891D4973BD005BE736 /* DBExtendedRecord.mm in Sources */,
 				A238CA961AF84B7100CDDCE5 /* DBMapListRecord+Private.mm in Sources */,
 				A238CA9C1AF84B7100CDDCE5 /* DBPrimitiveList+Private.mm in Sources */,
@@ -886,6 +920,7 @@
 				6551684F1C40511C003682A4 /* return_one_two.cpp in Sources */,
 				A24249751AF192FC003BF8F0 /* record_with_derivings.cpp in Sources */,
 				CFC5D9D01B15105100BF2DF8 /* extern_record_with_derivings.cpp in Sources */,
+				B58B16B71D5AD56600EF92B5 /* DBInterfaceUsingExtendedRecord.mm in Sources */,
 				B51911181D542A7000772DFE /* DBWcharTestHelpers+Private.mm in Sources */,
 				A238CA901AF84B7100CDDCE5 /* DBConstants+Private.mm in Sources */,
 				B51911521D555EE900772DFE /* DBVarnameInterface+Private.mm in Sources */,
@@ -904,6 +939,7 @@
 				A248502E1AF96EBC00AFE907 /* DBPrimitiveList.mm in Sources */,
 				B5F06A8C1D4973BD005BE736 /* DBObjcOnlyListener+Private.mm in Sources */,
 				B5153F961D54283700012654 /* DBUsesSingleLanguageListeners+Private.mm in Sources */,
+				B58B16B01D5AC9BC00EF92B5 /* DBRecordUsingExtendedRecord.mm in Sources */,
 				B5D8FC371C23E2F40045ADCF /* DBConstantRecord+Private.mm in Sources */,
 				B519111B1D542B0700772DFE /* wchar_test_helpers.cpp in Sources */,
 				A238CAA01AF84B7100CDDCE5 /* DBRecordWithNestedDerivings+Private.mm in Sources */,

From 7300e57a00c8faf08975390dcf2644d74f0f7281 Mon Sep 17 00:00:00 2001
From: Aleksey Konovalov <konovalovav@tensor.ru>
Date: Fri, 19 Aug 2016 13:16:02 +0300
Subject: [PATCH 04/56] Fixed import guard when using relative file paths

---
 src/source/parser.scala                 | 24 +++++++++++++++---------
 test-suite/djinni/common.djinni         |  1 +
 test-suite/djinni/relative_paths.djinni |  3 +++
 test-suite/generated-src/inFileList.txt |  1 +
 4 files changed, 20 insertions(+), 9 deletions(-)
 create mode 100644 test-suite/djinni/relative_paths.djinni

diff --git a/src/source/parser.scala b/src/source/parser.scala
index 0b1c6cea5..a7f06841f 100644
--- a/src/source/parser.scala
+++ b/src/source/parser.scala
@@ -266,31 +266,37 @@ def parseExternFile(externFile: File, inFileListWriter: Option[Writer]) : Seq[Ty
   }
 }
 
+def normalizePath(path: File) : File = {
+  return new File(java.nio.file.Paths.get(path.toString()).normalize().toString())
+}
+
 def parseFile(idlFile: File, inFileListWriter: Option[Writer]): Seq[TypeDecl] = {
+  val normalizedIdlFile = normalizePath(idlFile)
   if (inFileListWriter.isDefined) {
-    inFileListWriter.get.write(idlFile + "\n")
+    inFileListWriter.get.write(normalizedIdlFile + "\n")
   }
 
-  visitedFiles.add(idlFile)
-  fileStack.push(idlFile)
-  val fin = new FileInputStream(idlFile)
+  visitedFiles.add(normalizedIdlFile)
+  fileStack.push(normalizedIdlFile)
+  val fin = new FileInputStream(normalizedIdlFile)
   try {
-    parse(idlFile.getName, new InputStreamReader(fin, "UTF-8")) match {
+    parse(normalizedIdlFile.getName, new InputStreamReader(fin, "UTF-8")) match {
       case Left(err) =>
         System.err.println(err)
         System.exit(1); return null;
       case Right(idl) => {
         var types = idl.typeDecls
         idl.imports.foreach(x => {
-          if (fileStack.contains(x.file)) {
+          val normalized = normalizePath(x.file)
+          if (fileStack.contains(normalized)) {
             throw new AssertionError("Circular import detected!")
           }
-          if (!visitedFiles.contains(x.file)) {
+          if (!visitedFiles.contains(normalized)) {
             x match {
               case IdlFileRef(file) =>
-                types = parseFile(file, inFileListWriter) ++ types
+                types = parseFile(normalized, inFileListWriter) ++ types
               case ExternFileRef(file) =>
-                types = parseExternFile(file, inFileListWriter) ++ types
+                types = parseExternFile(normalized, inFileListWriter) ++ types
             }
           }
         })
diff --git a/test-suite/djinni/common.djinni b/test-suite/djinni/common.djinni
index 5c165f605..dc2e71bf3 100644
--- a/test-suite/djinni/common.djinni
+++ b/test-suite/djinni/common.djinni
@@ -14,3 +14,4 @@
 @import "single_language_interfaces.djinni"
 @import "extended_record.djinni"
 @import "varnames.djinni"
+@import "relative_paths.djinni"
diff --git a/test-suite/djinni/relative_paths.djinni b/test-suite/djinni/relative_paths.djinni
new file mode 100644
index 000000000..5833fa8c4
--- /dev/null
+++ b/test-suite/djinni/relative_paths.djinni
@@ -0,0 +1,3 @@
+@import "./date.djinni"
+@import "../djinni/date.djinni"
+@extern "./date.yaml"
diff --git a/test-suite/generated-src/inFileList.txt b/test-suite/generated-src/inFileList.txt
index 4b273f4ab..c2f69d2c8 100644
--- a/test-suite/generated-src/inFileList.txt
+++ b/test-suite/generated-src/inFileList.txt
@@ -16,6 +16,7 @@ djinni/multiple_inheritance.djinni
 djinni/single_language_interfaces.djinni
 djinni/extended_record.djinni
 djinni/varnames.djinni
+djinni/relative_paths.djinni
 djinni/date.djinni
 djinni/date.yaml
 djinni/duration.djinni

From 5f37cfe29ac30e406708dd848d4c072297514988 Mon Sep 17 00:00:00 2001
From: Aleksey Konovalov <konovalovav@tensor.ru>
Date: Tue, 23 Aug 2016 18:52:12 +0300
Subject: [PATCH 05/56] Fixed crash in the case where the parameters
 "--list-in-files" and "--list-out-files" contain only the names of files

---
 src/source/Main.scala | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/source/Main.scala b/src/source/Main.scala
index 8932bb7a4..790988def 100644
--- a/src/source/Main.scala
+++ b/src/source/Main.scala
@@ -241,7 +241,8 @@ object Main {
     // Parse IDL file.
     System.out.println("Parsing...")
     val inFileListWriter = if (inFileListPath.isDefined) {
-      createFolder("input file list", inFileListPath.get.getParentFile)
+      if (inFileListPath.get.getParentFile != null)
+        createFolder("input file list", inFileListPath.get.getParentFile)
       Some(new BufferedWriter(new FileWriter(inFileListPath.get)))
     } else {
       None
@@ -271,7 +272,8 @@ object Main {
 
     System.out.println("Generating...")
     val outFileListWriter = if (outFileListPath.isDefined) {
-      createFolder("output file list", outFileListPath.get.getParentFile)
+      if (outFileListPath.get.getParentFile != null)
+        createFolder("output file list", outFileListPath.get.getParentFile)
       Some(new BufferedWriter(new FileWriter(outFileListPath.get)))
     } else {
       None

From a9f61c683773cd19252bfb72d343b3740e6f5d5b Mon Sep 17 00:00:00 2001
From: Stephan Jaetzold <stephan@jaetzold.de>
Date: Wed, 19 Oct 2016 18:19:18 +0200
Subject: [PATCH 06/56] Set minimum compatible IDEA API version to 139. The
 plugin does not work with 131 only.

---
 intellij-plugin/META-INF/plugin.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/intellij-plugin/META-INF/plugin.xml b/intellij-plugin/META-INF/plugin.xml
index c07649316..89e0d5f1f 100644
--- a/intellij-plugin/META-INF/plugin.xml
+++ b/intellij-plugin/META-INF/plugin.xml
@@ -29,7 +29,7 @@
   </change-notes>
 
   <!-- please see https://confluence.jetbrains.com/display/IDEADEV/Build+Number+Ranges for description -->
-  <idea-version since-build="131"/>
+  <idea-version since-build="139"/>
 
   <!-- please see https://confluence.jetbrains.com/display/IDEADEV/Plugin+Compatibility+with+IntelliJ+Platform+Products
        on how to target different products -->

From 2c0a5be7084b01c3f5f06a897c77f5b101a42e69 Mon Sep 17 00:00:00 2001
From: Stephan Jaetzold <stephan@jaetzold.de>
Date: Fri, 21 Oct 2016 14:06:48 +0200
Subject: [PATCH 07/56] Update intellij plugin description to include license
 text. Make the github project be the vendor.

---
 intellij-plugin/META-INF/plugin.xml | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/intellij-plugin/META-INF/plugin.xml b/intellij-plugin/META-INF/plugin.xml
index 89e0d5f1f..c4ad46c21 100644
--- a/intellij-plugin/META-INF/plugin.xml
+++ b/intellij-plugin/META-INF/plugin.xml
@@ -15,12 +15,28 @@
   -->
 <idea-plugin version="2">
   <id>com.dropbox.djinni.ideaplugin</id>
-  <name>Djinni interface definition language file support</name>
+  <name>Djinni IDL file support</name>
   <version>0.8</version>
-  <vendor email="jaetzold@dropbox.com" url="http://www.dropbox.com">Dropbox</vendor>
+  <vendor url="https://github.com/dropbox/djinni">Dropbox Djinni Github Project</vendor>
 
   <description><![CDATA[
       Add some basic navigation, code-completion and error highlighting support to .djinni files.
+
+      <h4>License</h4>
+      Copyright 2015-2016 Dropbox, Inc.<br/>
+      <br/>
+      Licensed under the Apache License, Version 2.0 (the "License");<br/>
+      you may not use this file except in compliance with the License.<br/>
+      You may obtain a copy of the License at<br/>
+      <br/>
+      &nbsp;&nbsp;<a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a><br/>
+      <br/>
+      Unless required by applicable law or agreed to in writing, software<br/>
+      distributed under the License is distributed on an "AS IS" BASIS,<br/>
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.<br/>
+      See the License for the specific language governing permissions and<br/>
+      limitations under the License.
+
     ]]></description>
 
   <change-notes><![CDATA[

From d28a844a1fc4014c0798b18afaec535b35d2b2fd Mon Sep 17 00:00:00 2001
From: Feram <feram@feram.co>
Date: Sat, 5 Nov 2016 20:06:22 +0000
Subject: [PATCH 08/56] Fix typo existance

---
 support-lib/proxy_cache_interface.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/support-lib/proxy_cache_interface.hpp b/support-lib/proxy_cache_interface.hpp
index aca835112..98f2b1917 100644
--- a/support-lib/proxy_cache_interface.hpp
+++ b/support-lib/proxy_cache_interface.hpp
@@ -90,7 +90,7 @@ template <typename T> static inline T * get_unowning(T * ptr) { return ptr; }
  *
  * The cache contains a map from pair<ImplType, UnowningImplPointer>
  * to WeakProxyPointer, allowing it to answer the question: "given this
- * impl, do we already have a proxy in existance?"
+ * impl, do we already have a proxy in existence?"
  *
  * We use one map for all translated types, rather than a separate one for each type,
  * to minimize duplication of code and make it so the unordered_map is as contained as

From 0cf675b5f381dadd26bec81b76747e7b959309da Mon Sep 17 00:00:00 2001
From: Feram <feram@feram.co>
Date: Sat, 5 Nov 2016 20:06:22 +0000
Subject: [PATCH 09/56] Fix typo fiels

---
 example/example.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/example/example.yaml b/example/example.yaml
index 15c3d2c7a..58be1760d 100644
--- a/example/example.yaml
+++ b/example/example.yaml
@@ -30,7 +30,7 @@ objc:
   header: '"MLB/MLBRecord1.h"'
   # Only used for "record" types: determines the type used when boxing the record is required.
   # Should not contain the pointer asterisk "*", protocols are not supported.
-  # This fiels is the same as "typename" most of the time as records are typically NSObjects and require no special boxing.
+  # This files is the same as "typename" most of the time as records are typically NSObjects and require no special boxing.
   # However, some may not, for example NSTimeInterval is boxed to NSNumber.
   boxed: 'MLBRecord1'
   # Specifies whether the unboxed type is a pointer.

From c3b557f63e22fbf1e098496dd2410a7d0b8f4d5e Mon Sep 17 00:00:00 2001
From: Feram <feram@feram.co>
Date: Sat, 5 Nov 2016 20:06:22 +0000
Subject: [PATCH 10/56] Fix typo follwoing

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ced65a077..a6afc59d8 100644
--- a/README.md
+++ b/README.md
@@ -267,7 +267,7 @@ When generating the interface for your project and wish to make it available to
 in all of C++/Objective-C/Java you can tell Djinni to generate a special YAML file as part
 of the code generation process. This file then contains all the information Djinni requires
 to include your types in a different project. Instructing Djinni to create these YAML files
-is controlled by the follwoing arguments:
+is controlled by the following arguments:
 - `--yaml-out`: The output folder for YAML files (Generator disabled if unspecified).
 - `--yaml-out-file`: If specified all types are merged into a single YAML file instead of generating one file per type (relative to `--yaml-out`).
 - `--yaml-prefix`: The prefix to add to type names stored in YAML files (default: `""`).

From 066e39d2b3f0b26a96d4ab8c705c761e8dca95d9 Mon Sep 17 00:00:00 2001
From: Feram <feram@feram.co>
Date: Sat, 5 Nov 2016 20:06:22 +0000
Subject: [PATCH 11/56] Fix typo occured

---
 .../src/com/dropbox/djinni/ideaplugin/YamlLexer.java            | 2 +-
 .../src/com/dropbox/djinni/ideaplugin/_DjinniLexer.java         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/intellij-plugin/src/com/dropbox/djinni/ideaplugin/YamlLexer.java b/intellij-plugin/src/com/dropbox/djinni/ideaplugin/YamlLexer.java
index 107afec48..f3dfa08ca 100644
--- a/intellij-plugin/src/com/dropbox/djinni/ideaplugin/YamlLexer.java
+++ b/intellij-plugin/src/com/dropbox/djinni/ideaplugin/YamlLexer.java
@@ -350,7 +350,7 @@ public final int yylength() {
 
 
   /**
-   * Reports an error that occured while scanning.
+   * Reports an error that occurred while scanning.
    *
    * In a wellformed scanner (no or only correct usage of
    * yypushback(int) and a match-all fallback rule) this method
diff --git a/intellij-plugin/src/com/dropbox/djinni/ideaplugin/_DjinniLexer.java b/intellij-plugin/src/com/dropbox/djinni/ideaplugin/_DjinniLexer.java
index f3a05bebb..f3ec20edd 100644
--- a/intellij-plugin/src/com/dropbox/djinni/ideaplugin/_DjinniLexer.java
+++ b/intellij-plugin/src/com/dropbox/djinni/ideaplugin/_DjinniLexer.java
@@ -429,7 +429,7 @@ public final int yylength() {
 
 
   /**
-   * Reports an error that occured while scanning.
+   * Reports an error that occurred while scanning.
    *
    * In a wellformed scanner (no or only correct usage of
    * yypushback(int) and a match-all fallback rule) this method

From 490e6b8562010e0b43f2072b7b3ebf1f149a85e3 Mon Sep 17 00:00:00 2001
From: Feram <feram@feram.co>
Date: Sat, 5 Nov 2016 20:06:22 +0000
Subject: [PATCH 12/56] Fix typo referencs

---
 test-suite/handwritten-src/cpp/optional.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test-suite/handwritten-src/cpp/optional.hpp b/test-suite/handwritten-src/cpp/optional.hpp
index bf6ea67cd..ab01c8357 100644
--- a/test-suite/handwritten-src/cpp/optional.hpp
+++ b/test-suite/handwritten-src/cpp/optional.hpp
@@ -553,7 +553,7 @@ class optional<T&>
 template <class T>
 class optional<T&&>
 {
-  static_assert( sizeof(T) == 0, "optional rvalue referencs disallowed" );
+  static_assert( sizeof(T) == 0, "optional rvalue references disallowed" );
 };
 
 

From 28529df5f9d8bf5a7311a979681c25fe9b29fad3 Mon Sep 17 00:00:00 2001
From: Feram <feram@feram.co>
Date: Sat, 5 Nov 2016 20:06:22 +0000
Subject: [PATCH 13/56] Fix typo unkown

---
 .../src/com/dropbox/djinni/ideaplugin/YamlLexer.java            | 2 +-
 .../src/com/dropbox/djinni/ideaplugin/_DjinniLexer.java         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/intellij-plugin/src/com/dropbox/djinni/ideaplugin/YamlLexer.java b/intellij-plugin/src/com/dropbox/djinni/ideaplugin/YamlLexer.java
index f3dfa08ca..291860044 100644
--- a/intellij-plugin/src/com/dropbox/djinni/ideaplugin/YamlLexer.java
+++ b/intellij-plugin/src/com/dropbox/djinni/ideaplugin/YamlLexer.java
@@ -166,7 +166,7 @@ private static int zzUnpackTrans(String packed, int offset, int [] result) {
 
   /* error messages for the codes above */
   private static final String ZZ_ERROR_MSG[] = {
-    "Unkown internal scanner error",
+    "Unknown internal scanner error",
     "Error: could not match input",
     "Error: pushback value was too large"
   };
diff --git a/intellij-plugin/src/com/dropbox/djinni/ideaplugin/_DjinniLexer.java b/intellij-plugin/src/com/dropbox/djinni/ideaplugin/_DjinniLexer.java
index f3ec20edd..520e22ad9 100644
--- a/intellij-plugin/src/com/dropbox/djinni/ideaplugin/_DjinniLexer.java
+++ b/intellij-plugin/src/com/dropbox/djinni/ideaplugin/_DjinniLexer.java
@@ -243,7 +243,7 @@ private static int zzUnpackTrans(String packed, int offset, int [] result) {
 
   /* error messages for the codes above */
   private static final String ZZ_ERROR_MSG[] = {
-    "Unkown internal scanner error",
+    "Unknown internal scanner error",
     "Error: could not match input",
     "Error: pushback value was too large"
   };

From 64c7ef76f488e9efdd05b32ddb5f05c187af255d Mon Sep 17 00:00:00 2001
From: Christopher Simmons <christophersimmons@ChristohersMini.home>
Date: Thu, 10 Nov 2016 17:24:04 -0500
Subject: [PATCH 14/56] Update ios version in Make targets to 10.1.

---
 Makefile            | 2 +-
 test-suite/Makefile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index e905f185d..c16901d75 100644
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,7 @@ example_ios: ./build_ios/example/libtextsort.xcodeproj
            -scheme TextSort \
            -configuration 'Debug' \
            -sdk iphonesimulator \
-	   -destination 'platform=iOS Simulator,name=iPhone 6s,OS=9.3'
+	   -destination 'platform=iOS Simulator,name=iPhone 6s,OS=10.1'
 
 # this target implicitly depends on GypAndroid.mk since gradle will try to make it
 example_android: GypAndroid.mk
diff --git a/test-suite/Makefile b/test-suite/Makefile
index d73141764..3e1dabe26 100644
--- a/test-suite/Makefile
+++ b/test-suite/Makefile
@@ -6,7 +6,7 @@ djinni:
 	./run_djinni.sh
 
 objc: djinni
-	cd objc; xcodebuild -sdk iphonesimulator -project DjinniObjcTest.xcodeproj -scheme DjinniObjcTest test -destination 'platform=iOS Simulator,name=iPhone 6s,OS=9.3'
+	cd objc; xcodebuild -sdk iphonesimulator -project DjinniObjcTest.xcodeproj -scheme DjinniObjcTest test -destination 'platform=iOS Simulator,name=iPhone 6s,OS=10.1'
 
 java: djinni
 	cd java && ant compile test

From 0983bca77563552e00974a5f4f08cf89d70f28b0 Mon Sep 17 00:00:00 2001
From: Kenny Kaye <kenny.kaye@greatcall.com>
Date: Thu, 8 Dec 2016 10:45:05 -0800
Subject: [PATCH 15/56] Remove --idl-include-path from example

---
 example/run_djinni.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/example/run_djinni.sh b/example/run_djinni.sh
index 90f4de362..61a4e4b04 100755
--- a/example/run_djinni.sh
+++ b/example/run_djinni.sh
@@ -69,9 +69,7 @@ fi
 	--objcpp-out "$temp_out/objc" \
     --objc-type-prefix TXS \
     \
-    --idl "$in" \
-    --idl-include-path "../../" \
-    --idl-include-path "path/to/idl"
+    --idl "$in"
 
 # Copy changes from "$temp_output" to final dir.
 

From a8c89710fb80df89836a93cda5e07401d004704c Mon Sep 17 00:00:00 2001
From: Kenny Kaye <kenny.kaye@greatcall.com>
Date: Thu, 8 Dec 2016 10:46:04 -0800
Subject: [PATCH 16/56] Default include path is directory of first included
 file

---
 src/source/Main.scala                   | 2 +-
 src/source/parser.scala                 | 2 +-
 test-suite/generated-src/inFileList.txt | 4 ++--
 test-suite/run_djinni.sh                | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/source/Main.scala b/src/source/Main.scala
index b40b1857b..76a7ac98b 100644
--- a/src/source/Main.scala
+++ b/src/source/Main.scala
@@ -24,7 +24,7 @@ object Main {
 
   def main(args: Array[String]) {
     var idlFile: File = null
-    var idlIncludePaths: List[String] = List(".")
+    var idlIncludePaths: List[String] = List("")
     var cppOutFolder: Option[File] = None
     var cppNamespace: String = ""
     var cppIncludePrefix: String = ""
diff --git a/src/source/parser.scala b/src/source/parser.scala
index ccddea57e..b76f5c783 100644
--- a/src/source/parser.scala
+++ b/src/source/parser.scala
@@ -55,7 +55,7 @@ private object IdlParser extends RegexParsers {
 
     includePaths.foreach(path => {
       if (file.isEmpty) {
-        var relPath = if (path == ".") fileParent else path + "/"
+        var relPath = if (path.isEmpty) fileParent else path + "/"
         val tmp = new File(relPath + fileName);
         if (tmp.exists)
           file = Some(tmp)
diff --git a/test-suite/generated-src/inFileList.txt b/test-suite/generated-src/inFileList.txt
index 16327aee2..547a760da 100644
--- a/test-suite/generated-src/inFileList.txt
+++ b/test-suite/generated-src/inFileList.txt
@@ -17,5 +17,5 @@ djinni/single_language_interfaces.djinni
 djinni/extended_record.djinni
 djinni/date.djinni
 djinni/date.yaml
-./djinni/vendor/third-party/duration.djinni
-./djinni/vendor/third-party/duration.yaml
+djinni/vendor/third-party/duration.djinni
+djinni/vendor/third-party/duration.yaml
diff --git a/test-suite/run_djinni.sh b/test-suite/run_djinni.sh
index 7a578898a..1ec1a4787 100755
--- a/test-suite/run_djinni.sh
+++ b/test-suite/run_djinni.sh
@@ -90,7 +90,7 @@ fi
     --yaml-prefix "test_" \
     \
     --idl "$in_relative" \
-    --idl-include-path "./djinni/vendor" \
+    --idl-include-path "djinni/vendor" \
 )
 
 # Make sure we can parse back our own generated YAML file

From 512f3dc1c5a1dd2189dc41715313660354239d6e Mon Sep 17 00:00:00 2001
From: Kenny Kaye <kenny.kaye@greatcall.com>
Date: Fri, 9 Dec 2016 07:01:02 -0800
Subject: [PATCH 17/56] Finish searching for import files after one is found in
 the include path

---
 src/source/parser.scala | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/source/parser.scala b/src/source/parser.scala
index b76f5c783..1af5309cb 100644
--- a/src/source/parser.scala
+++ b/src/source/parser.scala
@@ -26,6 +26,7 @@ import java.util.{Map => JMap}
 import org.yaml.snakeyaml.Yaml
 import scala.collection.JavaConversions._
 import scala.collection.mutable
+import scala.util.control.Breaks._
 import scala.util.parsing.combinator.RegexParsers
 import scala.util.parsing.input.{Position, Positional}
 
@@ -53,16 +54,15 @@ private object IdlParser extends RegexParsers {
   def importFile(fileName: String): File = {
     var file: Option[File] = None
 
-    includePaths.foreach(path => {
-      if (file.isEmpty) {
-        var relPath = if (path.isEmpty) fileParent else path + "/"
-        val tmp = new File(relPath + fileName);
-        if (tmp.exists)
-          file = Some(tmp)
-      }
+    val path = includePaths.find(path => {
+      val relPath = if (path.isEmpty) fileParent else path + "/"
+      val tmp = new File(relPath + fileName)
+      val exists = tmp.exists
+      if (exists) file = Some(tmp)
+      exists
     })
 
-    if (file.isEmpty) throw new FileNotFoundException("Unable to find file \"" + fileName + "\" at " + fileStack.top.getCanonicalPath)
+    if (path.isEmpty || file.isEmpty) throw new FileNotFoundException("Unable to find file \"" + fileName + "\" at " + fileStack.top.getCanonicalPath)
 
     return file.get
   }

From d6ce63823d7d72b59ea78f14ce60675684222829 Mon Sep 17 00:00:00 2001
From: Kenny Kaye <kenny.kaye@greatcall.com>
Date: Fri, 9 Dec 2016 07:03:47 -0800
Subject: [PATCH 18/56] Add test case for relative path not using include paths

---
 test-suite/djinni/all.djinni                           | 2 +-
 test-suite/djinni/{ => vendor/third-party}/date.djinni | 0
 test-suite/djinni/{ => vendor/third-party}/date.yaml   | 0
 test-suite/generated-src/inFileList.txt                | 4 ++--
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename test-suite/djinni/{ => vendor/third-party}/date.djinni (100%)
 rename test-suite/djinni/{ => vendor/third-party}/date.yaml (100%)

diff --git a/test-suite/djinni/all.djinni b/test-suite/djinni/all.djinni
index 53c649cce..ed8e32e05 100644
--- a/test-suite/djinni/all.djinni
+++ b/test-suite/djinni/all.djinni
@@ -1,4 +1,4 @@
 @import "common.djinni"
 
-@import "date.djinni"
+@import "vendor/third-party/date.djinni"
 @import "third-party/duration.djinni"
diff --git a/test-suite/djinni/date.djinni b/test-suite/djinni/vendor/third-party/date.djinni
similarity index 100%
rename from test-suite/djinni/date.djinni
rename to test-suite/djinni/vendor/third-party/date.djinni
diff --git a/test-suite/djinni/date.yaml b/test-suite/djinni/vendor/third-party/date.yaml
similarity index 100%
rename from test-suite/djinni/date.yaml
rename to test-suite/djinni/vendor/third-party/date.yaml
diff --git a/test-suite/generated-src/inFileList.txt b/test-suite/generated-src/inFileList.txt
index 547a760da..7be9006e6 100644
--- a/test-suite/generated-src/inFileList.txt
+++ b/test-suite/generated-src/inFileList.txt
@@ -15,7 +15,7 @@ djinni/constants.djinni
 djinni/multiple_inheritance.djinni
 djinni/single_language_interfaces.djinni
 djinni/extended_record.djinni
-djinni/date.djinni
-djinni/date.yaml
+djinni/vendor/third-party/date.djinni
+djinni/vendor/third-party/date.yaml
 djinni/vendor/third-party/duration.djinni
 djinni/vendor/third-party/duration.yaml

From ef936c4c5b3721e49e4b2c7a9b8ea225c3343523 Mon Sep 17 00:00:00 2001
From: Andrew Twyman <atwyman@dropbox.com>
Date: Thu, 22 Dec 2016 18:41:29 -0800
Subject: [PATCH 19/56] Update ObjC build files for Xcode 8.2

---
 Makefile                                      |  3 +--
 common.gypi                                   |  1 +
 .../objc/TextSort.xcodeproj/project.pbxproj   | 19 +++++++++++++---
 .../xcshareddata/xcschemes/TextSort.xcscheme  | 19 ++++++++++------
 example/objc/TextSort/TextSort-Info.plist     |  2 +-
 test-suite/Makefile                           |  2 +-
 .../objc/tests/DjinniObjcTestTests-Info.plist |  2 +-
 .../DjinniObjcTest.xcodeproj/project.pbxproj  | 21 +++++++++++++-----
 .../xcschemes/DjinniObjcTest.xcscheme         | 22 ++++++++++++++-----
 9 files changed, 66 insertions(+), 25 deletions(-)

diff --git a/Makefile b/Makefile
index c16901d75..ef0a50586 100644
--- a/Makefile
+++ b/Makefile
@@ -44,8 +44,7 @@ example_ios: ./build_ios/example/libtextsort.xcodeproj
 	xcodebuild -workspace example/objc/TextSort.xcworkspace \
            -scheme TextSort \
            -configuration 'Debug' \
-           -sdk iphonesimulator \
-	   -destination 'platform=iOS Simulator,name=iPhone 6s,OS=10.1'
+           -sdk iphonesimulator
 
 # this target implicitly depends on GypAndroid.mk since gradle will try to make it
 example_android: GypAndroid.mk
diff --git a/common.gypi b/common.gypi
index f7c3258db..68e9c565a 100644
--- a/common.gypi
+++ b/common.gypi
@@ -13,6 +13,7 @@
       'DEAD_CODE_STRIPPING': 'YES',
       'SKIP_INSTALL': 'YES',
       'CLANG_ENABLE_OBJC_ARC': 'YES',
+      'IPHONEOS_DEPLOYMENT_TARGET': '8.0',
     },
     "conditions": [
         ['OS=="ios"', {
diff --git a/example/objc/TextSort.xcodeproj/project.pbxproj b/example/objc/TextSort.xcodeproj/project.pbxproj
index 8f534fb5f..40e2b657a 100644
--- a/example/objc/TextSort.xcodeproj/project.pbxproj
+++ b/example/objc/TextSort.xcodeproj/project.pbxproj
@@ -150,7 +150,7 @@
 			isa = PBXProject;
 			attributes = {
 				CLASSPREFIX = TXS;
-				LastUpgradeCheck = 0510;
+				LastUpgradeCheck = 0820;
 				ORGANIZATIONNAME = "Dropbox, Inc.";
 			};
 			buildConfigurationList = 65834DD819AC599E0061AD3F /* Build configuration list for PBXProject "TextSort" */;
@@ -231,13 +231,19 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
@@ -250,7 +256,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 7.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -271,20 +277,25 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = YES;
 				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 7.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../support-lib/objc $(SRCROOT)/../generated-src/objc";
@@ -301,6 +312,7 @@
 				GCC_PREFIX_HEADER = "TextSort/TextSort-Prefix.pch";
 				INFOPLIST_FILE = "TextSort/TextSort-Info.plist";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
+				PRODUCT_BUNDLE_IDENTIFIER = "Dropbox.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = 1;
 				WRAPPER_EXTENSION = app;
@@ -316,6 +328,7 @@
 				GCC_PREFIX_HEADER = "TextSort/TextSort-Prefix.pch";
 				INFOPLIST_FILE = "TextSort/TextSort-Info.plist";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
+				PRODUCT_BUNDLE_IDENTIFIER = "Dropbox.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = 1;
 				WRAPPER_EXTENSION = app;
diff --git a/example/objc/TextSort.xcodeproj/xcshareddata/xcschemes/TextSort.xcscheme b/example/objc/TextSort.xcodeproj/xcshareddata/xcschemes/TextSort.xcscheme
index f3120ac80..41e61a7d3 100644
--- a/example/objc/TextSort.xcodeproj/xcshareddata/xcschemes/TextSort.xcscheme
+++ b/example/objc/TextSort.xcodeproj/xcshareddata/xcschemes/TextSort.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0510"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -23,10 +23,10 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
       <MacroExpansion>
@@ -38,17 +38,21 @@
             ReferencedContainer = "container:TextSort.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <BuildableProductRunnable>
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "65834DDC19AC599E0061AD3F"
@@ -61,12 +65,13 @@
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
-      <BuildableProductRunnable>
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "65834DDC19AC599E0061AD3F"
diff --git a/example/objc/TextSort/TextSort-Info.plist b/example/objc/TextSort/TextSort-Info.plist
index 3f2d3ca01..2deb6bc06 100644
--- a/example/objc/TextSort/TextSort-Info.plist
+++ b/example/objc/TextSort/TextSort-Info.plist
@@ -9,7 +9,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>Dropbox.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
diff --git a/test-suite/Makefile b/test-suite/Makefile
index 3e1dabe26..821990266 100644
--- a/test-suite/Makefile
+++ b/test-suite/Makefile
@@ -6,7 +6,7 @@ djinni:
 	./run_djinni.sh
 
 objc: djinni
-	cd objc; xcodebuild -sdk iphonesimulator -project DjinniObjcTest.xcodeproj -scheme DjinniObjcTest test -destination 'platform=iOS Simulator,name=iPhone 6s,OS=10.1'
+	cd objc; xcodebuild -sdk iphonesimulator -project DjinniObjcTest.xcodeproj -scheme DjinniObjcTest test -destination 'platform=iOS Simulator,name=iPhone 7,OS=latest'
 
 java: djinni
 	cd java && ant compile test
diff --git a/test-suite/handwritten-src/objc/tests/DjinniObjcTestTests-Info.plist b/test-suite/handwritten-src/objc/tests/DjinniObjcTestTests-Info.plist
index 14f854ab3..169b6f710 100644
--- a/test-suite/handwritten-src/objc/tests/DjinniObjcTestTests-Info.plist
+++ b/test-suite/handwritten-src/objc/tests/DjinniObjcTestTests-Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>Dropbox.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>
diff --git a/test-suite/objc/DjinniObjcTest.xcodeproj/project.pbxproj b/test-suite/objc/DjinniObjcTest.xcodeproj/project.pbxproj
index 498d67c09..78ae60514 100644
--- a/test-suite/objc/DjinniObjcTest.xcodeproj/project.pbxproj
+++ b/test-suite/objc/DjinniObjcTest.xcodeproj/project.pbxproj
@@ -819,7 +819,7 @@
 			isa = PBXProject;
 			attributes = {
 				CLASSPREFIX = "";
-				LastUpgradeCheck = 0510;
+				LastUpgradeCheck = 0820;
 				ORGANIZATIONNAME = "Dropbox, Inc";
 			};
 			buildConfigurationList = 65868B451989FE4200D60EEE /* Build configuration list for PBXProject "DjinniObjcTest" */;
@@ -1022,12 +1022,18 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
@@ -1047,7 +1053,7 @@
 					"$(SRCROOT)/DjinniObjcTest/objc",
 					"$(SRCROOT)/DjinniObjcTest/cpp",
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 7.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 			};
@@ -1066,12 +1072,17 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = YES;
 				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
@@ -1085,7 +1096,7 @@
 					"$(SRCROOT)/DjinniObjcTest/objc",
 					"$(SRCROOT)/DjinniObjcTest/cpp",
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 7.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
 			};
@@ -1127,7 +1138,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				FRAMEWORK_SEARCH_PATHS = (
-					"$(SDKROOT)/Developer/Library/Frameworks",
 					"$(inherited)",
 					"$(DEVELOPER_FRAMEWORKS_DIR)",
 				);
@@ -1138,6 +1148,7 @@
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = "../handwritten-src/objc/tests/DjinniObjcTestTests-Info.plist";
+				PRODUCT_BUNDLE_IDENTIFIER = "Dropbox.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = DjinniObjcTestTests;
 				WARNING_CFLAGS = (
 					"-Wextra",
@@ -1151,13 +1162,13 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				FRAMEWORK_SEARCH_PATHS = (
-					"$(SDKROOT)/Developer/Library/Frameworks",
 					"$(inherited)",
 					"$(DEVELOPER_FRAMEWORKS_DIR)",
 				);
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				GCC_PREFIX_HEADER = "";
 				INFOPLIST_FILE = "../handwritten-src/objc/tests/DjinniObjcTestTests-Info.plist";
+				PRODUCT_BUNDLE_IDENTIFIER = "Dropbox.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = DjinniObjcTestTests;
 				WARNING_CFLAGS = (
 					"-Wextra",
diff --git a/test-suite/objc/DjinniObjcTest.xcodeproj/xcshareddata/xcschemes/DjinniObjcTest.xcscheme b/test-suite/objc/DjinniObjcTest.xcodeproj/xcshareddata/xcschemes/DjinniObjcTest.xcscheme
index 18ca98d51..03679030d 100644
--- a/test-suite/objc/DjinniObjcTest.xcodeproj/xcshareddata/xcschemes/DjinniObjcTest.xcscheme
+++ b/test-suite/objc/DjinniObjcTest.xcodeproj/xcshareddata/xcschemes/DjinniObjcTest.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0510"
+   LastUpgradeVersion = "0820"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -23,10 +23,10 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -39,24 +39,36 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "65868B491989FE4200D60EEE"
+            BuildableName = "libDjinniObjcTest.a"
+            BlueprintName = "DjinniObjcTest"
+            ReferencedContainer = "container:DjinniObjcTest.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
    </ProfileAction>
    <AnalyzeAction

From 0dd240d66289059a29f90af47b20225dc4e60826 Mon Sep 17 00:00:00 2001
From: Andrew Twyman <atwyman@dropbox.com>
Date: Thu, 22 Dec 2016 19:02:07 -0800
Subject: [PATCH 20/56] Test relative paths with an input file from
 common.djinni

---
 test-suite/djinni/relative_paths.djinni | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/test-suite/djinni/relative_paths.djinni b/test-suite/djinni/relative_paths.djinni
index 5833fa8c4..2c2dcaf4d 100644
--- a/test-suite/djinni/relative_paths.djinni
+++ b/test-suite/djinni/relative_paths.djinni
@@ -1,3 +1,2 @@
-@import "./date.djinni"
-@import "../djinni/date.djinni"
-@extern "./date.yaml"
+@import "./varnames.djinni"
+@import "../djinni/varnames.djinni"

From b33d05de5a0d3ad40c4ff325c37097e90d2a753f Mon Sep 17 00:00:00 2001
From: Andrew Twyman <atwyman@dropbox.com>
Date: Tue, 16 Aug 2016 20:55:53 -0700
Subject: [PATCH 21/56] djinni_jni_main target

Add a target for djinni_main.cpp, and use a new technique I discovered to make sure its JNI symbols are exposed by the shared-lib which contains it.
---
 support-lib/support_lib.gyp | 100 ++++++++++++++++++++----------------
 1 file changed, 56 insertions(+), 44 deletions(-)

diff --git a/support-lib/support_lib.gyp b/support-lib/support_lib.gyp
index 7ac16a19b..71a890e94 100644
--- a/support-lib/support_lib.gyp
+++ b/support-lib/support_lib.gyp
@@ -1,47 +1,59 @@
 {
-    "targets": [
-        {
-            "target_name": "djinni_jni",
-            "type": "static_library",
-            "sources": [
-              "djinni_common.hpp",
-              "jni/djinni_support.cpp",
-              "jni/djinni_support.hpp",
-              "jni/Marshal.hpp",
-            ],
-            "include_dirs": [
-              "jni",
-            ],
-            "direct_dependent_settings": {
-                "include_dirs": [
-                  "jni",
-                ],
-            },
+  "targets": [
+    {
+      "target_name": "djinni_jni",
+      "type": "static_library",
+      "sources": [
+        "djinni_common.hpp",
+        "jni/djinni_support.cpp",
+        "jni/djinni_support.hpp",
+        "jni/Marshal.hpp",
+      ],
+      "include_dirs": [
+        "jni",
+      ],
+      "direct_dependent_settings": {
+        "include_dirs": [
+          "jni",
+        ],
+      },
+    },
+    {
+      "target_name": "djinni_jni_main",
+      "type": "static_library",
+      "sources": [
+        "jni/djinni_main.cpp",
+      ],
+      "link_settings": {
+        "aosp_build_settings": {
+          "LOCAL_WHOLE_STATIC_LIBRARIES": [ 'djinni_jni_main' ], # Ensure JNI symbols are exposed
         },
-        {
-            "target_name": "djinni_objc",
-            "type": "static_library",
-            "xcode_settings": {
-              "CLANG_ENABLE_OBJC_ARC": "YES",
-            },
-            "sources": [
-              "objc/DJICppWrapperCache+Private.h",
-              "objc/DJIError.h",
-              "objc/DJIError.mm",
-              "objc/DJIMarshal+Private.h",
-              "objc/DJIObjcWrapperCache+Private.h",
-              "objc/DJIProxyCaches.mm",
-              "proxy_cache_impl.hpp",
-              "proxy_cache_interface.hpp",
-            ],
-            "include_dirs": [
-              "objc",
-            ],
-            "direct_dependent_settings": {
-                "include_dirs": [
-                  "objc",
-                ],
-            },
-        },
-    ],
+      },
+    },
+    {
+      "target_name": "djinni_objc",
+      "type": "static_library",
+      "xcode_settings": {
+        "CLANG_ENABLE_OBJC_ARC": "YES",
+      },
+      "sources": [
+        "objc/DJICppWrapperCache+Private.h",
+        "objc/DJIError.h",
+        "objc/DJIError.mm",
+        "objc/DJIMarshal+Private.h",
+        "objc/DJIObjcWrapperCache+Private.h",
+        "objc/DJIProxyCaches.mm",
+        "proxy_cache_impl.hpp",
+        "proxy_cache_interface.hpp",
+      ],
+      "include_dirs": [
+        "objc",
+      ],
+      "direct_dependent_settings": {
+        "include_dirs": [
+          "objc",
+        ],
+      },
+    },
+  ],
 }

From 7f9bfef55bc561e668aaa201965d43c870488933 Mon Sep 17 00:00:00 2001
From: Andrew Twyman <atwyman@dropbox.com>
Date: Wed, 28 Sep 2016 21:53:42 -0700
Subject: [PATCH 22/56] Add @autorelease pool in ObjC proxy destructors

This is fixing a memory leak found in Dropbox's iOS networking libraries. Some ObjC objects were being autoreleased into a pool which is never flushed (the top-level pool on a C++-owned thread. This was Djinni violating its contracts around language isolation. The root cause turned out to be the destructor of an ObjcProxy object. Since it's called directly from C++, and does all its work in destructors, it was manipulating ObjC objects without an @autoreleasepool.

The fix is more complex than I'd like due to the need to arrange for destructors to run inside of an @autorelease block, which forces an awkward code structure. Furthermore, I can't use optional without knowing what namespace to look in to find nullopt, which isn't easily extractable from Djinni's current usage, so I had to write my own. I'd very much like to find a simpler fix, so suggested follow-on diffs are welcome.
---
 .../objc/TXSTextboxListener+Private.mm        | 49 +++++++++++++
 .../objc/TXSTextboxListener+Private.mm        |  9 +--
 src/source/ObjcppGenerator.scala              | 11 +--
 src/source/ObjcppMarshal.scala                |  2 +
 .../objc/DJIObjcWrapperCache+Private.h        | 68 +++++++++++++++++++
 .../objc/DBInnerClass+Private.mm              | 50 ++++++++++++++
 .../objc/DBClientInterface+Private.mm         | 25 +++----
 .../objc/DBEnumUsageInterface+Private.mm      | 17 ++---
 .../objc/DBExternInterface2+Private.mm        |  9 +--
 .../objc/DBFirstListener+Private.mm           |  9 +--
 .../objc/DBObjcOnlyListener+Private.mm        |  7 +-
 .../objc/DBSecondListener+Private.mm          |  9 +--
 .../generated-src/objc/DBUserToken+Private.mm |  9 +--
 .../DBUsesSingleLanguageListeners+Private.mm  | 15 ++--
 14 files changed, 234 insertions(+), 55 deletions(-)
 create mode 100644 example-with-packages/textsort/generated-src/objc/TXSTextboxListener+Private.mm
 create mode 100644 test-suite/djinni-packages/package1/generated-src/objc/DBInnerClass+Private.mm

diff --git a/example-with-packages/textsort/generated-src/objc/TXSTextboxListener+Private.mm b/example-with-packages/textsort/generated-src/objc/TXSTextboxListener+Private.mm
new file mode 100644
index 000000000..8dd4f51c8
--- /dev/null
+++ b/example-with-packages/textsort/generated-src/objc/TXSTextboxListener+Private.mm
@@ -0,0 +1,49 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from textsort.djinni
+
+#import "TXSTextboxListener+Private.h"
+#import "TXSTextboxListener.h"
+#import "DJIObjcWrapperCache+Private.h"
+#import "collections/generated-src/objc/TXSItemList+Private.h"
+#include <stdexcept>
+
+static_assert(__has_feature(objc_arc), "Djinni requires ARC to be enabled for this file");
+
+namespace djinni_generated {
+
+class TextboxListener::ObjcProxy final
+: public ::textsort::TextboxListener
+, private ::djinni::ObjcProxyBase<ObjcType>
+{
+    friend class ::djinni_generated::TextboxListener;
+public:
+    using ObjcProxyBase::ObjcProxyBase;
+    void update(const ::collections::ItemList & c_items) override
+    {
+        @autoreleasepool {
+            [djinni_private_get_proxied_objc_object() update:(::djinni_generated::ItemList::fromCpp(c_items))];
+        }
+    }
+};
+
+}  // namespace djinni_generated
+
+namespace djinni_generated {
+
+auto TextboxListener::toCpp(ObjcType objc) -> CppType
+{
+    if (!objc) {
+        return nullptr;
+    }
+    return ::djinni::get_objc_proxy<ObjcProxy>(objc);
+}
+
+auto TextboxListener::fromCppOpt(const CppOptType& cpp) -> ObjcType
+{
+    if (!cpp) {
+        return nil;
+    }
+    return dynamic_cast<ObjcProxy&>(*cpp).djinni_private_get_proxied_objc_object();
+}
+
+}  // namespace djinni_generated
diff --git a/example/generated-src/objc/TXSTextboxListener+Private.mm b/example/generated-src/objc/TXSTextboxListener+Private.mm
index 18ef89465..51e33d652 100644
--- a/example/generated-src/objc/TXSTextboxListener+Private.mm
+++ b/example/generated-src/objc/TXSTextboxListener+Private.mm
@@ -13,14 +13,15 @@
 
 class TextboxListener::ObjcProxy final
 : public ::textsort::TextboxListener
-, public ::djinni::ObjcProxyCache::Handle<ObjcType>
+, private ::djinni::ObjcProxyBase<ObjcType>
 {
+    friend class ::djinni_generated::TextboxListener;
 public:
-    using Handle::Handle;
+    using ObjcProxyBase::ObjcProxyBase;
     void update(const ::textsort::ItemList & c_items) override
     {
         @autoreleasepool {
-            [Handle::get() update:(::djinni_generated::ItemList::fromCpp(c_items))];
+            [djinni_private_get_proxied_objc_object() update:(::djinni_generated::ItemList::fromCpp(c_items))];
         }
     }
 };
@@ -42,7 +43,7 @@ void update(const ::textsort::ItemList & c_items) override
     if (!cpp) {
         return nil;
     }
-    return dynamic_cast<ObjcProxy&>(*cpp).Handle::get();
+    return dynamic_cast<ObjcProxy&>(*cpp).djinni_private_get_proxied_objc_object();
 }
 
 }  // namespace djinni_generated
diff --git a/src/source/ObjcppGenerator.scala b/src/source/ObjcppGenerator.scala
index ab0263f5d..6b6d67c3a 100644
--- a/src/source/ObjcppGenerator.scala
+++ b/src/source/ObjcppGenerator.scala
@@ -208,17 +208,18 @@ class ObjcppGenerator(spec: Spec) extends BaseObjcGenerator(spec) {
         wrapNamespace(w, spec.objcppNamespace, w => {
           w.wl(s"class $helperClass::ObjcProxy final")
           w.wl(s": public $cppSelf")
-          w.wl(s", public ::djinni::ObjcProxyCache::Handle<ObjcType>") // Use base class to avoid name conflicts with user-defined methods having the same name as this new data member
+          w.wl(s", private ::djinni::ObjcProxyBase<ObjcType>")
           w.bracedSemi {
+            w.wl(s"friend class ${objcppMarshal.helperClassWithNs(ident)};")
             w.wlOutdent("public:")
-            w.wl("using Handle::Handle;")
+            w.wl("using ObjcProxyBase::ObjcProxyBase;")
             for (m <- i.methods) {
               val ret = cppMarshal.fqReturnType(m.ret)
               val params = m.params.map(p => cppMarshal.fqParamType(p.ty) + " c_" + idCpp.local(p.ident))
               w.wl(s"$ret ${idCpp.method(m.ident)}${params.mkString("(", ", ", ")")} override").braced {
                 w.w("@autoreleasepool").braced {
                   val ret = m.ret.fold("")(_ => "auto objcpp_result_ = ")
-                  val call = s"[Handle::get() ${idObjc.method(m.ident)}"
+                  val call = s"[djinni_private_get_proxied_objc_object() ${idObjc.method(m.ident)}"
                   writeAlignedObjcCall(w, ret + call, m.params, "]", p => (idObjc.field(p.ident), s"(${objcppMarshal.fromCpp(p.ty, "c_" + idCpp.local(p.ident))})"))
                   w.wl(";")
                   m.ret.fold()(ty => {
@@ -284,13 +285,13 @@ class ObjcppGenerator(spec: Spec) extends BaseObjcGenerator(spec) {
           if (i.ext.objc && !i.ext.cpp) {
             // ObjC only. In this case we *must* unwrap a proxy object - the dynamic_cast will
             // throw bad_cast if we gave it something of the wrong type.
-            w.wl(s"return dynamic_cast<ObjcProxy&>(*cpp).Handle::get();")
+            w.wl(s"return dynamic_cast<ObjcProxy&>(*cpp).djinni_private_get_proxied_objc_object();")
           } else if (i.ext.objc || i.ext.cpp) {
             // C++ only, or C++ and ObjC.
             if (i.ext.objc) {
               // If it could be implemented in ObjC, we might have to unwrap a proxy object.
               w.w(s"if (auto cppPtr = dynamic_cast<ObjcProxy*>(cpp.get()))").braced {
-                w.wl("return cppPtr->Handle::get();")
+                w.wl("return cppPtr->djinni_private_get_proxied_objc_object();")
               }
             }
             w.wl(s"return ::djinni::get_cpp_proxy<$objcSelf>(cpp);")
diff --git a/src/source/ObjcppMarshal.scala b/src/source/ObjcppMarshal.scala
index 8ad5bc42a..aed2607d8 100644
--- a/src/source/ObjcppMarshal.scala
+++ b/src/source/ObjcppMarshal.scala
@@ -53,6 +53,8 @@ class ObjcppMarshal(spec: Spec) extends Marshal(spec) {
   def helperClass(name: String) = idCpp.ty(name)
   private def helperClass(tm: MExpr): String = helperName(tm) + helperTemplates(tm)
 
+  def helperClassWithNs(name: String) = withNs(Some(spec.objcppNamespace), helperClass(name))
+
   def privateHeaderName(ident: String): String = idObjc.ty(ident) + "+Private." + spec.objcHeaderExt
 
   def helperName(tm: MExpr): String = tm.base match {
diff --git a/support-lib/objc/DJIObjcWrapperCache+Private.h b/support-lib/objc/DJIObjcWrapperCache+Private.h
index 3c37d55d3..2b074aeb1 100644
--- a/support-lib/objc/DJIObjcWrapperCache+Private.h
+++ b/support-lib/objc/DJIObjcWrapperCache+Private.h
@@ -53,4 +53,72 @@ static std::shared_ptr<CppType> get_objc_proxy(ObjcType * objcRef) {
     ));
 }
 
+// Private implementation base class for all ObjC proxies, which manages the
+// Handle, and ensures that it is created and destroyed in a safe way, inside
+// of an @autoreleasepool to avoid leaks.  Most of the complexity here is just
+// necessary to gain explicit control of construction and destruction time of
+// the member Handle, to make sure it's inside the @autoreleasepool block.
+template <typename ObjcType>
+class ObjcProxyBase {
+public:
+    ObjcProxyBase(ObjcType objc) {
+        @autoreleasepool {
+            m_djinni_private_proxy_handle.emplace(objc);
+        }
+    }
+
+    ObjcProxyBase(const ObjcProxyBase&) = delete;
+    ObjcProxyBase& operator=(const ObjcProxyBase&) = delete;
+
+    // Not intended for polymorphic use, so dtor is not virtual
+    ~ObjcProxyBase() {
+        @autoreleasepool {
+            m_djinni_private_proxy_handle.reset();
+        }
+    }
+
+    // Long name to minimize likelyhood of collision with interface methods.
+    ObjcType djinni_private_get_proxied_objc_object() const {
+        return m_djinni_private_proxy_handle.value().get();
+    }
+
+private:
+    // Simple stand-in for std::experimental::optional since the
+    // support-lib doesn't know which optional implementation might be in use.
+    // We can't take OptionalType as a template arg here, because there's no
+    // way to implement reset() without also knowing where to find nullopt, not
+    // just optional itself.  This class uses the same technique as at least
+    // one optional implementation: The union ensures proper alignment, while
+    // leaving construction and destruction under our direct control.
+    // This class is NOT safe for general use.  It's safe only if emplace() and
+    // reset() are each called exactly once.
+    class OptionalObjcProxyHandle final {
+    public:
+        using HandleType = ::djinni::ObjcProxyCache::Handle<ObjcType>;
+
+        OptionalObjcProxyHandle() {};
+        OptionalObjcProxyHandle(const OptionalObjcProxyHandle&) = delete;
+        OptionalObjcProxyHandle& operator=(const OptionalObjcProxyHandle&) = delete;
+        ~OptionalObjcProxyHandle() {};
+
+        void emplace(ObjcType objc) {
+            new (&m_handle) HandleType(objc);
+        }
+
+        void reset() {
+            m_handle.~HandleType();
+        }
+
+        const HandleType & value() const { return m_handle; }
+    private:
+        union {
+            char m_dummy;
+            HandleType m_handle;
+        };
+    };
+
+    // Long name to minimize likelyhood of collision with interface methods.
+    OptionalObjcProxyHandle m_djinni_private_proxy_handle;
+};
+
 } // namespace djinni
diff --git a/test-suite/djinni-packages/package1/generated-src/objc/DBInnerClass+Private.mm b/test-suite/djinni-packages/package1/generated-src/objc/DBInnerClass+Private.mm
new file mode 100644
index 000000000..08e62ba83
--- /dev/null
+++ b/test-suite/djinni-packages/package1/generated-src/objc/DBInnerClass+Private.mm
@@ -0,0 +1,50 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from inner_class.djinni
+
+#import "DBInnerClass+Private.h"
+#import "DBInnerClass.h"
+#import "DJIMarshal+Private.h"
+#import "DJIObjcWrapperCache+Private.h"
+#include <stdexcept>
+
+static_assert(__has_feature(objc_arc), "Djinni requires ARC to be enabled for this file");
+
+namespace djinni_generated {
+
+class InnerClass::ObjcProxy final
+: public ::package1::InnerClass
+, private ::djinni::ObjcProxyBase<ObjcType>
+{
+    friend class ::djinni_generated::InnerClass;
+public:
+    using ObjcProxyBase::ObjcProxyBase;
+    std::string get_name() override
+    {
+        @autoreleasepool {
+            auto objcpp_result_ = [djinni_private_get_proxied_objc_object() getName];
+            return ::djinni::String::toCpp(objcpp_result_);
+        }
+    }
+};
+
+}  // namespace djinni_generated
+
+namespace djinni_generated {
+
+auto InnerClass::toCpp(ObjcType objc) -> CppType
+{
+    if (!objc) {
+        return nullptr;
+    }
+    return ::djinni::get_objc_proxy<ObjcProxy>(objc);
+}
+
+auto InnerClass::fromCppOpt(const CppOptType& cpp) -> ObjcType
+{
+    if (!cpp) {
+        return nil;
+    }
+    return dynamic_cast<ObjcProxy&>(*cpp).djinni_private_get_proxied_objc_object();
+}
+
+}  // namespace djinni_generated
diff --git a/test-suite/generated-src/objc/DBClientInterface+Private.mm b/test-suite/generated-src/objc/DBClientInterface+Private.mm
index 3593ff4fc..6ab8c8e96 100644
--- a/test-suite/generated-src/objc/DBClientInterface+Private.mm
+++ b/test-suite/generated-src/objc/DBClientInterface+Private.mm
@@ -14,46 +14,47 @@
 
 class ClientInterface::ObjcProxy final
 : public ::testsuite::ClientInterface
-, public ::djinni::ObjcProxyCache::Handle<ObjcType>
+, private ::djinni::ObjcProxyBase<ObjcType>
 {
+    friend class ::djinni_generated::ClientInterface;
 public:
-    using Handle::Handle;
+    using ObjcProxyBase::ObjcProxyBase;
     ::testsuite::ClientReturnedRecord get_record(int64_t c_record_id, const std::string & c_utf8string, const std::experimental::optional<std::string> & c_misc) override
     {
         @autoreleasepool {
-            auto objcpp_result_ = [Handle::get() getRecord:(::djinni::I64::fromCpp(c_record_id))
-                                                utf8string:(::djinni::String::fromCpp(c_utf8string))
-                                                      misc:(::djinni::Optional<std::experimental::optional, ::djinni::String>::fromCpp(c_misc))];
+            auto objcpp_result_ = [djinni_private_get_proxied_objc_object() getRecord:(::djinni::I64::fromCpp(c_record_id))
+                                                                           utf8string:(::djinni::String::fromCpp(c_utf8string))
+                                                                                 misc:(::djinni::Optional<std::experimental::optional, ::djinni::String>::fromCpp(c_misc))];
             return ::djinni_generated::ClientReturnedRecord::toCpp(objcpp_result_);
         }
     }
     double identifier_check(const std::vector<uint8_t> & c_data, int32_t c_r, int64_t c_jret) override
     {
         @autoreleasepool {
-            auto objcpp_result_ = [Handle::get() identifierCheck:(::djinni::Binary::fromCpp(c_data))
-                                                               r:(::djinni::I32::fromCpp(c_r))
-                                                            jret:(::djinni::I64::fromCpp(c_jret))];
+            auto objcpp_result_ = [djinni_private_get_proxied_objc_object() identifierCheck:(::djinni::Binary::fromCpp(c_data))
+                                                                                          r:(::djinni::I32::fromCpp(c_r))
+                                                                                       jret:(::djinni::I64::fromCpp(c_jret))];
             return ::djinni::F64::toCpp(objcpp_result_);
         }
     }
     std::string return_str() override
     {
         @autoreleasepool {
-            auto objcpp_result_ = [Handle::get() returnStr];
+            auto objcpp_result_ = [djinni_private_get_proxied_objc_object() returnStr];
             return ::djinni::String::toCpp(objcpp_result_);
         }
     }
     std::string meth_taking_interface(const std::shared_ptr<::testsuite::ClientInterface> & c_i) override
     {
         @autoreleasepool {
-            auto objcpp_result_ = [Handle::get() methTakingInterface:(::djinni_generated::ClientInterface::fromCpp(c_i))];
+            auto objcpp_result_ = [djinni_private_get_proxied_objc_object() methTakingInterface:(::djinni_generated::ClientInterface::fromCpp(c_i))];
             return ::djinni::String::toCpp(objcpp_result_);
         }
     }
     std::string meth_taking_optional_interface(const std::shared_ptr<::testsuite::ClientInterface> & c_i) override
     {
         @autoreleasepool {
-            auto objcpp_result_ = [Handle::get() methTakingOptionalInterface:(::djinni::Optional<std::experimental::optional, ::djinni_generated::ClientInterface>::fromCpp(c_i))];
+            auto objcpp_result_ = [djinni_private_get_proxied_objc_object() methTakingOptionalInterface:(::djinni::Optional<std::experimental::optional, ::djinni_generated::ClientInterface>::fromCpp(c_i))];
             return ::djinni::String::toCpp(objcpp_result_);
         }
     }
@@ -76,7 +77,7 @@
     if (!cpp) {
         return nil;
     }
-    return dynamic_cast<ObjcProxy&>(*cpp).Handle::get();
+    return dynamic_cast<ObjcProxy&>(*cpp).djinni_private_get_proxied_objc_object();
 }
 
 }  // namespace djinni_generated
diff --git a/test-suite/generated-src/objc/DBEnumUsageInterface+Private.mm b/test-suite/generated-src/objc/DBEnumUsageInterface+Private.mm
index 460b43183..fba81e140 100644
--- a/test-suite/generated-src/objc/DBEnumUsageInterface+Private.mm
+++ b/test-suite/generated-src/objc/DBEnumUsageInterface+Private.mm
@@ -71,42 +71,43 @@ - (nullable NSNumber *)o:(nullable NSNumber *)o {
 
 class EnumUsageInterface::ObjcProxy final
 : public ::testsuite::EnumUsageInterface
-, public ::djinni::ObjcProxyCache::Handle<ObjcType>
+, private ::djinni::ObjcProxyBase<ObjcType>
 {
+    friend class ::djinni_generated::EnumUsageInterface;
 public:
-    using Handle::Handle;
+    using ObjcProxyBase::ObjcProxyBase;
     ::testsuite::color e(::testsuite::color c_e) override
     {
         @autoreleasepool {
-            auto objcpp_result_ = [Handle::get() e:(::djinni::Enum<::testsuite::color, DBColor>::fromCpp(c_e))];
+            auto objcpp_result_ = [djinni_private_get_proxied_objc_object() e:(::djinni::Enum<::testsuite::color, DBColor>::fromCpp(c_e))];
             return ::djinni::Enum<::testsuite::color, DBColor>::toCpp(objcpp_result_);
         }
     }
     std::experimental::optional<::testsuite::color> o(std::experimental::optional<::testsuite::color> c_o) override
     {
         @autoreleasepool {
-            auto objcpp_result_ = [Handle::get() o:(::djinni::Optional<std::experimental::optional, ::djinni::Enum<::testsuite::color, DBColor>>::fromCpp(c_o))];
+            auto objcpp_result_ = [djinni_private_get_proxied_objc_object() o:(::djinni::Optional<std::experimental::optional, ::djinni::Enum<::testsuite::color, DBColor>>::fromCpp(c_o))];
             return ::djinni::Optional<std::experimental::optional, ::djinni::Enum<::testsuite::color, DBColor>>::toCpp(objcpp_result_);
         }
     }
     std::vector<::testsuite::color> l(const std::vector<::testsuite::color> & c_l) override
     {
         @autoreleasepool {
-            auto objcpp_result_ = [Handle::get() l:(::djinni::List<::djinni::Enum<::testsuite::color, DBColor>>::fromCpp(c_l))];
+            auto objcpp_result_ = [djinni_private_get_proxied_objc_object() l:(::djinni::List<::djinni::Enum<::testsuite::color, DBColor>>::fromCpp(c_l))];
             return ::djinni::List<::djinni::Enum<::testsuite::color, DBColor>>::toCpp(objcpp_result_);
         }
     }
     std::unordered_set<::testsuite::color> s(const std::unordered_set<::testsuite::color> & c_s) override
     {
         @autoreleasepool {
-            auto objcpp_result_ = [Handle::get() s:(::djinni::Set<::djinni::Enum<::testsuite::color, DBColor>>::fromCpp(c_s))];
+            auto objcpp_result_ = [djinni_private_get_proxied_objc_object() s:(::djinni::Set<::djinni::Enum<::testsuite::color, DBColor>>::fromCpp(c_s))];
             return ::djinni::Set<::djinni::Enum<::testsuite::color, DBColor>>::toCpp(objcpp_result_);
         }
     }
     std::unordered_map<::testsuite::color, ::testsuite::color> m(const std::unordered_map<::testsuite::color, ::testsuite::color> & c_m) override
     {
         @autoreleasepool {
-            auto objcpp_result_ = [Handle::get() m:(::djinni::Map<::djinni::Enum<::testsuite::color, DBColor>, ::djinni::Enum<::testsuite::color, DBColor>>::fromCpp(c_m))];
+            auto objcpp_result_ = [djinni_private_get_proxied_objc_object() m:(::djinni::Map<::djinni::Enum<::testsuite::color, DBColor>, ::djinni::Enum<::testsuite::color, DBColor>>::fromCpp(c_m))];
             return ::djinni::Map<::djinni::Enum<::testsuite::color, DBColor>, ::djinni::Enum<::testsuite::color, DBColor>>::toCpp(objcpp_result_);
         }
     }
@@ -133,7 +134,7 @@ - (nullable NSNumber *)o:(nullable NSNumber *)o {
         return nil;
     }
     if (auto cppPtr = dynamic_cast<ObjcProxy*>(cpp.get())) {
-        return cppPtr->Handle::get();
+        return cppPtr->djinni_private_get_proxied_objc_object();
     }
     return ::djinni::get_cpp_proxy<DBEnumUsageInterfaceCppProxy>(cpp);
 }
diff --git a/test-suite/generated-src/objc/DBExternInterface2+Private.mm b/test-suite/generated-src/objc/DBExternInterface2+Private.mm
index 38608286b..96fb86387 100644
--- a/test-suite/generated-src/objc/DBExternInterface2+Private.mm
+++ b/test-suite/generated-src/objc/DBExternInterface2+Private.mm
@@ -14,14 +14,15 @@
 
 class ExternInterface2::ObjcProxy final
 : public ::ExternInterface2
-, public ::djinni::ObjcProxyCache::Handle<ObjcType>
+, private ::djinni::ObjcProxyBase<ObjcType>
 {
+    friend class ::djinni_generated::ExternInterface2;
 public:
-    using Handle::Handle;
+    using ObjcProxyBase::ObjcProxyBase;
     ::ExternRecordWithDerivings foo(const std::shared_ptr<::testsuite::TestHelpers> & c_i) override
     {
         @autoreleasepool {
-            auto objcpp_result_ = [Handle::get() foo:(::djinni_generated::TestHelpers::fromCpp(c_i))];
+            auto objcpp_result_ = [djinni_private_get_proxied_objc_object() foo:(::djinni_generated::TestHelpers::fromCpp(c_i))];
             return ::djinni_generated::ExternRecordWithDerivings::toCpp(objcpp_result_);
         }
     }
@@ -44,7 +45,7 @@
     if (!cpp) {
         return nil;
     }
-    return dynamic_cast<ObjcProxy&>(*cpp).Handle::get();
+    return dynamic_cast<ObjcProxy&>(*cpp).djinni_private_get_proxied_objc_object();
 }
 
 }  // namespace djinni_generated
diff --git a/test-suite/generated-src/objc/DBFirstListener+Private.mm b/test-suite/generated-src/objc/DBFirstListener+Private.mm
index be17c49e7..ee32af8e0 100644
--- a/test-suite/generated-src/objc/DBFirstListener+Private.mm
+++ b/test-suite/generated-src/objc/DBFirstListener+Private.mm
@@ -12,14 +12,15 @@
 
 class FirstListener::ObjcProxy final
 : public ::testsuite::FirstListener
-, public ::djinni::ObjcProxyCache::Handle<ObjcType>
+, private ::djinni::ObjcProxyBase<ObjcType>
 {
+    friend class ::djinni_generated::FirstListener;
 public:
-    using Handle::Handle;
+    using ObjcProxyBase::ObjcProxyBase;
     void first() override
     {
         @autoreleasepool {
-            [Handle::get() first];
+            [djinni_private_get_proxied_objc_object() first];
         }
     }
 };
@@ -41,7 +42,7 @@ void first() override
     if (!cpp) {
         return nil;
     }
-    return dynamic_cast<ObjcProxy&>(*cpp).Handle::get();
+    return dynamic_cast<ObjcProxy&>(*cpp).djinni_private_get_proxied_objc_object();
 }
 
 }  // namespace djinni_generated
diff --git a/test-suite/generated-src/objc/DBObjcOnlyListener+Private.mm b/test-suite/generated-src/objc/DBObjcOnlyListener+Private.mm
index 184ec1c7a..b0c0bfdc2 100644
--- a/test-suite/generated-src/objc/DBObjcOnlyListener+Private.mm
+++ b/test-suite/generated-src/objc/DBObjcOnlyListener+Private.mm
@@ -12,10 +12,11 @@
 
 class ObjcOnlyListener::ObjcProxy final
 : public ::testsuite::ObjcOnlyListener
-, public ::djinni::ObjcProxyCache::Handle<ObjcType>
+, private ::djinni::ObjcProxyBase<ObjcType>
 {
+    friend class ::djinni_generated::ObjcOnlyListener;
 public:
-    using Handle::Handle;
+    using ObjcProxyBase::ObjcProxyBase;
 };
 
 }  // namespace djinni_generated
@@ -35,7 +36,7 @@
     if (!cpp) {
         return nil;
     }
-    return dynamic_cast<ObjcProxy&>(*cpp).Handle::get();
+    return dynamic_cast<ObjcProxy&>(*cpp).djinni_private_get_proxied_objc_object();
 }
 
 }  // namespace djinni_generated
diff --git a/test-suite/generated-src/objc/DBSecondListener+Private.mm b/test-suite/generated-src/objc/DBSecondListener+Private.mm
index 15ce58f3f..e5827f133 100644
--- a/test-suite/generated-src/objc/DBSecondListener+Private.mm
+++ b/test-suite/generated-src/objc/DBSecondListener+Private.mm
@@ -12,14 +12,15 @@
 
 class SecondListener::ObjcProxy final
 : public ::testsuite::SecondListener
-, public ::djinni::ObjcProxyCache::Handle<ObjcType>
+, private ::djinni::ObjcProxyBase<ObjcType>
 {
+    friend class ::djinni_generated::SecondListener;
 public:
-    using Handle::Handle;
+    using ObjcProxyBase::ObjcProxyBase;
     void second() override
     {
         @autoreleasepool {
-            [Handle::get() second];
+            [djinni_private_get_proxied_objc_object() second];
         }
     }
 };
@@ -41,7 +42,7 @@ void second() override
     if (!cpp) {
         return nil;
     }
-    return dynamic_cast<ObjcProxy&>(*cpp).Handle::get();
+    return dynamic_cast<ObjcProxy&>(*cpp).djinni_private_get_proxied_objc_object();
 }
 
 }  // namespace djinni_generated
diff --git a/test-suite/generated-src/objc/DBUserToken+Private.mm b/test-suite/generated-src/objc/DBUserToken+Private.mm
index d22c729fd..7fa70bfa0 100644
--- a/test-suite/generated-src/objc/DBUserToken+Private.mm
+++ b/test-suite/generated-src/objc/DBUserToken+Private.mm
@@ -42,14 +42,15 @@ - (nonnull NSString *)whoami {
 
 class UserToken::ObjcProxy final
 : public ::testsuite::UserToken
-, public ::djinni::ObjcProxyCache::Handle<ObjcType>
+, private ::djinni::ObjcProxyBase<ObjcType>
 {
+    friend class ::djinni_generated::UserToken;
 public:
-    using Handle::Handle;
+    using ObjcProxyBase::ObjcProxyBase;
     std::string whoami() override
     {
         @autoreleasepool {
-            auto objcpp_result_ = [Handle::get() whoami];
+            auto objcpp_result_ = [djinni_private_get_proxied_objc_object() whoami];
             return ::djinni::String::toCpp(objcpp_result_);
         }
     }
@@ -76,7 +77,7 @@ - (nonnull NSString *)whoami {
         return nil;
     }
     if (auto cppPtr = dynamic_cast<ObjcProxy*>(cpp.get())) {
-        return cppPtr->Handle::get();
+        return cppPtr->djinni_private_get_proxied_objc_object();
     }
     return ::djinni::get_cpp_proxy<DBUserTokenCppProxy>(cpp);
 }
diff --git a/test-suite/generated-src/objc/DBUsesSingleLanguageListeners+Private.mm b/test-suite/generated-src/objc/DBUsesSingleLanguageListeners+Private.mm
index 8f26c375f..7e889d1b3 100644
--- a/test-suite/generated-src/objc/DBUsesSingleLanguageListeners+Private.mm
+++ b/test-suite/generated-src/objc/DBUsesSingleLanguageListeners+Private.mm
@@ -62,33 +62,34 @@ - (nullable DBJavaOnlyListener *)returnForJava {
 
 class UsesSingleLanguageListeners::ObjcProxy final
 : public ::testsuite::UsesSingleLanguageListeners
-, public ::djinni::ObjcProxyCache::Handle<ObjcType>
+, private ::djinni::ObjcProxyBase<ObjcType>
 {
+    friend class ::djinni_generated::UsesSingleLanguageListeners;
 public:
-    using Handle::Handle;
+    using ObjcProxyBase::ObjcProxyBase;
     void callForObjC(const std::shared_ptr<::testsuite::ObjcOnlyListener> & c_l) override
     {
         @autoreleasepool {
-            [Handle::get() callForObjC:(::djinni_generated::ObjcOnlyListener::fromCpp(c_l))];
+            [djinni_private_get_proxied_objc_object() callForObjC:(::djinni_generated::ObjcOnlyListener::fromCpp(c_l))];
         }
     }
     std::shared_ptr<::testsuite::ObjcOnlyListener> returnForObjC() override
     {
         @autoreleasepool {
-            auto objcpp_result_ = [Handle::get() returnForObjC];
+            auto objcpp_result_ = [djinni_private_get_proxied_objc_object() returnForObjC];
             return ::djinni_generated::ObjcOnlyListener::toCpp(objcpp_result_);
         }
     }
     void callForJava(const std::shared_ptr<::testsuite::JavaOnlyListener> & c_l) override
     {
         @autoreleasepool {
-            [Handle::get() callForJava:(::djinni_generated::JavaOnlyListener::fromCpp(c_l))];
+            [djinni_private_get_proxied_objc_object() callForJava:(::djinni_generated::JavaOnlyListener::fromCpp(c_l))];
         }
     }
     std::shared_ptr<::testsuite::JavaOnlyListener> returnForJava() override
     {
         @autoreleasepool {
-            auto objcpp_result_ = [Handle::get() returnForJava];
+            auto objcpp_result_ = [djinni_private_get_proxied_objc_object() returnForJava];
             return ::djinni_generated::JavaOnlyListener::toCpp(objcpp_result_);
         }
     }
@@ -115,7 +116,7 @@ void callForJava(const std::shared_ptr<::testsuite::JavaOnlyListener> & c_l) ove
         return nil;
     }
     if (auto cppPtr = dynamic_cast<ObjcProxy*>(cpp.get())) {
-        return cppPtr->Handle::get();
+        return cppPtr->djinni_private_get_proxied_objc_object();
     }
     return ::djinni::get_cpp_proxy<DBUsesSingleLanguageListenersCppProxy>(cpp);
 }

From bbf14ae09865f3d74a99dda6f72d35ce7a47aaa5 Mon Sep 17 00:00:00 2001
From: Andrew Twyman <atwyman@dropbox.com>
Date: Tue, 3 Jan 2017 18:12:06 -0800
Subject: [PATCH 23/56] Simplify ObjcProxyBase

---
 .../objc/DJIObjcWrapperCache+Private.h        | 63 +++++++------------
 1 file changed, 21 insertions(+), 42 deletions(-)

diff --git a/support-lib/objc/DJIObjcWrapperCache+Private.h b/support-lib/objc/DJIObjcWrapperCache+Private.h
index 2b074aeb1..649db271c 100644
--- a/support-lib/objc/DJIObjcWrapperCache+Private.h
+++ b/support-lib/objc/DJIObjcWrapperCache+Private.h
@@ -55,15 +55,23 @@ static std::shared_ptr<CppType> get_objc_proxy(ObjcType * objcRef) {
 
 // Private implementation base class for all ObjC proxies, which manages the
 // Handle, and ensures that it is created and destroyed in a safe way, inside
-// of an @autoreleasepool to avoid leaks.  Most of the complexity here is just
-// necessary to gain explicit control of construction and destruction time of
-// the member Handle, to make sure it's inside the @autoreleasepool block.
+// of an @autoreleasepool to avoid leaks.  The complexity here is just necessary
+// to gain explicit control of construction and destruction time of the member
+// Handle, to make sure it's inside the @autoreleasepool block.
+// An optional<HandleType> would meet our needs, but we can't use it directly
+// since the support-lib doesn't know which optional implementation might be in
+// use, if any.  We can't take OptionalType as a template arg here, because we
+// also need to know where to find nullopt in order to implement the destructor
+// above.  This class uses the same technique as at least one optional
+// implementation: The union ensures proper alignment, while leaving construction
+// and destruction under our direct control.
 template <typename ObjcType>
 class ObjcProxyBase {
+    using HandleType = ::djinni::ObjcProxyCache::Handle<ObjcType>;
 public:
     ObjcProxyBase(ObjcType objc) {
         @autoreleasepool {
-            m_djinni_private_proxy_handle.emplace(objc);
+            new (&m_djinni_private_proxy_handle) HandleType(objc);
         }
     }
 
@@ -73,52 +81,23 @@ class ObjcProxyBase {
     // Not intended for polymorphic use, so dtor is not virtual
     ~ObjcProxyBase() {
         @autoreleasepool {
-            m_djinni_private_proxy_handle.reset();
+            m_djinni_private_proxy_handle.~HandleType();
         }
     }
 
     // Long name to minimize likelyhood of collision with interface methods.
-    ObjcType djinni_private_get_proxied_objc_object() const {
-        return m_djinni_private_proxy_handle.value().get();
+    // Return by reference to make it clear there's nothing for ARC to do here.
+    // Call site should have its own autoreleasepool if necessary.
+    const ObjcType & djinni_private_get_proxied_objc_object() const {
+        return m_djinni_private_proxy_handle.get();
     }
 
 private:
-    // Simple stand-in for std::experimental::optional since the
-    // support-lib doesn't know which optional implementation might be in use.
-    // We can't take OptionalType as a template arg here, because there's no
-    // way to implement reset() without also knowing where to find nullopt, not
-    // just optional itself.  This class uses the same technique as at least
-    // one optional implementation: The union ensures proper alignment, while
-    // leaving construction and destruction under our direct control.
-    // This class is NOT safe for general use.  It's safe only if emplace() and
-    // reset() are each called exactly once.
-    class OptionalObjcProxyHandle final {
-    public:
-        using HandleType = ::djinni::ObjcProxyCache::Handle<ObjcType>;
-
-        OptionalObjcProxyHandle() {};
-        OptionalObjcProxyHandle(const OptionalObjcProxyHandle&) = delete;
-        OptionalObjcProxyHandle& operator=(const OptionalObjcProxyHandle&) = delete;
-        ~OptionalObjcProxyHandle() {};
-
-        void emplace(ObjcType objc) {
-            new (&m_handle) HandleType(objc);
-        }
-
-        void reset() {
-            m_handle.~HandleType();
-        }
-
-        const HandleType & value() const { return m_handle; }
-    private:
-        union {
-            char m_dummy;
-            HandleType m_handle;
-        };
+    union {
+        // Long names to minimize likelyhood of collision with interface methods.
+        char m_djinni_private_dummy;
+        HandleType m_djinni_private_proxy_handle;
     };
-
-    // Long name to minimize likelyhood of collision with interface methods.
-    OptionalObjcProxyHandle m_djinni_private_proxy_handle;
 };
 
 } // namespace djinni

From f9f21869bb96a3cfd4bdba394e7ca249a7593a2f Mon Sep 17 00:00:00 2001
From: Kenny Kaye <kenny.kaye@greatcall.com>
Date: Thu, 12 Jan 2017 10:41:28 -0800
Subject: [PATCH 24/56] File paths are handled by File constructor

---
 src/source/parser.scala | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/source/parser.scala b/src/source/parser.scala
index ffd38fe1c..95f8a7696 100644
--- a/src/source/parser.scala
+++ b/src/source/parser.scala
@@ -55,24 +55,20 @@ private object IdlParser extends RegexParsers {
     var file: Option[File] = None
 
     val path = includePaths.find(path => {
-      val relPath = if (path.isEmpty) fileParent else path + "/"
-      val tmp = new File(relPath + fileName)
+      val relPath = if (path.isEmpty) fileStack.top.getParent() else path
+      val tmp = new File(relPath, fileName)
       val exists = tmp.exists
       if (exists) file = Some(tmp)
       exists
     })
 
-    if (path.isEmpty || file.isEmpty) throw new FileNotFoundException("Unable to find file \"" + fileName + "\" at " + fileStack.top.getCanonicalPath)
+    if (file.isEmpty) throw new FileNotFoundException("Unable to find file \"" + fileName + "\" at " + fileStack.top.getCanonicalPath)
 
     return file.get
   }
 
   def filePath = "[^\"]*".r
 
-  def fileParent(): String = {
-    if (fileStack.top.getParent() != null) fileStack.top.getParent() + "/" else ""
-  }
-
   def directive = importDirective | externDirective
   def importDirective = "import".r
   def externDirective = "extern".r

From 622b870519d3b367a52302f527d7ff3581692530 Mon Sep 17 00:00:00 2001
From: Jernej Virag <jernej@virag.si>
Date: Mon, 2 Jan 2017 16:39:36 +0100
Subject: [PATCH 25/56] Allow setting of ident style to all Java classes

---
 src/source/Main.scala | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/source/Main.scala b/src/source/Main.scala
index 790988def..e87924c52 100644
--- a/src/source/Main.scala
+++ b/src/source/Main.scala
@@ -198,6 +198,7 @@ object Main {
       note("\nIdentifier styles (ex: \"FooBar\", \"fooBar\", \"foo_bar\", \"FOO_BAR\", \"m_fooBar\")\n")
       identStyle("ident-java-enum",      c => { javaIdentStyle = javaIdentStyle.copy(enum = c) })
       identStyle("ident-java-field",     c => { javaIdentStyle = javaIdentStyle.copy(field = c) })
+      identStyle("ident-java-type",      c => { javaIdentStyle = javaIdentStyle.copy(ty = c) })
       identStyle("ident-cpp-enum",       c => { cppIdentStyle = cppIdentStyle.copy(enum = c) })
       identStyle("ident-cpp-field",      c => { cppIdentStyle = cppIdentStyle.copy(field = c) })
       identStyle("ident-cpp-method",     c => { cppIdentStyle = cppIdentStyle.copy(method = c) })
@@ -206,8 +207,8 @@ object Main {
       identStyle("ident-cpp-type-param", c => { cppIdentStyle = cppIdentStyle.copy(typeParam = c) })
       identStyle("ident-cpp-local",      c => { cppIdentStyle = cppIdentStyle.copy(local = c) })
       identStyle("ident-cpp-file",       c => { cppFileIdentStyle = c })
-      identStyle("ident-jni-class",           c => {jniClassIdentStyleOptional = Some(c)})
-      identStyle("ident-jni-file",            c => {jniFileIdentStyleOptional = Some(c)})
+      identStyle("ident-jni-class",      c => { jniClassIdentStyleOptional = Some(c)})
+      identStyle("ident-jni-file",       c => { jniFileIdentStyleOptional = Some(c)})
       identStyle("ident-objc-enum",       c => { objcIdentStyle = objcIdentStyle.copy(enum = c) })
       identStyle("ident-objc-field",      c => { objcIdentStyle = objcIdentStyle.copy(field = c) })
       identStyle("ident-objc-method",     c => { objcIdentStyle = objcIdentStyle.copy(method = c) })

From 715c6205ae4a4a0ceed12a5613cc7f7d71e4a905 Mon Sep 17 00:00:00 2001
From: Alex Cohn <alexcohn@netvision.net.il>
Date: Sun, 22 Jan 2017 15:40:08 +0200
Subject: [PATCH 26/56] fixing error from clang

  djinni_support.cpp:485: error: unused parameter
---
 support-lib/jni/djinni_support.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/support-lib/jni/djinni_support.cpp b/support-lib/jni/djinni_support.cpp
index e3a9ff515..f4b20079d 100644
--- a/support-lib/jni/djinni_support.cpp
+++ b/support-lib/jni/djinni_support.cpp
@@ -482,7 +482,7 @@ std::string jniUTF8FromString(JNIEnv * env, const jstring jstr) {
 }
 
 template<int wcharTypeSize>
-static std::wstring implUTF16ToWString(const char16_t * data, size_t length)
+static std::wstring implUTF16ToWString(const char16_t * /*data*/, size_t /*length*/)
 {
     static_assert(wcharTypeSize == 2 || wcharTypeSize == 4, "wchar_t must be represented by UTF-16 or UTF-32 encoding");
     return {}; // unreachable

From eebdf499104ba4bdae0b1dbf7ff84f5d2c7e25f0 Mon Sep 17 00:00:00 2001
From: Bruno Coelho <4brunu@gmail.com>
Date: Fri, 10 Mar 2017 15:25:08 +0000
Subject: [PATCH 27/56] Generate bridging header for Swift

---
 .../objc/TextSort-Bridging-Header.h           |  7 +++
 .../handwritten-src/objc/TXSViewController.m  |  2 +-
 .../swift/TXSTextboxListenerImpl.swift        | 22 +++++++++
 .../objc/TextSort.xcodeproj/project.pbxproj   | 26 +++++++++++
 example/run_djinni.sh                         |  7 ++-
 src/source/Main.scala                         | 16 +++++++
 src/source/SwiftBridgingHeaderGenerator.scala | 45 +++++++++++++++++++
 src/source/generator.scala                    |  7 ++-
 8 files changed, 128 insertions(+), 4 deletions(-)
 create mode 100644 example/generated-src/objc/TextSort-Bridging-Header.h
 create mode 100644 example/handwritten-src/swift/TXSTextboxListenerImpl.swift
 create mode 100644 src/source/SwiftBridgingHeaderGenerator.scala

diff --git a/example/generated-src/objc/TextSort-Bridging-Header.h b/example/generated-src/objc/TextSort-Bridging-Header.h
new file mode 100644
index 000000000..bad025562
--- /dev/null
+++ b/example/generated-src/objc/TextSort-Bridging-Header.h
@@ -0,0 +1,7 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni
+
+#import "TXSItemList.h"
+#import "TXSSortOrder.h"
+#import "TXSSortItems.h"
+#import "TXSTextboxListener.h"
diff --git a/example/handwritten-src/objc/TXSViewController.m b/example/handwritten-src/objc/TXSViewController.m
index ce1809aed..fc70b8d0c 100644
--- a/example/handwritten-src/objc/TXSViewController.m
+++ b/example/handwritten-src/objc/TXSViewController.m
@@ -1,6 +1,6 @@
 #import "TXSItemList.h"
 #import "TXSSortItems.h"
-#import "TXSTextboxListenerImpl.h"
+#import "TextSort-Swift.h"
 #import "TXSViewController.h"
 #import "TXSTextboxListener.h"
 
diff --git a/example/handwritten-src/swift/TXSTextboxListenerImpl.swift b/example/handwritten-src/swift/TXSTextboxListenerImpl.swift
new file mode 100644
index 000000000..25f714cbe
--- /dev/null
+++ b/example/handwritten-src/swift/TXSTextboxListenerImpl.swift
@@ -0,0 +1,22 @@
+//
+//  TXSTextboxListenerImpl.swift
+//  TextSort
+//
+//  Created by Bruno Coelho on 10/03/2017.
+//  Copyright © 2017 Dropbox, Inc. All rights reserved.
+//
+
+import UIKit
+
+@objc class TXSTextboxListenerImpl : NSObject, TXSTextboxListener {
+    private var textView_: UITextView
+    
+    @objc(initWithUITextView:)
+    init (textView: UITextView) {
+        textView_ = textView
+    }
+    
+    @objc func update(_ items: TXSItemList) {
+        textView_.text = items.items.joined(separator: "\n")
+    }
+}
diff --git a/example/objc/TextSort.xcodeproj/project.pbxproj b/example/objc/TextSort.xcodeproj/project.pbxproj
index 40e2b657a..b76a6b645 100644
--- a/example/objc/TextSort.xcodeproj/project.pbxproj
+++ b/example/objc/TextSort.xcodeproj/project.pbxproj
@@ -17,6 +17,7 @@
 		65D7FDFB19AD0CDF0038F82F /* TXSAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 65D7FDF519AD0CDF0038F82F /* TXSAppDelegate.m */; };
 		65D7FDFC19AD0CDF0038F82F /* TXSTextboxListenerImpl.m in Sources */ = {isa = PBXBuildFile; fileRef = 65D7FDF719AD0CDF0038F82F /* TXSTextboxListenerImpl.m */; };
 		65D7FDFD19AD0CDF0038F82F /* TXSViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 65D7FDF919AD0CDF0038F82F /* TXSViewController.m */; };
+		A546A26E1E72FBAF004A8BBD /* TXSTextboxListenerImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = A546A26D1E72FBAF004A8BBD /* TXSTextboxListenerImpl.swift */; };
 		B003051919B70561008E1F67 /* libdjinni_objc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B003051819B70561008E1F67 /* libdjinni_objc.a */; };
 		B097B6BC19B1C07E0047653A /* libtextsort_objc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B097B6BB19B1C07E0047653A /* libtextsort_objc.a */; };
 /* End PBXBuildFile section */
@@ -38,6 +39,7 @@
 		65D7FDF719AD0CDF0038F82F /* TXSTextboxListenerImpl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TXSTextboxListenerImpl.m; sourceTree = "<group>"; };
 		65D7FDF819AD0CDF0038F82F /* TXSViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TXSViewController.h; sourceTree = "<group>"; };
 		65D7FDF919AD0CDF0038F82F /* TXSViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TXSViewController.m; sourceTree = "<group>"; };
+		A546A26D1E72FBAF004A8BBD /* TXSTextboxListenerImpl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TXSTextboxListenerImpl.swift; path = "../handwritten-src/swift/TXSTextboxListenerImpl.swift"; sourceTree = "<group>"; };
 		B003051819B70561008E1F67 /* libdjinni_objc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libdjinni_objc.a; path = "../../support-lib/build/Debug-iphoneos/libdjinni_objc.a"; sourceTree = "<group>"; };
 		B097B6BB19B1C07E0047653A /* libtextsort_objc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtextsort_objc.a; path = "../../build/Debug-iphoneos/libtextsort_objc.a"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -61,6 +63,7 @@
 		65834DD419AC599E0061AD3F = {
 			isa = PBXGroup;
 			children = (
+				A546A26A1E72F967004A8BBD /* handwritten-swift */,
 				65D7FDF219AD0C730038F82F /* handwritten-objc */,
 				65834DE619AC599E0061AD3F /* TextSort */,
 				65834DDF19AC599E0061AD3F /* Frameworks */,
@@ -123,6 +126,14 @@
 			path = "../handwritten-src/objc";
 			sourceTree = "<group>";
 		};
+		A546A26A1E72F967004A8BBD /* handwritten-swift */ = {
+			isa = PBXGroup;
+			children = (
+				A546A26D1E72FBAF004A8BBD /* TXSTextboxListenerImpl.swift */,
+			);
+			name = "handwritten-swift";
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -152,6 +163,11 @@
 				CLASSPREFIX = TXS;
 				LastUpgradeCheck = 0820;
 				ORGANIZATIONNAME = "Dropbox, Inc.";
+				TargetAttributes = {
+					65834DDC19AC599E0061AD3F = {
+						LastSwiftMigration = 0820;
+					};
+				};
 			};
 			buildConfigurationList = 65834DD819AC599E0061AD3F /* Build configuration list for PBXProject "TextSort" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -192,6 +208,7 @@
 				65D7FDFC19AD0CDF0038F82F /* TXSTextboxListenerImpl.m in Sources */,
 				65D7FDFB19AD0CDF0038F82F /* TXSAppDelegate.m in Sources */,
 				65D7FDFD19AD0CDF0038F82F /* TXSViewController.m in Sources */,
+				A546A26E1E72FBAF004A8BBD /* TXSTextboxListenerImpl.swift in Sources */,
 				65D7FDFA19AD0CDF0038F82F /* main.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -308,12 +325,17 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
+				CLANG_ENABLE_MODULES = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "TextSort/TextSort-Prefix.pch";
 				INFOPLIST_FILE = "TextSort/TextSort-Info.plist";
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = "Dropbox.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_OBJC_BRIDGING_HEADER = "../generated-src/objc/TextSort-Bridging-Header.h";
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = 1;
 				WRAPPER_EXTENSION = app;
 			};
@@ -324,12 +346,16 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
+				CLANG_ENABLE_MODULES = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "TextSort/TextSort-Prefix.pch";
 				INFOPLIST_FILE = "TextSort/TextSort-Info.plist";
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = "Dropbox.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_OBJC_BRIDGING_HEADER = "../generated-src/objc/TextSort-Bridging-Header.h";
+				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = 1;
 				WRAPPER_EXTENSION = app;
 			};
diff --git a/example/run_djinni.sh b/example/run_djinni.sh
index 334d8beeb..9587bdee5 100755
--- a/example/run_djinni.sh
+++ b/example/run_djinni.sh
@@ -28,6 +28,8 @@ java_package="com.dropbox.textsort"
 
 gen_stamp="$temp_out/gen.stamp"
 
+objc_swift_bridging_header="TextSort-Bridging-Header.h"
+
 if [ $# -eq 0 ]; then
     # Normal build.
     true
@@ -66,9 +68,10 @@ fi
     --ident-jni-class NativeFooBar \
     --ident-jni-file NativeFooBar \
     \
-	--objc-out "$temp_out/objc" \
-	--objcpp-out "$temp_out/objc" \
+    --objc-out "$temp_out/objc" \
+    --objcpp-out "$temp_out/objc" \
     --objc-type-prefix TXS \
+    --objc-swift-bridging-header-out "$temp_out/objc/$objc_swift_bridging_header" \
     \
     --idl "$in"
 
diff --git a/src/source/Main.scala b/src/source/Main.scala
index c6e8d0dcc..d3527b348 100644
--- a/src/source/Main.scala
+++ b/src/source/Main.scala
@@ -68,6 +68,7 @@ object Main {
     var objcTypePrefix: String = ""
     var objcIncludePrefix: String = ""
     var objcExtendedRecordIncludePrefix: String = ""
+    var objcSwiftBridgingHeaderOut: Option[File] = None
     var objcppIncludePrefix: String = ""
     var objcppIncludeCppPrefix: String = ""
     var objcppIncludeObjcPrefixOptional: Option[String] = None
@@ -164,6 +165,8 @@ object Main {
         .text("The prefix for Objective-C data types (usually two or three letters)")
       opt[String]("objc-include-prefix").valueName("<prefix>").foreach(objcIncludePrefix = _)
         .text("The prefix for #import of header files from Objective-C files.")
+      opt[File]("objc-swift-bridging-header-out").valueName("<path>").foreach(x => objcSwiftBridgingHeaderOut = Some(x))
+        .text("The path to Objective-C Bridging Header used in XCode's Swift projects.")
       note("")
       opt[File]("objcpp-out").valueName("<out-folder>").foreach(x => objcppOutFolder = Some(x))
         .text("The output folder for private Objective-C++ files (Generator disabled if unspecified).")
@@ -282,6 +285,15 @@ object Main {
     } else {
       None
     }
+    val objcSwiftBridgingHeaderWriter = if (objcSwiftBridgingHeaderOut.isDefined) {
+      if (objcSwiftBridgingHeaderOut.get.getParentFile != null)
+        createFolder("Swift", objcSwiftBridgingHeaderOut.get.getParentFile)
+      val writer = new BufferedWriter(new FileWriter(objcSwiftBridgingHeaderOut.get))
+      SwiftBridgingHeaderGenerator.writeAutogenerationWarning(writer)
+      Some(writer)
+    } else {
+      None
+    }
 
     val outSpec = Spec(
       javaOutFolder,
@@ -330,6 +342,7 @@ object Main {
       objcppIncludeObjcPrefix,
       objcppNamespace,
       objcBaseLibIncludePrefix,
+      objcSwiftBridgingHeaderWriter,
       outFileListWriter,
       skipGeneration,
       yamlOutFolder,
@@ -345,6 +358,9 @@ object Main {
       if (outFileListWriter.isDefined) {
         outFileListWriter.get.close()
       }
+      if (objcSwiftBridgingHeaderWriter.isDefined) {
+        objcSwiftBridgingHeaderWriter.get.close()
+      }
     }
   }
 }
diff --git a/src/source/SwiftBridgingHeaderGenerator.scala b/src/source/SwiftBridgingHeaderGenerator.scala
new file mode 100644
index 000000000..0010de148
--- /dev/null
+++ b/src/source/SwiftBridgingHeaderGenerator.scala
@@ -0,0 +1,45 @@
+/**
+  * Copyright 2016 Dropbox, Inc.
+  *
+  * Licensed under the Apache License, Version 2.0 (the "License");
+  * you may not use this file except in compliance with the License.
+  * You may obtain a copy of the License at
+  *
+  *    http://www.apache.org/licenses/LICENSE-2.0
+  *
+  * Unless required by applicable law or agreed to in writing, software
+  * distributed under the License is distributed on an "AS IS" BASIS,
+  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+  */
+
+package djinni
+
+import java.io.{File, FileWriter, BufferedWriter}
+
+import djinni.ast._
+import djinni.generatorTools._
+
+class SwiftBridgingHeaderGenerator(spec: Spec) extends Generator(spec) {
+  val marshal = new ObjcMarshal(spec)
+
+  override def generateEnum(origin: String, ident: Ident, doc: Doc, e: Enum) {
+    spec.objcSwiftBridgingHeaderWriter.get.write("#import \"" + marshal.headerName(ident) + "\"\n")
+  }
+
+  override def generateInterface(origin: String, ident: Ident, doc: Doc, typeParams: Seq[TypeParam], i: Interface) {
+    spec.objcSwiftBridgingHeaderWriter.get.write("#import \"" + marshal.headerName(ident) + "\"\n")
+  }
+
+  override def generateRecord(origin: String, ident: Ident, doc: Doc, params: Seq[TypeParam], r: Record) {
+    spec.objcSwiftBridgingHeaderWriter.get.write("#import \"" + marshal.headerName(ident) + "\"\n")
+  }
+}
+
+object SwiftBridgingHeaderGenerator {
+  def writeAutogenerationWarning(writer: BufferedWriter) {
+    writer.write("// AUTOGENERATED FILE - DO NOT MODIFY!\n")
+    writer.write("// This file generated by Djinni\n\n")
+  }
+}
\ No newline at end of file
diff --git a/src/source/generator.scala b/src/source/generator.scala
index b14564076..0fd85bd0b 100644
--- a/src/source/generator.scala
+++ b/src/source/generator.scala
@@ -74,6 +74,7 @@ package object generatorTools {
                    objcppIncludeObjcPrefix: String,
                    objcppNamespace: String,
                    objcBaseLibIncludePrefix: String,
+                   objcSwiftBridgingHeaderWriter: Option[Writer],
                    outFileListWriter: Option[Writer],
                    skipGeneration: Boolean,
                    yamlOutFolder: Option[File],
@@ -169,7 +170,8 @@ package object generatorTools {
   case class GenerateException(message: String) extends java.lang.Exception(message)
 
   def createFolder(name: String, folder: File) {
-    folder.mkdirs()
+    val sucess = folder.mkdirs()
+
     if (folder.exists) {
       if (!folder.isDirectory) {
         throw new GenerateException(s"Unable to create $name folder at ${q(folder.getPath)}, there's something in the way.")
@@ -213,6 +215,9 @@ package object generatorTools {
         }
         new ObjcppGenerator(spec).generate(idl)
       }
+      if (spec.objcSwiftBridgingHeaderWriter.isDefined) {
+        new SwiftBridgingHeaderGenerator(spec).generate(idl)
+      }
       if (spec.yamlOutFolder.isDefined) {
         if (!spec.skipGeneration) {
           createFolder("YAML", spec.yamlOutFolder.get)

From b3df82b2a639acdfd4957f50626688767bff3253 Mon Sep 17 00:00:00 2001
From: nt <nmtitov@nmtitov.com>
Date: Wed, 15 Mar 2017 00:09:19 +0200
Subject: [PATCH 28/56] Fix little typo in links section

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a6afc59d8..c30b6294a 100644
--- a/README.md
+++ b/README.md
@@ -425,7 +425,7 @@ Run `make test` to invoke the test suite, found in the test-suite subdirectory.
 * There are a set of [tutorials](http://mobilecpptutorials.com/) for building a cross-platform app using Djinni.
 * [mx3](https://github.com/libmx3/mx3) is an example project demonstrating use of Djinni and other tools.
 * [Slides](https://bit.ly/djinnitalk) and [video](https://bit.ly/djinnivideo) from the CppCon 2014 talk where we introduced Djinni.
-* [Slides](https://bit.ly/djinnitalk2) and [video](https://bit.ly/djinnivideo2) from the CppCon 2015 about Djinni implementatino techniques, and the addition of Python.
+* [Slides](https://bit.ly/djinnitalk2) and [video](https://bit.ly/djinnivideo2) from the CppCon 2015 about Djinni implementation techniques, and the addition of Python.
 * You can see a [CppCon 2014 talk](https://www.youtube.com/watch?v=5AZMEm3rZ2Y) by app developers at Dropbox about their cross-platform experiences.
 
 ## Authors

From cfd02731beb3f836eb3d3e8bbc850b61883ba69d Mon Sep 17 00:00:00 2001
From: Bruno Coelho <4brunu@gmail.com>
Date: Thu, 16 Mar 2017 10:00:45 +0000
Subject: [PATCH 29/56] add CMake support to djinni

---
 support-lib/CMakeLists.txt | 76 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 76 insertions(+)
 create mode 100644 support-lib/CMakeLists.txt

diff --git a/support-lib/CMakeLists.txt b/support-lib/CMakeLists.txt
new file mode 100644
index 000000000..5ea4a3526
--- /dev/null
+++ b/support-lib/CMakeLists.txt
@@ -0,0 +1,76 @@
+cmake_minimum_required(VERSION 3.6.0)
+
+project(Djinni)
+
+include(GNUInstallDirs)
+
+set(SRC_SHARED
+  "djinni_common.hpp"
+  "proxy_cache_interface.hpp"
+  "proxy_cache_impl.hpp"
+)
+
+set(SRC_JNI
+  "jni/djinni_support.hpp"
+  "jni/Marshal.hpp"
+  "jni/djinni_support.cpp"
+)
+
+set(SRC_OBJC
+  "objc/DJICppWrapperCache+Private.h"
+  "objc/DJIError.h"
+  "objc/DJIMarshal+Private.h"
+  "objc/DJIObjcWrapperCache+Private.h"
+  "objc/DJIError.mm"
+  "objc/DJIProxyCaches.mm"
+)
+
+option(DJINNI_STATIC_LIB "Build Djinni as a static library instead of dynamic (the default)." off)
+if(DJINNI_STATIC_LIB)
+  add_library(djinni STATIC ${SRC_SHARED})
+else()
+  add_library(djinni SHARED ${SRC_SHARED})
+endif()
+source_group("" FILES ${SRC_SHARED})
+
+set_target_properties(djinni PROPERTIES
+  CXX_STANDARD 11
+  CXX_STANDARD_REQUIRED true
+  CXX_EXTENSIONS false
+)
+
+# Objective-C support
+option(DJINNI_WITH_OBJC "Include the Objective-C support code in Djinni." off)
+if(DJINNI_WITH_OBJC)
+  target_include_directories(djinni PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/objc/>")
+  target_sources(djinni PRIVATE ${SRC_OBJC})
+  source_group("objc" FILES ${SRC_OBJC})
+  target_compile_options(djinni PUBLIC "-fobjc-arc")
+endif()
+
+# JNI support
+option(DJINNI_WITH_JNI "Include the JNI support code in Djinni." off)
+if(DJINNI_WITH_JNI)
+  if(NOT DJINNI_STATIC_LIB)
+    list(APPEND SRC_JNI "jni/djinni_main.cpp")
+  endif()
+  target_include_directories(djinni PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/jni/>")
+  target_sources(djinni PRIVATE ${SRC_JNI})
+  source_group("jni" FILES ${SRC_JNI})
+  # Do not use the host's jni.h on Android as it is provided automatically by the NDK
+  if(NOT ANDROID)
+    find_package(JNI REQUIRED QUIET)
+    target_include_directories(djinni PUBLIC "${JNI_INCLUDE_DIRS}")
+  endif()
+  # Exceptions and RTTI are disabled in the NDK by default
+  if(ANDROID)
+    target_compile_options(djinni PRIVATE "-fexceptions" "-frtti")
+  endif()
+endif()
+
+if(NOT (DJINNI_WITH_OBJC OR DJINNI_WITH_JNI))
+  message(FATAL_ERROR "At least one of DJINNI_WITH_OBJC or DJINNI_WITH_JNI must be enabled.")
+endif()
+
+# Store path to the "run" executable so it can be passed as argument to add_custom_command() scripts
+set(DJINNI_RUN_PATH "${CMAKE_CURRENT_SOURCE_DIR}/src/run" CACHE FILEPATH "Path to the Djinni generator executable.")

From 568b08b0ba1133b30ea09495cb9b9795b12a8c58 Mon Sep 17 00:00:00 2001
From: Bruno Coelho <4brunu@users.noreply.github.com>
Date: Fri, 31 Mar 2017 16:57:07 +0100
Subject: [PATCH 30/56] Apply target_compile_options to all targets

---
 support-lib/CMakeLists.txt | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/support-lib/CMakeLists.txt b/support-lib/CMakeLists.txt
index 5ea4a3526..1ef23d48f 100644
--- a/support-lib/CMakeLists.txt
+++ b/support-lib/CMakeLists.txt
@@ -62,12 +62,10 @@ if(DJINNI_WITH_JNI)
     find_package(JNI REQUIRED QUIET)
     target_include_directories(djinni PUBLIC "${JNI_INCLUDE_DIRS}")
   endif()
-  # Exceptions and RTTI are disabled in the NDK by default
-  if(ANDROID)
-    target_compile_options(djinni PRIVATE "-fexceptions" "-frtti")
-  endif()
 endif()
 
+target_compile_options(djinni PRIVATE "-fexceptions" "-frtti")
+
 if(NOT (DJINNI_WITH_OBJC OR DJINNI_WITH_JNI))
   message(FATAL_ERROR "At least one of DJINNI_WITH_OBJC or DJINNI_WITH_JNI must be enabled.")
 endif()

From fde11639a783b281bf8927810a28b6100337ccf5 Mon Sep 17 00:00:00 2001
From: Bruno Coelho <4brunu@gmail.com>
Date: Mon, 3 Apr 2017 14:00:20 +0100
Subject: [PATCH 31/56] Update example to include a swift and objc listener

---
 .../app/src/main/res/layout/activity_main.xml |  5 ++
 example/example.djinni                        |  7 ++-
 example/generated-src/cpp/sort_items.hpp      |  5 +-
 .../cpp/textbox_reset_listener.hpp            | 17 +++++++
 .../java/com/dropbox/textsort/SortItems.java  | 12 ++++-
 .../textsort/TextboxResetListener.java        | 11 +++++
 example/generated-src/jni/NativeSortItems.cpp | 15 +++++-
 .../jni/NativeTextboxResetListener.cpp        | 26 ++++++++++
 .../jni/NativeTextboxResetListener.hpp        | 46 +++++++++++++++++
 .../objc/TXSSortItems+Private.mm              | 13 ++++-
 example/generated-src/objc/TXSSortItems.h     |  6 ++-
 .../objc/TXSTextboxResetListener+Private.h    | 31 ++++++++++++
 .../objc/TXSTextboxResetListener+Private.mm   | 49 +++++++++++++++++++
 .../objc/TXSTextboxResetListener.h            | 11 +++++
 .../objc/TextSort-Bridging-Header.h           |  1 +
 .../handwritten-src/cpp/sort_items_impl.cpp   | 16 ++++--
 .../handwritten-src/cpp/sort_items_impl.hpp   |  5 +-
 .../com/dropbox/textsort/MainActivity.java    |  8 ++-
 .../textsort/TextboxResetListenerImpl.java    | 18 +++++++
 .../handwritten-src/objc/TXSViewController.m  | 13 +++--
 .../swift/TXSTextboxListenerImpl.swift        | 22 ---------
 .../swift/TXSTextboxResetListenerImpl.swift   | 14 ++++++
 .../objc/TextSort.xcodeproj/project.pbxproj   |  8 +--
 .../Base.lproj/Main_iPhone.storyboard         | 47 +++++++++++-------
 24 files changed, 347 insertions(+), 59 deletions(-)
 create mode 100644 example/generated-src/cpp/textbox_reset_listener.hpp
 create mode 100644 example/generated-src/java/com/dropbox/textsort/TextboxResetListener.java
 create mode 100644 example/generated-src/jni/NativeTextboxResetListener.cpp
 create mode 100644 example/generated-src/jni/NativeTextboxResetListener.hpp
 create mode 100644 example/generated-src/objc/TXSTextboxResetListener+Private.h
 create mode 100644 example/generated-src/objc/TXSTextboxResetListener+Private.mm
 create mode 100644 example/generated-src/objc/TXSTextboxResetListener.h
 create mode 100644 example/handwritten-src/java/com/dropbox/textsort/TextboxResetListenerImpl.java
 delete mode 100644 example/handwritten-src/swift/TXSTextboxListenerImpl.swift
 create mode 100644 example/handwritten-src/swift/TXSTextboxResetListenerImpl.swift

diff --git a/example/android/app/src/main/res/layout/activity_main.xml b/example/android/app/src/main/res/layout/activity_main.xml
index 0cc3f0b50..c424b37fb 100644
--- a/example/android/app/src/main/res/layout/activity_main.xml
+++ b/example/android/app/src/main/res/layout/activity_main.xml
@@ -14,6 +14,11 @@
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
         android:id="@+id/actions">
+        <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Reset"
+            android:onClick="reset" />
         <Button
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/example/example.djinni b/example/example.djinni
index 55ee6de28..e166639eb 100644
--- a/example/example.djinni
+++ b/example/example.djinni
@@ -11,7 +11,8 @@ sort_order = enum {
 sort_items = interface +c {
     # For the iOS / Android demo
     sort(order: sort_order, items: item_list);
-    static create_with_listener(listener: textbox_listener): sort_items;
+    reset();
+    static create_with_listener(listener: textbox_listener, reset_listener: textbox_reset_listener): sort_items;
 
     # For the localhost / command-line demo
     static run_sort(items: item_list): item_list;
@@ -20,3 +21,7 @@ sort_items = interface +c {
 textbox_listener = interface +j +o {
     update(items: item_list);
 }
+
+textbox_reset_listener = interface +j +o {
+    reset(text: string);
+}
diff --git a/example/generated-src/cpp/sort_items.hpp b/example/generated-src/cpp/sort_items.hpp
index a01d3936c..a61501da4 100644
--- a/example/generated-src/cpp/sort_items.hpp
+++ b/example/generated-src/cpp/sort_items.hpp
@@ -8,6 +8,7 @@
 namespace textsort {
 
 class TextboxListener;
+class TextboxResetListener;
 enum class sort_order;
 struct ItemList;
 
@@ -18,7 +19,9 @@ class SortItems {
     /** For the iOS / Android demo */
     virtual void sort(sort_order order, const ItemList & items) = 0;
 
-    static std::shared_ptr<SortItems> create_with_listener(const std::shared_ptr<TextboxListener> & listener);
+    virtual void reset() = 0;
+
+    static std::shared_ptr<SortItems> create_with_listener(const std::shared_ptr<TextboxListener> & listener, const std::shared_ptr<TextboxResetListener> & reset_listener);
 
     /** For the localhost / command-line demo */
     static ItemList run_sort(const ItemList & items);
diff --git a/example/generated-src/cpp/textbox_reset_listener.hpp b/example/generated-src/cpp/textbox_reset_listener.hpp
new file mode 100644
index 000000000..9d5f7d2f0
--- /dev/null
+++ b/example/generated-src/cpp/textbox_reset_listener.hpp
@@ -0,0 +1,17 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from example.djinni
+
+#pragma once
+
+#include <string>
+
+namespace textsort {
+
+class TextboxResetListener {
+public:
+    virtual ~TextboxResetListener() {}
+
+    virtual void reset(const std::string & text) = 0;
+};
+
+}  // namespace textsort
diff --git a/example/generated-src/java/com/dropbox/textsort/SortItems.java b/example/generated-src/java/com/dropbox/textsort/SortItems.java
index beeef710c..83fa2d672 100644
--- a/example/generated-src/java/com/dropbox/textsort/SortItems.java
+++ b/example/generated-src/java/com/dropbox/textsort/SortItems.java
@@ -11,8 +11,10 @@
     /** For the iOS / Android demo */
     public abstract void sort(@Nonnull SortOrder order, @Nonnull ItemList items);
 
+    public abstract void reset();
+
     @CheckForNull
-    public static native SortItems createWithListener(@CheckForNull TextboxListener listener);
+    public static native SortItems createWithListener(@CheckForNull TextboxListener listener, @CheckForNull TextboxResetListener resetListener);
 
     /** For the localhost / command-line demo */
     @Nonnull
@@ -48,5 +50,13 @@ public void sort(SortOrder order, ItemList items)
             native_sort(this.nativeRef, order, items);
         }
         private native void native_sort(long _nativeRef, SortOrder order, ItemList items);
+
+        @Override
+        public void reset()
+        {
+            assert !this.destroyed.get() : "trying to use a destroyed object";
+            native_reset(this.nativeRef);
+        }
+        private native void native_reset(long _nativeRef);
     }
 }
diff --git a/example/generated-src/java/com/dropbox/textsort/TextboxResetListener.java b/example/generated-src/java/com/dropbox/textsort/TextboxResetListener.java
new file mode 100644
index 000000000..10c2ce40f
--- /dev/null
+++ b/example/generated-src/java/com/dropbox/textsort/TextboxResetListener.java
@@ -0,0 +1,11 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from example.djinni
+
+package com.dropbox.textsort;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
+/*package*/ abstract class TextboxResetListener {
+    public abstract void reset(@Nonnull String text);
+}
diff --git a/example/generated-src/jni/NativeSortItems.cpp b/example/generated-src/jni/NativeSortItems.cpp
index 03162cc5e..3421cd52e 100644
--- a/example/generated-src/jni/NativeSortItems.cpp
+++ b/example/generated-src/jni/NativeSortItems.cpp
@@ -5,6 +5,7 @@
 #include "NativeItemList.hpp"
 #include "NativeSortOrder.hpp"
 #include "NativeTextboxListener.hpp"
+#include "NativeTextboxResetListener.hpp"
 
 namespace djinni_generated {
 
@@ -31,11 +32,21 @@ CJNIEXPORT void JNICALL Java_com_dropbox_textsort_SortItems_00024CppProxy_native
     } JNI_TRANSLATE_EXCEPTIONS_RETURN(jniEnv, )
 }
 
-CJNIEXPORT jobject JNICALL Java_com_dropbox_textsort_SortItems_createWithListener(JNIEnv* jniEnv, jobject /*this*/, jobject j_listener)
+CJNIEXPORT void JNICALL Java_com_dropbox_textsort_SortItems_00024CppProxy_native_1reset(JNIEnv* jniEnv, jobject /*this*/, jlong nativeRef)
+{
+    try {
+        DJINNI_FUNCTION_PROLOGUE1(jniEnv, nativeRef);
+        const auto& ref = ::djinni::objectFromHandleAddress<::textsort::SortItems>(nativeRef);
+        ref->reset();
+    } JNI_TRANSLATE_EXCEPTIONS_RETURN(jniEnv, )
+}
+
+CJNIEXPORT jobject JNICALL Java_com_dropbox_textsort_SortItems_createWithListener(JNIEnv* jniEnv, jobject /*this*/, jobject j_listener, jobject j_resetListener)
 {
     try {
         DJINNI_FUNCTION_PROLOGUE0(jniEnv);
-        auto r = ::textsort::SortItems::create_with_listener(::djinni_generated::NativeTextboxListener::toCpp(jniEnv, j_listener));
+        auto r = ::textsort::SortItems::create_with_listener(::djinni_generated::NativeTextboxListener::toCpp(jniEnv, j_listener),
+                                                             ::djinni_generated::NativeTextboxResetListener::toCpp(jniEnv, j_resetListener));
         return ::djinni::release(::djinni_generated::NativeSortItems::fromCpp(jniEnv, r));
     } JNI_TRANSLATE_EXCEPTIONS_RETURN(jniEnv, 0 /* value doesn't matter */)
 }
diff --git a/example/generated-src/jni/NativeTextboxResetListener.cpp b/example/generated-src/jni/NativeTextboxResetListener.cpp
new file mode 100644
index 000000000..cde92ff3b
--- /dev/null
+++ b/example/generated-src/jni/NativeTextboxResetListener.cpp
@@ -0,0 +1,26 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from example.djinni
+
+#include "NativeTextboxResetListener.hpp"  // my header
+#include "Marshal.hpp"
+
+namespace djinni_generated {
+
+NativeTextboxResetListener::NativeTextboxResetListener() : ::djinni::JniInterface<::textsort::TextboxResetListener, NativeTextboxResetListener>() {}
+
+NativeTextboxResetListener::~NativeTextboxResetListener() = default;
+
+NativeTextboxResetListener::JavaProxy::JavaProxy(JniType j) : Handle(::djinni::jniGetThreadEnv(), j) { }
+
+NativeTextboxResetListener::JavaProxy::~JavaProxy() = default;
+
+void NativeTextboxResetListener::JavaProxy::reset(const std::string & c_text) {
+    auto jniEnv = ::djinni::jniGetThreadEnv();
+    ::djinni::JniLocalScope jscope(jniEnv, 10);
+    const auto& data = ::djinni::JniClass<::djinni_generated::NativeTextboxResetListener>::get();
+    jniEnv->CallVoidMethod(Handle::get().get(), data.method_reset,
+                           ::djinni::get(::djinni::String::fromCpp(jniEnv, c_text)));
+    ::djinni::jniExceptionCheck(jniEnv);
+}
+
+}  // namespace djinni_generated
diff --git a/example/generated-src/jni/NativeTextboxResetListener.hpp b/example/generated-src/jni/NativeTextboxResetListener.hpp
new file mode 100644
index 000000000..63d1ae10e
--- /dev/null
+++ b/example/generated-src/jni/NativeTextboxResetListener.hpp
@@ -0,0 +1,46 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from example.djinni
+
+#pragma once
+
+#include "djinni_support.hpp"
+#include "textbox_reset_listener.hpp"
+
+namespace djinni_generated {
+
+class NativeTextboxResetListener final : ::djinni::JniInterface<::textsort::TextboxResetListener, NativeTextboxResetListener> {
+public:
+    using CppType = std::shared_ptr<::textsort::TextboxResetListener>;
+    using CppOptType = std::shared_ptr<::textsort::TextboxResetListener>;
+    using JniType = jobject;
+
+    using Boxed = NativeTextboxResetListener;
+
+    ~NativeTextboxResetListener();
+
+    static CppType toCpp(JNIEnv* jniEnv, JniType j) { return ::djinni::JniClass<NativeTextboxResetListener>::get()._fromJava(jniEnv, j); }
+    static ::djinni::LocalRef<JniType> fromCppOpt(JNIEnv* jniEnv, const CppOptType& c) { return {jniEnv, ::djinni::JniClass<NativeTextboxResetListener>::get()._toJava(jniEnv, c)}; }
+    static ::djinni::LocalRef<JniType> fromCpp(JNIEnv* jniEnv, const CppType& c) { return fromCppOpt(jniEnv, c); }
+
+private:
+    NativeTextboxResetListener();
+    friend ::djinni::JniClass<NativeTextboxResetListener>;
+    friend ::djinni::JniInterface<::textsort::TextboxResetListener, NativeTextboxResetListener>;
+
+    class JavaProxy final : ::djinni::JavaProxyHandle<JavaProxy>, public ::textsort::TextboxResetListener
+    {
+    public:
+        JavaProxy(JniType j);
+        ~JavaProxy();
+
+        void reset(const std::string & text) override;
+
+    private:
+        friend ::djinni::JniInterface<::textsort::TextboxResetListener, ::djinni_generated::NativeTextboxResetListener>;
+    };
+
+    const ::djinni::GlobalRef<jclass> clazz { ::djinni::jniFindClass("com/dropbox/textsort/TextboxResetListener") };
+    const jmethodID method_reset { ::djinni::jniGetMethodID(clazz.get(), "reset", "(Ljava/lang/String;)V") };
+};
+
+}  // namespace djinni_generated
diff --git a/example/generated-src/objc/TXSSortItems+Private.mm b/example/generated-src/objc/TXSSortItems+Private.mm
index 9368ce974..32ede9304 100644
--- a/example/generated-src/objc/TXSSortItems+Private.mm
+++ b/example/generated-src/objc/TXSSortItems+Private.mm
@@ -8,6 +8,7 @@
 #import "TXSItemList+Private.h"
 #import "TXSSortOrder+Private.h"
 #import "TXSTextboxListener+Private.h"
+#import "TXSTextboxResetListener+Private.h"
 #include <exception>
 #include <stdexcept>
 #include <utility>
@@ -40,9 +41,17 @@ - (void)sort:(TXSSortOrder)order
     } DJINNI_TRANSLATE_EXCEPTIONS()
 }
 
-+ (nullable TXSSortItems *)createWithListener:(nullable id<TXSTextboxListener>)listener {
+- (void)reset {
     try {
-        auto objcpp_result_ = ::textsort::SortItems::create_with_listener(::djinni_generated::TextboxListener::toCpp(listener));
+        _cppRefHandle.get()->reset();
+    } DJINNI_TRANSLATE_EXCEPTIONS()
+}
+
++ (nullable TXSSortItems *)createWithListener:(nullable id<TXSTextboxListener>)listener
+                                resetListener:(nullable id<TXSTextboxResetListener>)resetListener {
+    try {
+        auto objcpp_result_ = ::textsort::SortItems::create_with_listener(::djinni_generated::TextboxListener::toCpp(listener),
+                                                                          ::djinni_generated::TextboxResetListener::toCpp(resetListener));
         return ::djinni_generated::SortItems::fromCpp(objcpp_result_);
     } DJINNI_TRANSLATE_EXCEPTIONS()
 }
diff --git a/example/generated-src/objc/TXSSortItems.h b/example/generated-src/objc/TXSSortItems.h
index f1da466bc..7935b1591 100644
--- a/example/generated-src/objc/TXSSortItems.h
+++ b/example/generated-src/objc/TXSSortItems.h
@@ -6,6 +6,7 @@
 #import <Foundation/Foundation.h>
 @class TXSSortItems;
 @protocol TXSTextboxListener;
+@protocol TXSTextboxResetListener;
 
 
 @interface TXSSortItems : NSObject
@@ -14,7 +15,10 @@
 - (void)sort:(TXSSortOrder)order
        items:(nonnull TXSItemList *)items;
 
-+ (nullable TXSSortItems *)createWithListener:(nullable id<TXSTextboxListener>)listener;
+- (void)reset;
+
++ (nullable TXSSortItems *)createWithListener:(nullable id<TXSTextboxListener>)listener
+                                resetListener:(nullable id<TXSTextboxResetListener>)resetListener;
 
 /** For the localhost / command-line demo */
 + (nonnull TXSItemList *)runSort:(nonnull TXSItemList *)items;
diff --git a/example/generated-src/objc/TXSTextboxResetListener+Private.h b/example/generated-src/objc/TXSTextboxResetListener+Private.h
new file mode 100644
index 000000000..ab7ce68c7
--- /dev/null
+++ b/example/generated-src/objc/TXSTextboxResetListener+Private.h
@@ -0,0 +1,31 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from example.djinni
+
+#include "textbox_reset_listener.hpp"
+#include <memory>
+
+static_assert(__has_feature(objc_arc), "Djinni requires ARC to be enabled for this file");
+
+@protocol TXSTextboxResetListener;
+
+namespace djinni_generated {
+
+class TextboxResetListener
+{
+public:
+    using CppType = std::shared_ptr<::textsort::TextboxResetListener>;
+    using CppOptType = std::shared_ptr<::textsort::TextboxResetListener>;
+    using ObjcType = id<TXSTextboxResetListener>;
+
+    using Boxed = TextboxResetListener;
+
+    static CppType toCpp(ObjcType objc);
+    static ObjcType fromCppOpt(const CppOptType& cpp);
+    static ObjcType fromCpp(const CppType& cpp) { return fromCppOpt(cpp); }
+
+private:
+    class ObjcProxy;
+};
+
+}  // namespace djinni_generated
+
diff --git a/example/generated-src/objc/TXSTextboxResetListener+Private.mm b/example/generated-src/objc/TXSTextboxResetListener+Private.mm
new file mode 100644
index 000000000..a955e6a79
--- /dev/null
+++ b/example/generated-src/objc/TXSTextboxResetListener+Private.mm
@@ -0,0 +1,49 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from example.djinni
+
+#import "TXSTextboxResetListener+Private.h"
+#import "TXSTextboxResetListener.h"
+#import "DJIMarshal+Private.h"
+#import "DJIObjcWrapperCache+Private.h"
+#include <stdexcept>
+
+static_assert(__has_feature(objc_arc), "Djinni requires ARC to be enabled for this file");
+
+namespace djinni_generated {
+
+class TextboxResetListener::ObjcProxy final
+: public ::textsort::TextboxResetListener
+, private ::djinni::ObjcProxyBase<ObjcType>
+{
+    friend class ::djinni_generated::TextboxResetListener;
+public:
+    using ObjcProxyBase::ObjcProxyBase;
+    void reset(const std::string & c_text) override
+    {
+        @autoreleasepool {
+            [djinni_private_get_proxied_objc_object() reset:(::djinni::String::fromCpp(c_text))];
+        }
+    }
+};
+
+}  // namespace djinni_generated
+
+namespace djinni_generated {
+
+auto TextboxResetListener::toCpp(ObjcType objc) -> CppType
+{
+    if (!objc) {
+        return nullptr;
+    }
+    return ::djinni::get_objc_proxy<ObjcProxy>(objc);
+}
+
+auto TextboxResetListener::fromCppOpt(const CppOptType& cpp) -> ObjcType
+{
+    if (!cpp) {
+        return nil;
+    }
+    return dynamic_cast<ObjcProxy&>(*cpp).djinni_private_get_proxied_objc_object();
+}
+
+}  // namespace djinni_generated
diff --git a/example/generated-src/objc/TXSTextboxResetListener.h b/example/generated-src/objc/TXSTextboxResetListener.h
new file mode 100644
index 000000000..c0c97bcc8
--- /dev/null
+++ b/example/generated-src/objc/TXSTextboxResetListener.h
@@ -0,0 +1,11 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from example.djinni
+
+#import <Foundation/Foundation.h>
+
+
+@protocol TXSTextboxResetListener
+
+- (void)reset:(nonnull NSString *)text;
+
+@end
diff --git a/example/generated-src/objc/TextSort-Bridging-Header.h b/example/generated-src/objc/TextSort-Bridging-Header.h
index bad025562..d10919685 100644
--- a/example/generated-src/objc/TextSort-Bridging-Header.h
+++ b/example/generated-src/objc/TextSort-Bridging-Header.h
@@ -5,3 +5,4 @@
 #import "TXSSortOrder.h"
 #import "TXSSortItems.h"
 #import "TXSTextboxListener.h"
+#import "TXSTextboxResetListener.h"
diff --git a/example/handwritten-src/cpp/sort_items_impl.cpp b/example/handwritten-src/cpp/sort_items_impl.cpp
index 2ee7bead8..3d9b164a0 100644
--- a/example/handwritten-src/cpp/sort_items_impl.cpp
+++ b/example/handwritten-src/cpp/sort_items_impl.cpp
@@ -8,14 +8,24 @@
 
 namespace textsort {
 
-std::shared_ptr<SortItems> SortItems::create_with_listener(const std::shared_ptr<TextboxListener>& listener) {
-    return std::make_shared<SortItemsImpl>(listener);
+std::shared_ptr<SortItems> SortItems::create_with_listener(const std::shared_ptr<TextboxListener> & listener, const std::shared_ptr<TextboxResetListener> & reset_listener) {
+    return std::make_shared<SortItemsImpl>(listener, reset_listener);
 }
 
-SortItemsImpl::SortItemsImpl (const std::shared_ptr<TextboxListener> & listener) {
+SortItemsImpl::SortItemsImpl (const std::shared_ptr<TextboxListener> & listener, const std::shared_ptr<TextboxResetListener> & reset_listener) {
     this->m_listener = listener;
+    this->m_reset_listener = reset_listener;
 }
 
+void SortItemsImpl::reset() {
+
+    std::string resetText = "Type the lines to sort";
+    
+    // Pass result to client interface
+    this->m_reset_listener->reset(resetText);
+
+}
+    
 void SortItemsImpl::sort(sort_order order, const ItemList & items) {
     auto lines = items.items;
     switch (order) {
diff --git a/example/handwritten-src/cpp/sort_items_impl.hpp b/example/handwritten-src/cpp/sort_items_impl.hpp
index 56e91ff55..976bcb66a 100644
--- a/example/handwritten-src/cpp/sort_items_impl.hpp
+++ b/example/handwritten-src/cpp/sort_items_impl.hpp
@@ -2,17 +2,20 @@
 
 #include "sort_items.hpp"
 #include "textbox_listener.hpp"
+#include "textbox_reset_listener.hpp"
 
 namespace textsort {
 
 class SortItemsImpl : public SortItems {
 
 public:
-    SortItemsImpl(const std::shared_ptr<TextboxListener> & listener);
+    SortItemsImpl(const std::shared_ptr<TextboxListener> & listener, const std::shared_ptr<TextboxResetListener> & reset_listener);
+    virtual void reset() override;
     virtual void sort(sort_order order, const ItemList & items) override;
 
 private:
     std::shared_ptr<TextboxListener> m_listener;
+    std::shared_ptr<TextboxResetListener> m_reset_listener;
 
 };
 
diff --git a/example/handwritten-src/java/com/dropbox/textsort/MainActivity.java b/example/handwritten-src/java/com/dropbox/textsort/MainActivity.java
index e23d9d933..073edd9ac 100644
--- a/example/handwritten-src/java/com/dropbox/textsort/MainActivity.java
+++ b/example/handwritten-src/java/com/dropbox/textsort/MainActivity.java
@@ -13,6 +13,7 @@ public class MainActivity extends Activity {
     private EditText text;
     private SortItems sortItemsInterface;
     private TextboxListener textboxListener;
+    private TextboxResetListener textboxResetListener;
 
     static {
         System.loadLibrary("textsort_jni");
@@ -25,8 +26,13 @@ protected void onCreate(Bundle savedInstanceState) {
 
         text = (EditText) findViewById(R.id.editText);
         textboxListener = new TextboxListenerImpl(text);
+        textboxResetListener = new TextboxResetListenerImpl(text);
         // Call JNI to initiate the SortItems object from the given textboxListener and translate to Java
-        sortItemsInterface = SortItems.createWithListener(textboxListener);
+        sortItemsInterface = SortItems.createWithListener(textboxListener, textboxResetListener);
+    }
+
+    public void reset(View view) {
+        sortItemsInterface.reset();
     }
 
     public void sort(SortOrder order) {
diff --git a/example/handwritten-src/java/com/dropbox/textsort/TextboxResetListenerImpl.java b/example/handwritten-src/java/com/dropbox/textsort/TextboxResetListenerImpl.java
new file mode 100644
index 000000000..b8fbf7b59
--- /dev/null
+++ b/example/handwritten-src/java/com/dropbox/textsort/TextboxResetListenerImpl.java
@@ -0,0 +1,18 @@
+package com.dropbox.textsort;
+
+import android.widget.EditText;
+
+public class TextboxResetListenerImpl extends TextboxResetListener {
+
+    private EditText mTextArea;
+
+    public TextboxResetListenerImpl(EditText textArea) {
+        this.mTextArea = textArea;
+    }
+
+    @Override
+    public void reset(String text) {
+        mTextArea.setText(text);
+    }
+
+}
diff --git a/example/handwritten-src/objc/TXSViewController.m b/example/handwritten-src/objc/TXSViewController.m
index fc70b8d0c..0816191d9 100644
--- a/example/handwritten-src/objc/TXSViewController.m
+++ b/example/handwritten-src/objc/TXSViewController.m
@@ -1,8 +1,8 @@
 #import "TXSItemList.h"
 #import "TXSSortItems.h"
-#import "TextSort-Swift.h"
+#import "TXSTextboxListenerImpl.h"
 #import "TXSViewController.h"
-#import "TXSTextboxListener.h"
+#import "TextSort-Swift.h"
 
 #import <QuartzCore/QuartzCore.h>
 
@@ -17,6 +17,7 @@ @interface TXSViewController ()
 @implementation TXSViewController {
     TXSSortItems* _sortItemInterface;
     id <TXSTextboxListener> _textboxListener;
+    id <TXSTextboxResetListener> _textboxResetListener;
 }
 
 - (void)viewDidLoad
@@ -35,7 +36,13 @@ - (void)viewDidLoad
 
     // Create the Objective-C TXSTextboxListener
     _textboxListener = [[TXSTextboxListenerImpl alloc] initWithUITextView:self.textView];
-    _sortItemInterface = [TXSSortItems createWithListener:_textboxListener];
+    _textboxResetListener = [[TXSTextboxResetListenerImpl alloc] initWithUITextView:self.textView];
+    _sortItemInterface = [TXSSortItems createWithListener:_textboxListener resetListener:_textboxResetListener];
+}
+
+- (IBAction)reset:(id)sender
+{
+    [_sortItemInterface reset];
 }
 
 - (IBAction)sort:(id)sender
diff --git a/example/handwritten-src/swift/TXSTextboxListenerImpl.swift b/example/handwritten-src/swift/TXSTextboxListenerImpl.swift
deleted file mode 100644
index 25f714cbe..000000000
--- a/example/handwritten-src/swift/TXSTextboxListenerImpl.swift
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-//  TXSTextboxListenerImpl.swift
-//  TextSort
-//
-//  Created by Bruno Coelho on 10/03/2017.
-//  Copyright © 2017 Dropbox, Inc. All rights reserved.
-//
-
-import UIKit
-
-@objc class TXSTextboxListenerImpl : NSObject, TXSTextboxListener {
-    private var textView_: UITextView
-    
-    @objc(initWithUITextView:)
-    init (textView: UITextView) {
-        textView_ = textView
-    }
-    
-    @objc func update(_ items: TXSItemList) {
-        textView_.text = items.items.joined(separator: "\n")
-    }
-}
diff --git a/example/handwritten-src/swift/TXSTextboxResetListenerImpl.swift b/example/handwritten-src/swift/TXSTextboxResetListenerImpl.swift
new file mode 100644
index 000000000..51bc872cd
--- /dev/null
+++ b/example/handwritten-src/swift/TXSTextboxResetListenerImpl.swift
@@ -0,0 +1,14 @@
+import UIKit
+
+@objc class TXSTextboxResetListenerImpl : NSObject, TXSTextboxResetListener {
+    private var textView_: UITextView
+    
+    @objc(initWithUITextView:)
+    init (textView: UITextView) {
+        textView_ = textView
+    }
+    
+    func reset(_ text: String) {
+        textView_.text = text
+    }
+}
diff --git a/example/objc/TextSort.xcodeproj/project.pbxproj b/example/objc/TextSort.xcodeproj/project.pbxproj
index b76a6b645..f6d0d3bb3 100644
--- a/example/objc/TextSort.xcodeproj/project.pbxproj
+++ b/example/objc/TextSort.xcodeproj/project.pbxproj
@@ -17,7 +17,7 @@
 		65D7FDFB19AD0CDF0038F82F /* TXSAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 65D7FDF519AD0CDF0038F82F /* TXSAppDelegate.m */; };
 		65D7FDFC19AD0CDF0038F82F /* TXSTextboxListenerImpl.m in Sources */ = {isa = PBXBuildFile; fileRef = 65D7FDF719AD0CDF0038F82F /* TXSTextboxListenerImpl.m */; };
 		65D7FDFD19AD0CDF0038F82F /* TXSViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 65D7FDF919AD0CDF0038F82F /* TXSViewController.m */; };
-		A546A26E1E72FBAF004A8BBD /* TXSTextboxListenerImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = A546A26D1E72FBAF004A8BBD /* TXSTextboxListenerImpl.swift */; };
+		A546A26E1E72FBAF004A8BBD /* TXSTextboxResetListenerImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = A546A26D1E72FBAF004A8BBD /* TXSTextboxResetListenerImpl.swift */; };
 		B003051919B70561008E1F67 /* libdjinni_objc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B003051819B70561008E1F67 /* libdjinni_objc.a */; };
 		B097B6BC19B1C07E0047653A /* libtextsort_objc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B097B6BB19B1C07E0047653A /* libtextsort_objc.a */; };
 /* End PBXBuildFile section */
@@ -39,7 +39,7 @@
 		65D7FDF719AD0CDF0038F82F /* TXSTextboxListenerImpl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TXSTextboxListenerImpl.m; sourceTree = "<group>"; };
 		65D7FDF819AD0CDF0038F82F /* TXSViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TXSViewController.h; sourceTree = "<group>"; };
 		65D7FDF919AD0CDF0038F82F /* TXSViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TXSViewController.m; sourceTree = "<group>"; };
-		A546A26D1E72FBAF004A8BBD /* TXSTextboxListenerImpl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TXSTextboxListenerImpl.swift; path = "../handwritten-src/swift/TXSTextboxListenerImpl.swift"; sourceTree = "<group>"; };
+		A546A26D1E72FBAF004A8BBD /* TXSTextboxResetListenerImpl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TXSTextboxResetListenerImpl.swift; path = "../handwritten-src/swift/TXSTextboxResetListenerImpl.swift"; sourceTree = "<group>"; };
 		B003051819B70561008E1F67 /* libdjinni_objc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libdjinni_objc.a; path = "../../support-lib/build/Debug-iphoneos/libdjinni_objc.a"; sourceTree = "<group>"; };
 		B097B6BB19B1C07E0047653A /* libtextsort_objc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtextsort_objc.a; path = "../../build/Debug-iphoneos/libtextsort_objc.a"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -129,7 +129,7 @@
 		A546A26A1E72F967004A8BBD /* handwritten-swift */ = {
 			isa = PBXGroup;
 			children = (
-				A546A26D1E72FBAF004A8BBD /* TXSTextboxListenerImpl.swift */,
+				A546A26D1E72FBAF004A8BBD /* TXSTextboxResetListenerImpl.swift */,
 			);
 			name = "handwritten-swift";
 			sourceTree = "<group>";
@@ -208,7 +208,7 @@
 				65D7FDFC19AD0CDF0038F82F /* TXSTextboxListenerImpl.m in Sources */,
 				65D7FDFB19AD0CDF0038F82F /* TXSAppDelegate.m in Sources */,
 				65D7FDFD19AD0CDF0038F82F /* TXSViewController.m in Sources */,
-				A546A26E1E72FBAF004A8BBD /* TXSTextboxListenerImpl.swift in Sources */,
+				A546A26E1E72FBAF004A8BBD /* TXSTextboxResetListenerImpl.swift in Sources */,
 				65D7FDFA19AD0CDF0038F82F /* main.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/example/objc/TextSort/Base.lproj/Main_iPhone.storyboard b/example/objc/TextSort/Base.lproj/Main_iPhone.storyboard
index aede50b64..c8d94c76d 100644
--- a/example/objc/TextSort/Base.lproj/Main_iPhone.storyboard
+++ b/example/objc/TextSort/Base.lproj/Main_iPhone.storyboard
@@ -1,9 +1,13 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7531" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="vXZ-lx-hvc">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12118" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="vXZ-lx-hvc">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7520"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12086"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
@@ -15,48 +19,57 @@
                         <viewControllerLayoutGuide type="bottom" id="2fi-mo-0CV"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="kh9-bI-dsS">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
                             <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" text="Type the lines to sort" translatesAutoresizingMaskIntoConstraints="NO" id="GOB-Ok-Z2R">
-                                <rect key="frame" x="16" y="28" width="288" height="482"/>
-                                <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                <rect key="frame" x="16" y="28" width="343" height="581"/>
+                                <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                             </textView>
-                            <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="A93-rB-AZ4">
-                                <rect key="frame" x="54" y="518" width="60" height="30"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="A93-rB-AZ4">
+                                <rect key="frame" x="106" y="617" width="30" height="30"/>
                                 <state key="normal" title="Sort">
-                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 </state>
                                 <connections>
                                     <action selector="sort:" destination="vXZ-lx-hvc" eventType="touchUpInside" id="JmD-7I-e8t"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="81n-2H-7fH">
-                                <rect key="frame" x="104" y="518" width="113" height="30"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="81n-2H-7fH">
+                                <rect key="frame" x="144" y="617" width="88" height="30"/>
                                 <state key="normal" title="Reverse Sort">
-                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 </state>
                                 <connections>
                                     <action selector="reverseSort:" destination="vXZ-lx-hvc" eventType="touchUpInside" id="3ph-FD-T7F"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cv7-dA-P8a">
-                                <rect key="frame" x="225" y="518" width="60" height="30"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cv7-dA-P8a">
+                                <rect key="frame" x="240" y="617" width="57" height="30"/>
                                 <state key="normal" title="Random">
-                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 </state>
                                 <connections>
                                     <action selector="randomSort:" destination="vXZ-lx-hvc" eventType="touchUpInside" id="Qm2-PQ-ghk"/>
                                 </connections>
                             </button>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ujE-Fh-KYB">
+                                <rect key="frame" x="58" y="617" width="39" height="30"/>
+                                <state key="normal" title="Reset"/>
+                                <connections>
+                                    <action selector="reset:" destination="vXZ-lx-hvc" eventType="touchUpInside" id="aYB-V7-80Y"/>
+                                </connections>
+                            </button>
                         </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
+                            <constraint firstItem="ujE-Fh-KYB" firstAttribute="top" secondItem="A93-rB-AZ4" secondAttribute="top" id="4FY-bm-lFV"/>
                             <constraint firstItem="cv7-dA-P8a" firstAttribute="leading" secondItem="81n-2H-7fH" secondAttribute="trailing" constant="8" id="6k6-kS-Uv4"/>
                             <constraint firstItem="81n-2H-7fH" firstAttribute="baseline" secondItem="cv7-dA-P8a" secondAttribute="baseline" id="EDF-c5-6UY"/>
                             <constraint firstItem="GOB-Ok-Z2R" firstAttribute="trailing" secondItem="kh9-bI-dsS" secondAttribute="trailingMargin" id="FcW-gp-TKr"/>
+                            <constraint firstItem="A93-rB-AZ4" firstAttribute="leading" secondItem="ujE-Fh-KYB" secondAttribute="trailing" constant="9" id="Fhe-NE-isa"/>
                             <constraint firstItem="cv7-dA-P8a" firstAttribute="top" secondItem="GOB-Ok-Z2R" secondAttribute="bottom" constant="8" id="LWK-fr-cJv"/>
                             <constraint firstItem="81n-2H-7fH" firstAttribute="leading" secondItem="A93-rB-AZ4" secondAttribute="trailing" constant="8" id="M4F-4D-BXj"/>
                             <constraint firstItem="2fi-mo-0CV" firstAttribute="top" secondItem="81n-2H-7fH" secondAttribute="bottom" constant="20" id="Skf-gJ-Pvn"/>
@@ -79,6 +92,6 @@
     <simulatedMetricsContainer key="defaultSimulatedMetrics">
         <simulatedStatusBarMetrics key="statusBar"/>
         <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination" type="retina4"/>
+        <simulatedScreenMetrics key="destination" type="retina4_7.fullscreen"/>
     </simulatedMetricsContainer>
 </document>

From f4580a433f717fc07d02117b614248806d81c8cf Mon Sep 17 00:00:00 2001
From: Bruno Coelho <4brunu@gmail.com>
Date: Mon, 3 Apr 2017 15:21:46 +0100
Subject: [PATCH 32/56] =?UTF-8?q?Require=20only=20the=20bridging=20header?=
 =?UTF-8?q?=20name=20instead=20of=20it=E2=80=99s=20path?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 example/run_djinni.sh                           |  4 +---
 .../runConfigurations/djinni_Main__Example_.xml |  4 ++--
 src/source/Main.scala                           | 17 ++++++++---------
 src/source/SwiftBridgingHeaderGenerator.scala   |  4 ++--
 src/source/generator.scala                      |  1 +
 5 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/example/run_djinni.sh b/example/run_djinni.sh
index 9587bdee5..eef4945e4 100755
--- a/example/run_djinni.sh
+++ b/example/run_djinni.sh
@@ -28,8 +28,6 @@ java_package="com.dropbox.textsort"
 
 gen_stamp="$temp_out/gen.stamp"
 
-objc_swift_bridging_header="TextSort-Bridging-Header.h"
-
 if [ $# -eq 0 ]; then
     # Normal build.
     true
@@ -71,7 +69,7 @@ fi
     --objc-out "$temp_out/objc" \
     --objcpp-out "$temp_out/objc" \
     --objc-type-prefix TXS \
-    --objc-swift-bridging-header-out "$temp_out/objc/$objc_swift_bridging_header" \
+    --objc-swift-bridging-header "TextSort-Bridging-Header" \
     \
     --idl "$in"
 
diff --git a/src/.idea/runConfigurations/djinni_Main__Example_.xml b/src/.idea/runConfigurations/djinni_Main__Example_.xml
index c28af9f0d..ef7a9ac7c 100644
--- a/src/.idea/runConfigurations/djinni_Main__Example_.xml
+++ b/src/.idea/runConfigurations/djinni_Main__Example_.xml
@@ -8,10 +8,10 @@
     </extension>
     <option name="MAIN_CLASS_NAME" value="djinni.Main" />
     <option name="VM_PARAMETERS" value="" />
-    <option name="PROGRAM_PARAMETERS" value="--java-out djinni-output-temp/java --java-package com.dropbox.textsort --ident-java-field mFooBar --cpp-out djinni-output-temp/cpp --cpp-namespace textsort --ident-cpp-enum-type foo_bar --jni-out djinni-output-temp/jni --ident-jni-class NativeFooBar --ident-jni-file NativeFooBar --objc-out djinni-output-temp/objc --objcpp-out djinni-output-temp/objc --objc-type-prefix TXS --idl example.djinni" />
+    <option name="PROGRAM_PARAMETERS" value="--java-out djinni-output-temp/java --java-package com.dropbox.textsort --ident-java-field mFooBar --cpp-out djinni-output-temp/cpp --cpp-namespace textsort --ident-cpp-enum-type foo_bar --jni-out djinni-output-temp/jni --ident-jni-class NativeFooBar --ident-jni-file NativeFooBar --objc-out djinni-output-temp/objc --objcpp-out djinni-output-temp/objc --objc-type-prefix TXS --objc-swift-bridging-header TextSort-Bridging-Header --idl example.djinni" />
     <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/../example" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" value="" />
+    <option name="ALTERNATIVE_JRE_PATH" />
     <option name="ENABLE_SWING_INSPECTOR" value="false" />
     <option name="ENV_VARIABLES" />
     <option name="PASS_PARENT_ENVS" value="true" />
diff --git a/src/source/Main.scala b/src/source/Main.scala
index d3527b348..68a2b5baf 100644
--- a/src/source/Main.scala
+++ b/src/source/Main.scala
@@ -68,7 +68,7 @@ object Main {
     var objcTypePrefix: String = ""
     var objcIncludePrefix: String = ""
     var objcExtendedRecordIncludePrefix: String = ""
-    var objcSwiftBridgingHeaderOut: Option[File] = None
+    var objcSwiftBridgingHeader: Option[String] = None
     var objcppIncludePrefix: String = ""
     var objcppIncludeCppPrefix: String = ""
     var objcppIncludeObjcPrefixOptional: Option[String] = None
@@ -165,8 +165,8 @@ object Main {
         .text("The prefix for Objective-C data types (usually two or three letters)")
       opt[String]("objc-include-prefix").valueName("<prefix>").foreach(objcIncludePrefix = _)
         .text("The prefix for #import of header files from Objective-C files.")
-      opt[File]("objc-swift-bridging-header-out").valueName("<path>").foreach(x => objcSwiftBridgingHeaderOut = Some(x))
-        .text("The path to Objective-C Bridging Header used in XCode's Swift projects.")
+      opt[String]("objc-swift-bridging-header").valueName("<name>").foreach(x => objcSwiftBridgingHeader = Some(x))
+        .text("The name of Objective-C Bridging Header used in XCode's Swift projects.")
       note("")
       opt[File]("objcpp-out").valueName("<out-folder>").foreach(x => objcppOutFolder = Some(x))
         .text("The output folder for private Objective-C++ files (Generator disabled if unspecified).")
@@ -285,12 +285,11 @@ object Main {
     } else {
       None
     }
-    val objcSwiftBridgingHeaderWriter = if (objcSwiftBridgingHeaderOut.isDefined) {
-      if (objcSwiftBridgingHeaderOut.get.getParentFile != null)
-        createFolder("Swift", objcSwiftBridgingHeaderOut.get.getParentFile)
-      val writer = new BufferedWriter(new FileWriter(objcSwiftBridgingHeaderOut.get))
-      SwiftBridgingHeaderGenerator.writeAutogenerationWarning(writer)
-      Some(writer)
+    val objcSwiftBridgingHeaderWriter = if (objcSwiftBridgingHeader.isDefined && objcOutFolder.isDefined) {
+      val objcSwiftBridgingHeaderFile = new File(objcOutFolder.get.getPath, objcSwiftBridgingHeader.get + ".h")
+      if (objcSwiftBridgingHeaderFile.getParentFile != null)
+        createFolder("output file list", objcSwiftBridgingHeaderFile.getParentFile)
+      Some(new BufferedWriter(new FileWriter(objcSwiftBridgingHeaderFile)))
     } else {
       None
     }
diff --git a/src/source/SwiftBridgingHeaderGenerator.scala b/src/source/SwiftBridgingHeaderGenerator.scala
index 0010de148..441ea987b 100644
--- a/src/source/SwiftBridgingHeaderGenerator.scala
+++ b/src/source/SwiftBridgingHeaderGenerator.scala
@@ -16,7 +16,7 @@
 
 package djinni
 
-import java.io.{File, FileWriter, BufferedWriter}
+import java.io._
 
 import djinni.ast._
 import djinni.generatorTools._
@@ -38,7 +38,7 @@ class SwiftBridgingHeaderGenerator(spec: Spec) extends Generator(spec) {
 }
 
 object SwiftBridgingHeaderGenerator {
-  def writeAutogenerationWarning(writer: BufferedWriter) {
+  def writeAutogenerationWarning(writer: Writer) {
     writer.write("// AUTOGENERATED FILE - DO NOT MODIFY!\n")
     writer.write("// This file generated by Djinni\n\n")
   }
diff --git a/src/source/generator.scala b/src/source/generator.scala
index 0fd85bd0b..fcd9d811f 100644
--- a/src/source/generator.scala
+++ b/src/source/generator.scala
@@ -216,6 +216,7 @@ package object generatorTools {
         new ObjcppGenerator(spec).generate(idl)
       }
       if (spec.objcSwiftBridgingHeaderWriter.isDefined) {
+        SwiftBridgingHeaderGenerator.writeAutogenerationWarning(spec.objcSwiftBridgingHeaderWriter.get)
         new SwiftBridgingHeaderGenerator(spec).generate(idl)
       }
       if (spec.yamlOutFolder.isDefined) {

From 52f4e25ed57db3d833f30bf61e199479085dfff0 Mon Sep 17 00:00:00 2001
From: Bruno Coelho <4brunu@gmail.com>
Date: Tue, 4 Apr 2017 16:19:00 +0100
Subject: [PATCH 33/56] Revert "Update example to include a swift and objc
 listener"

This reverts commit fde11639a783b281bf8927810a28b6100337ccf5.
---
 .../app/src/main/res/layout/activity_main.xml |  5 --
 example/example.djinni                        |  7 +--
 example/generated-src/cpp/sort_items.hpp      |  5 +-
 .../cpp/textbox_reset_listener.hpp            | 17 -------
 .../java/com/dropbox/textsort/SortItems.java  | 12 +----
 .../textsort/TextboxResetListener.java        | 11 -----
 example/generated-src/jni/NativeSortItems.cpp | 15 +-----
 .../jni/NativeTextboxResetListener.cpp        | 26 ----------
 .../jni/NativeTextboxResetListener.hpp        | 46 -----------------
 .../objc/TXSSortItems+Private.mm              | 13 +----
 example/generated-src/objc/TXSSortItems.h     |  6 +--
 .../objc/TXSTextboxResetListener+Private.h    | 31 ------------
 .../objc/TXSTextboxResetListener+Private.mm   | 49 -------------------
 .../objc/TXSTextboxResetListener.h            | 11 -----
 .../objc/TextSort-Bridging-Header.h           |  1 -
 .../handwritten-src/cpp/sort_items_impl.cpp   | 16 ++----
 .../handwritten-src/cpp/sort_items_impl.hpp   |  5 +-
 .../com/dropbox/textsort/MainActivity.java    |  8 +--
 .../textsort/TextboxResetListenerImpl.java    | 18 -------
 .../handwritten-src/objc/TXSViewController.m  | 13 ++---
 .../swift/TXSTextboxListenerImpl.swift        | 22 +++++++++
 .../swift/TXSTextboxResetListenerImpl.swift   | 14 ------
 .../objc/TextSort.xcodeproj/project.pbxproj   |  8 +--
 .../Base.lproj/Main_iPhone.storyboard         | 47 +++++++-----------
 24 files changed, 59 insertions(+), 347 deletions(-)
 delete mode 100644 example/generated-src/cpp/textbox_reset_listener.hpp
 delete mode 100644 example/generated-src/java/com/dropbox/textsort/TextboxResetListener.java
 delete mode 100644 example/generated-src/jni/NativeTextboxResetListener.cpp
 delete mode 100644 example/generated-src/jni/NativeTextboxResetListener.hpp
 delete mode 100644 example/generated-src/objc/TXSTextboxResetListener+Private.h
 delete mode 100644 example/generated-src/objc/TXSTextboxResetListener+Private.mm
 delete mode 100644 example/generated-src/objc/TXSTextboxResetListener.h
 delete mode 100644 example/handwritten-src/java/com/dropbox/textsort/TextboxResetListenerImpl.java
 create mode 100644 example/handwritten-src/swift/TXSTextboxListenerImpl.swift
 delete mode 100644 example/handwritten-src/swift/TXSTextboxResetListenerImpl.swift

diff --git a/example/android/app/src/main/res/layout/activity_main.xml b/example/android/app/src/main/res/layout/activity_main.xml
index c424b37fb..0cc3f0b50 100644
--- a/example/android/app/src/main/res/layout/activity_main.xml
+++ b/example/android/app/src/main/res/layout/activity_main.xml
@@ -14,11 +14,6 @@
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
         android:id="@+id/actions">
-        <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Reset"
-            android:onClick="reset" />
         <Button
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/example/example.djinni b/example/example.djinni
index e166639eb..55ee6de28 100644
--- a/example/example.djinni
+++ b/example/example.djinni
@@ -11,8 +11,7 @@ sort_order = enum {
 sort_items = interface +c {
     # For the iOS / Android demo
     sort(order: sort_order, items: item_list);
-    reset();
-    static create_with_listener(listener: textbox_listener, reset_listener: textbox_reset_listener): sort_items;
+    static create_with_listener(listener: textbox_listener): sort_items;
 
     # For the localhost / command-line demo
     static run_sort(items: item_list): item_list;
@@ -21,7 +20,3 @@ sort_items = interface +c {
 textbox_listener = interface +j +o {
     update(items: item_list);
 }
-
-textbox_reset_listener = interface +j +o {
-    reset(text: string);
-}
diff --git a/example/generated-src/cpp/sort_items.hpp b/example/generated-src/cpp/sort_items.hpp
index a61501da4..a01d3936c 100644
--- a/example/generated-src/cpp/sort_items.hpp
+++ b/example/generated-src/cpp/sort_items.hpp
@@ -8,7 +8,6 @@
 namespace textsort {
 
 class TextboxListener;
-class TextboxResetListener;
 enum class sort_order;
 struct ItemList;
 
@@ -19,9 +18,7 @@ class SortItems {
     /** For the iOS / Android demo */
     virtual void sort(sort_order order, const ItemList & items) = 0;
 
-    virtual void reset() = 0;
-
-    static std::shared_ptr<SortItems> create_with_listener(const std::shared_ptr<TextboxListener> & listener, const std::shared_ptr<TextboxResetListener> & reset_listener);
+    static std::shared_ptr<SortItems> create_with_listener(const std::shared_ptr<TextboxListener> & listener);
 
     /** For the localhost / command-line demo */
     static ItemList run_sort(const ItemList & items);
diff --git a/example/generated-src/cpp/textbox_reset_listener.hpp b/example/generated-src/cpp/textbox_reset_listener.hpp
deleted file mode 100644
index 9d5f7d2f0..000000000
--- a/example/generated-src/cpp/textbox_reset_listener.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-// AUTOGENERATED FILE - DO NOT MODIFY!
-// This file generated by Djinni from example.djinni
-
-#pragma once
-
-#include <string>
-
-namespace textsort {
-
-class TextboxResetListener {
-public:
-    virtual ~TextboxResetListener() {}
-
-    virtual void reset(const std::string & text) = 0;
-};
-
-}  // namespace textsort
diff --git a/example/generated-src/java/com/dropbox/textsort/SortItems.java b/example/generated-src/java/com/dropbox/textsort/SortItems.java
index 83fa2d672..beeef710c 100644
--- a/example/generated-src/java/com/dropbox/textsort/SortItems.java
+++ b/example/generated-src/java/com/dropbox/textsort/SortItems.java
@@ -11,10 +11,8 @@
     /** For the iOS / Android demo */
     public abstract void sort(@Nonnull SortOrder order, @Nonnull ItemList items);
 
-    public abstract void reset();
-
     @CheckForNull
-    public static native SortItems createWithListener(@CheckForNull TextboxListener listener, @CheckForNull TextboxResetListener resetListener);
+    public static native SortItems createWithListener(@CheckForNull TextboxListener listener);
 
     /** For the localhost / command-line demo */
     @Nonnull
@@ -50,13 +48,5 @@ public void sort(SortOrder order, ItemList items)
             native_sort(this.nativeRef, order, items);
         }
         private native void native_sort(long _nativeRef, SortOrder order, ItemList items);
-
-        @Override
-        public void reset()
-        {
-            assert !this.destroyed.get() : "trying to use a destroyed object";
-            native_reset(this.nativeRef);
-        }
-        private native void native_reset(long _nativeRef);
     }
 }
diff --git a/example/generated-src/java/com/dropbox/textsort/TextboxResetListener.java b/example/generated-src/java/com/dropbox/textsort/TextboxResetListener.java
deleted file mode 100644
index 10c2ce40f..000000000
--- a/example/generated-src/java/com/dropbox/textsort/TextboxResetListener.java
+++ /dev/null
@@ -1,11 +0,0 @@
-// AUTOGENERATED FILE - DO NOT MODIFY!
-// This file generated by Djinni from example.djinni
-
-package com.dropbox.textsort;
-
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
-/*package*/ abstract class TextboxResetListener {
-    public abstract void reset(@Nonnull String text);
-}
diff --git a/example/generated-src/jni/NativeSortItems.cpp b/example/generated-src/jni/NativeSortItems.cpp
index 3421cd52e..03162cc5e 100644
--- a/example/generated-src/jni/NativeSortItems.cpp
+++ b/example/generated-src/jni/NativeSortItems.cpp
@@ -5,7 +5,6 @@
 #include "NativeItemList.hpp"
 #include "NativeSortOrder.hpp"
 #include "NativeTextboxListener.hpp"
-#include "NativeTextboxResetListener.hpp"
 
 namespace djinni_generated {
 
@@ -32,21 +31,11 @@ CJNIEXPORT void JNICALL Java_com_dropbox_textsort_SortItems_00024CppProxy_native
     } JNI_TRANSLATE_EXCEPTIONS_RETURN(jniEnv, )
 }
 
-CJNIEXPORT void JNICALL Java_com_dropbox_textsort_SortItems_00024CppProxy_native_1reset(JNIEnv* jniEnv, jobject /*this*/, jlong nativeRef)
-{
-    try {
-        DJINNI_FUNCTION_PROLOGUE1(jniEnv, nativeRef);
-        const auto& ref = ::djinni::objectFromHandleAddress<::textsort::SortItems>(nativeRef);
-        ref->reset();
-    } JNI_TRANSLATE_EXCEPTIONS_RETURN(jniEnv, )
-}
-
-CJNIEXPORT jobject JNICALL Java_com_dropbox_textsort_SortItems_createWithListener(JNIEnv* jniEnv, jobject /*this*/, jobject j_listener, jobject j_resetListener)
+CJNIEXPORT jobject JNICALL Java_com_dropbox_textsort_SortItems_createWithListener(JNIEnv* jniEnv, jobject /*this*/, jobject j_listener)
 {
     try {
         DJINNI_FUNCTION_PROLOGUE0(jniEnv);
-        auto r = ::textsort::SortItems::create_with_listener(::djinni_generated::NativeTextboxListener::toCpp(jniEnv, j_listener),
-                                                             ::djinni_generated::NativeTextboxResetListener::toCpp(jniEnv, j_resetListener));
+        auto r = ::textsort::SortItems::create_with_listener(::djinni_generated::NativeTextboxListener::toCpp(jniEnv, j_listener));
         return ::djinni::release(::djinni_generated::NativeSortItems::fromCpp(jniEnv, r));
     } JNI_TRANSLATE_EXCEPTIONS_RETURN(jniEnv, 0 /* value doesn't matter */)
 }
diff --git a/example/generated-src/jni/NativeTextboxResetListener.cpp b/example/generated-src/jni/NativeTextboxResetListener.cpp
deleted file mode 100644
index cde92ff3b..000000000
--- a/example/generated-src/jni/NativeTextboxResetListener.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-// AUTOGENERATED FILE - DO NOT MODIFY!
-// This file generated by Djinni from example.djinni
-
-#include "NativeTextboxResetListener.hpp"  // my header
-#include "Marshal.hpp"
-
-namespace djinni_generated {
-
-NativeTextboxResetListener::NativeTextboxResetListener() : ::djinni::JniInterface<::textsort::TextboxResetListener, NativeTextboxResetListener>() {}
-
-NativeTextboxResetListener::~NativeTextboxResetListener() = default;
-
-NativeTextboxResetListener::JavaProxy::JavaProxy(JniType j) : Handle(::djinni::jniGetThreadEnv(), j) { }
-
-NativeTextboxResetListener::JavaProxy::~JavaProxy() = default;
-
-void NativeTextboxResetListener::JavaProxy::reset(const std::string & c_text) {
-    auto jniEnv = ::djinni::jniGetThreadEnv();
-    ::djinni::JniLocalScope jscope(jniEnv, 10);
-    const auto& data = ::djinni::JniClass<::djinni_generated::NativeTextboxResetListener>::get();
-    jniEnv->CallVoidMethod(Handle::get().get(), data.method_reset,
-                           ::djinni::get(::djinni::String::fromCpp(jniEnv, c_text)));
-    ::djinni::jniExceptionCheck(jniEnv);
-}
-
-}  // namespace djinni_generated
diff --git a/example/generated-src/jni/NativeTextboxResetListener.hpp b/example/generated-src/jni/NativeTextboxResetListener.hpp
deleted file mode 100644
index 63d1ae10e..000000000
--- a/example/generated-src/jni/NativeTextboxResetListener.hpp
+++ /dev/null
@@ -1,46 +0,0 @@
-// AUTOGENERATED FILE - DO NOT MODIFY!
-// This file generated by Djinni from example.djinni
-
-#pragma once
-
-#include "djinni_support.hpp"
-#include "textbox_reset_listener.hpp"
-
-namespace djinni_generated {
-
-class NativeTextboxResetListener final : ::djinni::JniInterface<::textsort::TextboxResetListener, NativeTextboxResetListener> {
-public:
-    using CppType = std::shared_ptr<::textsort::TextboxResetListener>;
-    using CppOptType = std::shared_ptr<::textsort::TextboxResetListener>;
-    using JniType = jobject;
-
-    using Boxed = NativeTextboxResetListener;
-
-    ~NativeTextboxResetListener();
-
-    static CppType toCpp(JNIEnv* jniEnv, JniType j) { return ::djinni::JniClass<NativeTextboxResetListener>::get()._fromJava(jniEnv, j); }
-    static ::djinni::LocalRef<JniType> fromCppOpt(JNIEnv* jniEnv, const CppOptType& c) { return {jniEnv, ::djinni::JniClass<NativeTextboxResetListener>::get()._toJava(jniEnv, c)}; }
-    static ::djinni::LocalRef<JniType> fromCpp(JNIEnv* jniEnv, const CppType& c) { return fromCppOpt(jniEnv, c); }
-
-private:
-    NativeTextboxResetListener();
-    friend ::djinni::JniClass<NativeTextboxResetListener>;
-    friend ::djinni::JniInterface<::textsort::TextboxResetListener, NativeTextboxResetListener>;
-
-    class JavaProxy final : ::djinni::JavaProxyHandle<JavaProxy>, public ::textsort::TextboxResetListener
-    {
-    public:
-        JavaProxy(JniType j);
-        ~JavaProxy();
-
-        void reset(const std::string & text) override;
-
-    private:
-        friend ::djinni::JniInterface<::textsort::TextboxResetListener, ::djinni_generated::NativeTextboxResetListener>;
-    };
-
-    const ::djinni::GlobalRef<jclass> clazz { ::djinni::jniFindClass("com/dropbox/textsort/TextboxResetListener") };
-    const jmethodID method_reset { ::djinni::jniGetMethodID(clazz.get(), "reset", "(Ljava/lang/String;)V") };
-};
-
-}  // namespace djinni_generated
diff --git a/example/generated-src/objc/TXSSortItems+Private.mm b/example/generated-src/objc/TXSSortItems+Private.mm
index 32ede9304..9368ce974 100644
--- a/example/generated-src/objc/TXSSortItems+Private.mm
+++ b/example/generated-src/objc/TXSSortItems+Private.mm
@@ -8,7 +8,6 @@
 #import "TXSItemList+Private.h"
 #import "TXSSortOrder+Private.h"
 #import "TXSTextboxListener+Private.h"
-#import "TXSTextboxResetListener+Private.h"
 #include <exception>
 #include <stdexcept>
 #include <utility>
@@ -41,17 +40,9 @@ - (void)sort:(TXSSortOrder)order
     } DJINNI_TRANSLATE_EXCEPTIONS()
 }
 
-- (void)reset {
++ (nullable TXSSortItems *)createWithListener:(nullable id<TXSTextboxListener>)listener {
     try {
-        _cppRefHandle.get()->reset();
-    } DJINNI_TRANSLATE_EXCEPTIONS()
-}
-
-+ (nullable TXSSortItems *)createWithListener:(nullable id<TXSTextboxListener>)listener
-                                resetListener:(nullable id<TXSTextboxResetListener>)resetListener {
-    try {
-        auto objcpp_result_ = ::textsort::SortItems::create_with_listener(::djinni_generated::TextboxListener::toCpp(listener),
-                                                                          ::djinni_generated::TextboxResetListener::toCpp(resetListener));
+        auto objcpp_result_ = ::textsort::SortItems::create_with_listener(::djinni_generated::TextboxListener::toCpp(listener));
         return ::djinni_generated::SortItems::fromCpp(objcpp_result_);
     } DJINNI_TRANSLATE_EXCEPTIONS()
 }
diff --git a/example/generated-src/objc/TXSSortItems.h b/example/generated-src/objc/TXSSortItems.h
index 7935b1591..f1da466bc 100644
--- a/example/generated-src/objc/TXSSortItems.h
+++ b/example/generated-src/objc/TXSSortItems.h
@@ -6,7 +6,6 @@
 #import <Foundation/Foundation.h>
 @class TXSSortItems;
 @protocol TXSTextboxListener;
-@protocol TXSTextboxResetListener;
 
 
 @interface TXSSortItems : NSObject
@@ -15,10 +14,7 @@
 - (void)sort:(TXSSortOrder)order
        items:(nonnull TXSItemList *)items;
 
-- (void)reset;
-
-+ (nullable TXSSortItems *)createWithListener:(nullable id<TXSTextboxListener>)listener
-                                resetListener:(nullable id<TXSTextboxResetListener>)resetListener;
++ (nullable TXSSortItems *)createWithListener:(nullable id<TXSTextboxListener>)listener;
 
 /** For the localhost / command-line demo */
 + (nonnull TXSItemList *)runSort:(nonnull TXSItemList *)items;
diff --git a/example/generated-src/objc/TXSTextboxResetListener+Private.h b/example/generated-src/objc/TXSTextboxResetListener+Private.h
deleted file mode 100644
index ab7ce68c7..000000000
--- a/example/generated-src/objc/TXSTextboxResetListener+Private.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// AUTOGENERATED FILE - DO NOT MODIFY!
-// This file generated by Djinni from example.djinni
-
-#include "textbox_reset_listener.hpp"
-#include <memory>
-
-static_assert(__has_feature(objc_arc), "Djinni requires ARC to be enabled for this file");
-
-@protocol TXSTextboxResetListener;
-
-namespace djinni_generated {
-
-class TextboxResetListener
-{
-public:
-    using CppType = std::shared_ptr<::textsort::TextboxResetListener>;
-    using CppOptType = std::shared_ptr<::textsort::TextboxResetListener>;
-    using ObjcType = id<TXSTextboxResetListener>;
-
-    using Boxed = TextboxResetListener;
-
-    static CppType toCpp(ObjcType objc);
-    static ObjcType fromCppOpt(const CppOptType& cpp);
-    static ObjcType fromCpp(const CppType& cpp) { return fromCppOpt(cpp); }
-
-private:
-    class ObjcProxy;
-};
-
-}  // namespace djinni_generated
-
diff --git a/example/generated-src/objc/TXSTextboxResetListener+Private.mm b/example/generated-src/objc/TXSTextboxResetListener+Private.mm
deleted file mode 100644
index a955e6a79..000000000
--- a/example/generated-src/objc/TXSTextboxResetListener+Private.mm
+++ /dev/null
@@ -1,49 +0,0 @@
-// AUTOGENERATED FILE - DO NOT MODIFY!
-// This file generated by Djinni from example.djinni
-
-#import "TXSTextboxResetListener+Private.h"
-#import "TXSTextboxResetListener.h"
-#import "DJIMarshal+Private.h"
-#import "DJIObjcWrapperCache+Private.h"
-#include <stdexcept>
-
-static_assert(__has_feature(objc_arc), "Djinni requires ARC to be enabled for this file");
-
-namespace djinni_generated {
-
-class TextboxResetListener::ObjcProxy final
-: public ::textsort::TextboxResetListener
-, private ::djinni::ObjcProxyBase<ObjcType>
-{
-    friend class ::djinni_generated::TextboxResetListener;
-public:
-    using ObjcProxyBase::ObjcProxyBase;
-    void reset(const std::string & c_text) override
-    {
-        @autoreleasepool {
-            [djinni_private_get_proxied_objc_object() reset:(::djinni::String::fromCpp(c_text))];
-        }
-    }
-};
-
-}  // namespace djinni_generated
-
-namespace djinni_generated {
-
-auto TextboxResetListener::toCpp(ObjcType objc) -> CppType
-{
-    if (!objc) {
-        return nullptr;
-    }
-    return ::djinni::get_objc_proxy<ObjcProxy>(objc);
-}
-
-auto TextboxResetListener::fromCppOpt(const CppOptType& cpp) -> ObjcType
-{
-    if (!cpp) {
-        return nil;
-    }
-    return dynamic_cast<ObjcProxy&>(*cpp).djinni_private_get_proxied_objc_object();
-}
-
-}  // namespace djinni_generated
diff --git a/example/generated-src/objc/TXSTextboxResetListener.h b/example/generated-src/objc/TXSTextboxResetListener.h
deleted file mode 100644
index c0c97bcc8..000000000
--- a/example/generated-src/objc/TXSTextboxResetListener.h
+++ /dev/null
@@ -1,11 +0,0 @@
-// AUTOGENERATED FILE - DO NOT MODIFY!
-// This file generated by Djinni from example.djinni
-
-#import <Foundation/Foundation.h>
-
-
-@protocol TXSTextboxResetListener
-
-- (void)reset:(nonnull NSString *)text;
-
-@end
diff --git a/example/generated-src/objc/TextSort-Bridging-Header.h b/example/generated-src/objc/TextSort-Bridging-Header.h
index d10919685..bad025562 100644
--- a/example/generated-src/objc/TextSort-Bridging-Header.h
+++ b/example/generated-src/objc/TextSort-Bridging-Header.h
@@ -5,4 +5,3 @@
 #import "TXSSortOrder.h"
 #import "TXSSortItems.h"
 #import "TXSTextboxListener.h"
-#import "TXSTextboxResetListener.h"
diff --git a/example/handwritten-src/cpp/sort_items_impl.cpp b/example/handwritten-src/cpp/sort_items_impl.cpp
index 3d9b164a0..2ee7bead8 100644
--- a/example/handwritten-src/cpp/sort_items_impl.cpp
+++ b/example/handwritten-src/cpp/sort_items_impl.cpp
@@ -8,24 +8,14 @@
 
 namespace textsort {
 
-std::shared_ptr<SortItems> SortItems::create_with_listener(const std::shared_ptr<TextboxListener> & listener, const std::shared_ptr<TextboxResetListener> & reset_listener) {
-    return std::make_shared<SortItemsImpl>(listener, reset_listener);
+std::shared_ptr<SortItems> SortItems::create_with_listener(const std::shared_ptr<TextboxListener>& listener) {
+    return std::make_shared<SortItemsImpl>(listener);
 }
 
-SortItemsImpl::SortItemsImpl (const std::shared_ptr<TextboxListener> & listener, const std::shared_ptr<TextboxResetListener> & reset_listener) {
+SortItemsImpl::SortItemsImpl (const std::shared_ptr<TextboxListener> & listener) {
     this->m_listener = listener;
-    this->m_reset_listener = reset_listener;
 }
 
-void SortItemsImpl::reset() {
-
-    std::string resetText = "Type the lines to sort";
-    
-    // Pass result to client interface
-    this->m_reset_listener->reset(resetText);
-
-}
-    
 void SortItemsImpl::sort(sort_order order, const ItemList & items) {
     auto lines = items.items;
     switch (order) {
diff --git a/example/handwritten-src/cpp/sort_items_impl.hpp b/example/handwritten-src/cpp/sort_items_impl.hpp
index 976bcb66a..56e91ff55 100644
--- a/example/handwritten-src/cpp/sort_items_impl.hpp
+++ b/example/handwritten-src/cpp/sort_items_impl.hpp
@@ -2,20 +2,17 @@
 
 #include "sort_items.hpp"
 #include "textbox_listener.hpp"
-#include "textbox_reset_listener.hpp"
 
 namespace textsort {
 
 class SortItemsImpl : public SortItems {
 
 public:
-    SortItemsImpl(const std::shared_ptr<TextboxListener> & listener, const std::shared_ptr<TextboxResetListener> & reset_listener);
-    virtual void reset() override;
+    SortItemsImpl(const std::shared_ptr<TextboxListener> & listener);
     virtual void sort(sort_order order, const ItemList & items) override;
 
 private:
     std::shared_ptr<TextboxListener> m_listener;
-    std::shared_ptr<TextboxResetListener> m_reset_listener;
 
 };
 
diff --git a/example/handwritten-src/java/com/dropbox/textsort/MainActivity.java b/example/handwritten-src/java/com/dropbox/textsort/MainActivity.java
index 073edd9ac..e23d9d933 100644
--- a/example/handwritten-src/java/com/dropbox/textsort/MainActivity.java
+++ b/example/handwritten-src/java/com/dropbox/textsort/MainActivity.java
@@ -13,7 +13,6 @@ public class MainActivity extends Activity {
     private EditText text;
     private SortItems sortItemsInterface;
     private TextboxListener textboxListener;
-    private TextboxResetListener textboxResetListener;
 
     static {
         System.loadLibrary("textsort_jni");
@@ -26,13 +25,8 @@ protected void onCreate(Bundle savedInstanceState) {
 
         text = (EditText) findViewById(R.id.editText);
         textboxListener = new TextboxListenerImpl(text);
-        textboxResetListener = new TextboxResetListenerImpl(text);
         // Call JNI to initiate the SortItems object from the given textboxListener and translate to Java
-        sortItemsInterface = SortItems.createWithListener(textboxListener, textboxResetListener);
-    }
-
-    public void reset(View view) {
-        sortItemsInterface.reset();
+        sortItemsInterface = SortItems.createWithListener(textboxListener);
     }
 
     public void sort(SortOrder order) {
diff --git a/example/handwritten-src/java/com/dropbox/textsort/TextboxResetListenerImpl.java b/example/handwritten-src/java/com/dropbox/textsort/TextboxResetListenerImpl.java
deleted file mode 100644
index b8fbf7b59..000000000
--- a/example/handwritten-src/java/com/dropbox/textsort/TextboxResetListenerImpl.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.dropbox.textsort;
-
-import android.widget.EditText;
-
-public class TextboxResetListenerImpl extends TextboxResetListener {
-
-    private EditText mTextArea;
-
-    public TextboxResetListenerImpl(EditText textArea) {
-        this.mTextArea = textArea;
-    }
-
-    @Override
-    public void reset(String text) {
-        mTextArea.setText(text);
-    }
-
-}
diff --git a/example/handwritten-src/objc/TXSViewController.m b/example/handwritten-src/objc/TXSViewController.m
index 0816191d9..fc70b8d0c 100644
--- a/example/handwritten-src/objc/TXSViewController.m
+++ b/example/handwritten-src/objc/TXSViewController.m
@@ -1,8 +1,8 @@
 #import "TXSItemList.h"
 #import "TXSSortItems.h"
-#import "TXSTextboxListenerImpl.h"
-#import "TXSViewController.h"
 #import "TextSort-Swift.h"
+#import "TXSViewController.h"
+#import "TXSTextboxListener.h"
 
 #import <QuartzCore/QuartzCore.h>
 
@@ -17,7 +17,6 @@ @interface TXSViewController ()
 @implementation TXSViewController {
     TXSSortItems* _sortItemInterface;
     id <TXSTextboxListener> _textboxListener;
-    id <TXSTextboxResetListener> _textboxResetListener;
 }
 
 - (void)viewDidLoad
@@ -36,13 +35,7 @@ - (void)viewDidLoad
 
     // Create the Objective-C TXSTextboxListener
     _textboxListener = [[TXSTextboxListenerImpl alloc] initWithUITextView:self.textView];
-    _textboxResetListener = [[TXSTextboxResetListenerImpl alloc] initWithUITextView:self.textView];
-    _sortItemInterface = [TXSSortItems createWithListener:_textboxListener resetListener:_textboxResetListener];
-}
-
-- (IBAction)reset:(id)sender
-{
-    [_sortItemInterface reset];
+    _sortItemInterface = [TXSSortItems createWithListener:_textboxListener];
 }
 
 - (IBAction)sort:(id)sender
diff --git a/example/handwritten-src/swift/TXSTextboxListenerImpl.swift b/example/handwritten-src/swift/TXSTextboxListenerImpl.swift
new file mode 100644
index 000000000..25f714cbe
--- /dev/null
+++ b/example/handwritten-src/swift/TXSTextboxListenerImpl.swift
@@ -0,0 +1,22 @@
+//
+//  TXSTextboxListenerImpl.swift
+//  TextSort
+//
+//  Created by Bruno Coelho on 10/03/2017.
+//  Copyright © 2017 Dropbox, Inc. All rights reserved.
+//
+
+import UIKit
+
+@objc class TXSTextboxListenerImpl : NSObject, TXSTextboxListener {
+    private var textView_: UITextView
+    
+    @objc(initWithUITextView:)
+    init (textView: UITextView) {
+        textView_ = textView
+    }
+    
+    @objc func update(_ items: TXSItemList) {
+        textView_.text = items.items.joined(separator: "\n")
+    }
+}
diff --git a/example/handwritten-src/swift/TXSTextboxResetListenerImpl.swift b/example/handwritten-src/swift/TXSTextboxResetListenerImpl.swift
deleted file mode 100644
index 51bc872cd..000000000
--- a/example/handwritten-src/swift/TXSTextboxResetListenerImpl.swift
+++ /dev/null
@@ -1,14 +0,0 @@
-import UIKit
-
-@objc class TXSTextboxResetListenerImpl : NSObject, TXSTextboxResetListener {
-    private var textView_: UITextView
-    
-    @objc(initWithUITextView:)
-    init (textView: UITextView) {
-        textView_ = textView
-    }
-    
-    func reset(_ text: String) {
-        textView_.text = text
-    }
-}
diff --git a/example/objc/TextSort.xcodeproj/project.pbxproj b/example/objc/TextSort.xcodeproj/project.pbxproj
index f6d0d3bb3..b76a6b645 100644
--- a/example/objc/TextSort.xcodeproj/project.pbxproj
+++ b/example/objc/TextSort.xcodeproj/project.pbxproj
@@ -17,7 +17,7 @@
 		65D7FDFB19AD0CDF0038F82F /* TXSAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 65D7FDF519AD0CDF0038F82F /* TXSAppDelegate.m */; };
 		65D7FDFC19AD0CDF0038F82F /* TXSTextboxListenerImpl.m in Sources */ = {isa = PBXBuildFile; fileRef = 65D7FDF719AD0CDF0038F82F /* TXSTextboxListenerImpl.m */; };
 		65D7FDFD19AD0CDF0038F82F /* TXSViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 65D7FDF919AD0CDF0038F82F /* TXSViewController.m */; };
-		A546A26E1E72FBAF004A8BBD /* TXSTextboxResetListenerImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = A546A26D1E72FBAF004A8BBD /* TXSTextboxResetListenerImpl.swift */; };
+		A546A26E1E72FBAF004A8BBD /* TXSTextboxListenerImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = A546A26D1E72FBAF004A8BBD /* TXSTextboxListenerImpl.swift */; };
 		B003051919B70561008E1F67 /* libdjinni_objc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B003051819B70561008E1F67 /* libdjinni_objc.a */; };
 		B097B6BC19B1C07E0047653A /* libtextsort_objc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B097B6BB19B1C07E0047653A /* libtextsort_objc.a */; };
 /* End PBXBuildFile section */
@@ -39,7 +39,7 @@
 		65D7FDF719AD0CDF0038F82F /* TXSTextboxListenerImpl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TXSTextboxListenerImpl.m; sourceTree = "<group>"; };
 		65D7FDF819AD0CDF0038F82F /* TXSViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TXSViewController.h; sourceTree = "<group>"; };
 		65D7FDF919AD0CDF0038F82F /* TXSViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TXSViewController.m; sourceTree = "<group>"; };
-		A546A26D1E72FBAF004A8BBD /* TXSTextboxResetListenerImpl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TXSTextboxResetListenerImpl.swift; path = "../handwritten-src/swift/TXSTextboxResetListenerImpl.swift"; sourceTree = "<group>"; };
+		A546A26D1E72FBAF004A8BBD /* TXSTextboxListenerImpl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TXSTextboxListenerImpl.swift; path = "../handwritten-src/swift/TXSTextboxListenerImpl.swift"; sourceTree = "<group>"; };
 		B003051819B70561008E1F67 /* libdjinni_objc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libdjinni_objc.a; path = "../../support-lib/build/Debug-iphoneos/libdjinni_objc.a"; sourceTree = "<group>"; };
 		B097B6BB19B1C07E0047653A /* libtextsort_objc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtextsort_objc.a; path = "../../build/Debug-iphoneos/libtextsort_objc.a"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -129,7 +129,7 @@
 		A546A26A1E72F967004A8BBD /* handwritten-swift */ = {
 			isa = PBXGroup;
 			children = (
-				A546A26D1E72FBAF004A8BBD /* TXSTextboxResetListenerImpl.swift */,
+				A546A26D1E72FBAF004A8BBD /* TXSTextboxListenerImpl.swift */,
 			);
 			name = "handwritten-swift";
 			sourceTree = "<group>";
@@ -208,7 +208,7 @@
 				65D7FDFC19AD0CDF0038F82F /* TXSTextboxListenerImpl.m in Sources */,
 				65D7FDFB19AD0CDF0038F82F /* TXSAppDelegate.m in Sources */,
 				65D7FDFD19AD0CDF0038F82F /* TXSViewController.m in Sources */,
-				A546A26E1E72FBAF004A8BBD /* TXSTextboxResetListenerImpl.swift in Sources */,
+				A546A26E1E72FBAF004A8BBD /* TXSTextboxListenerImpl.swift in Sources */,
 				65D7FDFA19AD0CDF0038F82F /* main.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/example/objc/TextSort/Base.lproj/Main_iPhone.storyboard b/example/objc/TextSort/Base.lproj/Main_iPhone.storyboard
index c8d94c76d..aede50b64 100644
--- a/example/objc/TextSort/Base.lproj/Main_iPhone.storyboard
+++ b/example/objc/TextSort/Base.lproj/Main_iPhone.storyboard
@@ -1,13 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12118" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="vXZ-lx-hvc">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7531" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="vXZ-lx-hvc">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12086"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7520"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
@@ -19,57 +15,48 @@
                         <viewControllerLayoutGuide type="bottom" id="2fi-mo-0CV"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="kh9-bI-dsS">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
                             <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" text="Type the lines to sort" translatesAutoresizingMaskIntoConstraints="NO" id="GOB-Ok-Z2R">
-                                <rect key="frame" x="16" y="28" width="343" height="581"/>
-                                <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <rect key="frame" x="16" y="28" width="288" height="482"/>
+                                <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                             </textView>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="A93-rB-AZ4">
-                                <rect key="frame" x="106" y="617" width="30" height="30"/>
+                            <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="A93-rB-AZ4">
+                                <rect key="frame" x="54" y="518" width="60" height="30"/>
                                 <state key="normal" title="Sort">
-                                    <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                 </state>
                                 <connections>
                                     <action selector="sort:" destination="vXZ-lx-hvc" eventType="touchUpInside" id="JmD-7I-e8t"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="81n-2H-7fH">
-                                <rect key="frame" x="144" y="617" width="88" height="30"/>
+                            <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="81n-2H-7fH">
+                                <rect key="frame" x="104" y="518" width="113" height="30"/>
                                 <state key="normal" title="Reverse Sort">
-                                    <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                 </state>
                                 <connections>
                                     <action selector="reverseSort:" destination="vXZ-lx-hvc" eventType="touchUpInside" id="3ph-FD-T7F"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cv7-dA-P8a">
-                                <rect key="frame" x="240" y="617" width="57" height="30"/>
+                            <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cv7-dA-P8a">
+                                <rect key="frame" x="225" y="518" width="60" height="30"/>
                                 <state key="normal" title="Random">
-                                    <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                 </state>
                                 <connections>
                                     <action selector="randomSort:" destination="vXZ-lx-hvc" eventType="touchUpInside" id="Qm2-PQ-ghk"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ujE-Fh-KYB">
-                                <rect key="frame" x="58" y="617" width="39" height="30"/>
-                                <state key="normal" title="Reset"/>
-                                <connections>
-                                    <action selector="reset:" destination="vXZ-lx-hvc" eventType="touchUpInside" id="aYB-V7-80Y"/>
-                                </connections>
-                            </button>
                         </subviews>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
                         <constraints>
-                            <constraint firstItem="ujE-Fh-KYB" firstAttribute="top" secondItem="A93-rB-AZ4" secondAttribute="top" id="4FY-bm-lFV"/>
                             <constraint firstItem="cv7-dA-P8a" firstAttribute="leading" secondItem="81n-2H-7fH" secondAttribute="trailing" constant="8" id="6k6-kS-Uv4"/>
                             <constraint firstItem="81n-2H-7fH" firstAttribute="baseline" secondItem="cv7-dA-P8a" secondAttribute="baseline" id="EDF-c5-6UY"/>
                             <constraint firstItem="GOB-Ok-Z2R" firstAttribute="trailing" secondItem="kh9-bI-dsS" secondAttribute="trailingMargin" id="FcW-gp-TKr"/>
-                            <constraint firstItem="A93-rB-AZ4" firstAttribute="leading" secondItem="ujE-Fh-KYB" secondAttribute="trailing" constant="9" id="Fhe-NE-isa"/>
                             <constraint firstItem="cv7-dA-P8a" firstAttribute="top" secondItem="GOB-Ok-Z2R" secondAttribute="bottom" constant="8" id="LWK-fr-cJv"/>
                             <constraint firstItem="81n-2H-7fH" firstAttribute="leading" secondItem="A93-rB-AZ4" secondAttribute="trailing" constant="8" id="M4F-4D-BXj"/>
                             <constraint firstItem="2fi-mo-0CV" firstAttribute="top" secondItem="81n-2H-7fH" secondAttribute="bottom" constant="20" id="Skf-gJ-Pvn"/>
@@ -92,6 +79,6 @@
     <simulatedMetricsContainer key="defaultSimulatedMetrics">
         <simulatedStatusBarMetrics key="statusBar"/>
         <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination" type="retina4_7.fullscreen"/>
+        <simulatedScreenMetrics key="destination" type="retina4"/>
     </simulatedMetricsContainer>
 </document>

From 7545e30dc1dbb5eab4b17e2b90e48fba69cebfdb Mon Sep 17 00:00:00 2001
From: Bruno Coelho <4brunu@gmail.com>
Date: Tue, 4 Apr 2017 17:21:00 +0100
Subject: [PATCH 34/56] Simplify iOS example

---
 .../handwritten-src/objc/TXSViewController.m  | 24 +++++++-
 ... => TXSTextboxListenerDebugableImpl.swift} |  6 +-
 .../objc/TextSort.xcodeproj/project.pbxproj   |  8 +--
 .../Base.lproj/Main_iPhone.storyboard         | 59 +++++++++++++------
 4 files changed, 71 insertions(+), 26 deletions(-)
 rename example/handwritten-src/swift/{TXSTextboxListenerImpl.swift => TXSTextboxListenerDebugableImpl.swift} (61%)

diff --git a/example/handwritten-src/objc/TXSViewController.m b/example/handwritten-src/objc/TXSViewController.m
index fc70b8d0c..fc1eaa305 100644
--- a/example/handwritten-src/objc/TXSViewController.m
+++ b/example/handwritten-src/objc/TXSViewController.m
@@ -1,6 +1,7 @@
 #import "TXSItemList.h"
 #import "TXSSortItems.h"
 #import "TextSort-Swift.h"
+#import "TXSTextboxListenerImpl.h"
 #import "TXSViewController.h"
 #import "TXSTextboxListener.h"
 
@@ -12,6 +13,8 @@ @interface TXSViewController ()
 
 @property (nonatomic) IBOutlet UIButton *button;
 
+@property (nonatomic) IBOutlet UISwitch *switchDebugMode;
+
 @end
 
 @implementation TXSViewController {
@@ -33,11 +36,28 @@ - (void)viewDidLoad
                                    action:@selector(dismissKeyboard)];
     [self.view addGestureRecognizer:tap];
 
-    // Create the Objective-C TXSTextboxListener
-    _textboxListener = [[TXSTextboxListenerImpl alloc] initWithUITextView:self.textView];
+    [self createSorter];
+}
+
+-(void)createSorter
+{
+    if (_switchDebugMode.isOn) {
+        // Create the Swift TXSTextboxListener
+        _textboxListener = [[TXSTextboxListenerDebugableImpl alloc] initWithUITextView:self.textView];
+    }
+    else {
+        // Create the Objective-C TXSTextboxListener
+        _textboxListener = [[TXSTextboxListenerImpl alloc] initWithUITextView:self.textView];
+    }
+    
     _sortItemInterface = [TXSSortItems createWithListener:_textboxListener];
 }
 
+-(IBAction)toggleDebugMode:(id)sender
+{
+    [self createSorter];
+}
+
 - (IBAction)sort:(id)sender
 {
     [self sortWithOrder:TXSSortOrderAscending];
diff --git a/example/handwritten-src/swift/TXSTextboxListenerImpl.swift b/example/handwritten-src/swift/TXSTextboxListenerDebugableImpl.swift
similarity index 61%
rename from example/handwritten-src/swift/TXSTextboxListenerImpl.swift
rename to example/handwritten-src/swift/TXSTextboxListenerDebugableImpl.swift
index 25f714cbe..bb432958a 100644
--- a/example/handwritten-src/swift/TXSTextboxListenerImpl.swift
+++ b/example/handwritten-src/swift/TXSTextboxListenerDebugableImpl.swift
@@ -8,7 +8,7 @@
 
 import UIKit
 
-@objc class TXSTextboxListenerImpl : NSObject, TXSTextboxListener {
+@objc class TXSTextboxListenerDebugableImpl : NSObject, TXSTextboxListener {
     private var textView_: UITextView
     
     @objc(initWithUITextView:)
@@ -17,6 +17,8 @@ import UIKit
     }
     
     @objc func update(_ items: TXSItemList) {
-        textView_.text = items.items.joined(separator: "\n")
+        let string = items.items.joined(separator: "\n")
+        print("TXSTextboxListenerDebugableImpl -> update \n\(string)")
+        textView_.text = string
     }
 }
diff --git a/example/objc/TextSort.xcodeproj/project.pbxproj b/example/objc/TextSort.xcodeproj/project.pbxproj
index b76a6b645..bb4cbb03a 100644
--- a/example/objc/TextSort.xcodeproj/project.pbxproj
+++ b/example/objc/TextSort.xcodeproj/project.pbxproj
@@ -17,7 +17,7 @@
 		65D7FDFB19AD0CDF0038F82F /* TXSAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 65D7FDF519AD0CDF0038F82F /* TXSAppDelegate.m */; };
 		65D7FDFC19AD0CDF0038F82F /* TXSTextboxListenerImpl.m in Sources */ = {isa = PBXBuildFile; fileRef = 65D7FDF719AD0CDF0038F82F /* TXSTextboxListenerImpl.m */; };
 		65D7FDFD19AD0CDF0038F82F /* TXSViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 65D7FDF919AD0CDF0038F82F /* TXSViewController.m */; };
-		A546A26E1E72FBAF004A8BBD /* TXSTextboxListenerImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = A546A26D1E72FBAF004A8BBD /* TXSTextboxListenerImpl.swift */; };
+		A546A26E1E72FBAF004A8BBD /* TXSTextboxListenerDebugableImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = A546A26D1E72FBAF004A8BBD /* TXSTextboxListenerDebugableImpl.swift */; };
 		B003051919B70561008E1F67 /* libdjinni_objc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B003051819B70561008E1F67 /* libdjinni_objc.a */; };
 		B097B6BC19B1C07E0047653A /* libtextsort_objc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B097B6BB19B1C07E0047653A /* libtextsort_objc.a */; };
 /* End PBXBuildFile section */
@@ -39,7 +39,7 @@
 		65D7FDF719AD0CDF0038F82F /* TXSTextboxListenerImpl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TXSTextboxListenerImpl.m; sourceTree = "<group>"; };
 		65D7FDF819AD0CDF0038F82F /* TXSViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TXSViewController.h; sourceTree = "<group>"; };
 		65D7FDF919AD0CDF0038F82F /* TXSViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TXSViewController.m; sourceTree = "<group>"; };
-		A546A26D1E72FBAF004A8BBD /* TXSTextboxListenerImpl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TXSTextboxListenerImpl.swift; path = "../handwritten-src/swift/TXSTextboxListenerImpl.swift"; sourceTree = "<group>"; };
+		A546A26D1E72FBAF004A8BBD /* TXSTextboxListenerDebugableImpl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TXSTextboxListenerDebugableImpl.swift; path = "../handwritten-src/swift/TXSTextboxListenerDebugableImpl.swift"; sourceTree = "<group>"; };
 		B003051819B70561008E1F67 /* libdjinni_objc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libdjinni_objc.a; path = "../../support-lib/build/Debug-iphoneos/libdjinni_objc.a"; sourceTree = "<group>"; };
 		B097B6BB19B1C07E0047653A /* libtextsort_objc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtextsort_objc.a; path = "../../build/Debug-iphoneos/libtextsort_objc.a"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -129,7 +129,7 @@
 		A546A26A1E72F967004A8BBD /* handwritten-swift */ = {
 			isa = PBXGroup;
 			children = (
-				A546A26D1E72FBAF004A8BBD /* TXSTextboxListenerImpl.swift */,
+				A546A26D1E72FBAF004A8BBD /* TXSTextboxListenerDebugableImpl.swift */,
 			);
 			name = "handwritten-swift";
 			sourceTree = "<group>";
@@ -208,7 +208,7 @@
 				65D7FDFC19AD0CDF0038F82F /* TXSTextboxListenerImpl.m in Sources */,
 				65D7FDFB19AD0CDF0038F82F /* TXSAppDelegate.m in Sources */,
 				65D7FDFD19AD0CDF0038F82F /* TXSViewController.m in Sources */,
-				A546A26E1E72FBAF004A8BBD /* TXSTextboxListenerImpl.swift in Sources */,
+				A546A26E1E72FBAF004A8BBD /* TXSTextboxListenerDebugableImpl.swift in Sources */,
 				65D7FDFA19AD0CDF0038F82F /* main.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/example/objc/TextSort/Base.lproj/Main_iPhone.storyboard b/example/objc/TextSort/Base.lproj/Main_iPhone.storyboard
index aede50b64..6eb29eb4f 100644
--- a/example/objc/TextSort/Base.lproj/Main_iPhone.storyboard
+++ b/example/objc/TextSort/Base.lproj/Main_iPhone.storyboard
@@ -1,9 +1,13 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7531" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="vXZ-lx-hvc">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12118" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="vXZ-lx-hvc">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7520"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12086"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
@@ -15,52 +19,69 @@
                         <viewControllerLayoutGuide type="bottom" id="2fi-mo-0CV"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="kh9-bI-dsS">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
                             <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" text="Type the lines to sort" translatesAutoresizingMaskIntoConstraints="NO" id="GOB-Ok-Z2R">
-                                <rect key="frame" x="16" y="28" width="288" height="482"/>
-                                <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                <rect key="frame" x="16" y="28" width="343" height="531"/>
+                                <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                             </textView>
-                            <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="A93-rB-AZ4">
-                                <rect key="frame" x="54" y="518" width="60" height="30"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="A93-rB-AZ4">
+                                <rect key="frame" x="105.5" y="567" width="30" height="30"/>
                                 <state key="normal" title="Sort">
-                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 </state>
                                 <connections>
                                     <action selector="sort:" destination="vXZ-lx-hvc" eventType="touchUpInside" id="JmD-7I-e8t"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="81n-2H-7fH">
-                                <rect key="frame" x="104" y="518" width="113" height="30"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="81n-2H-7fH">
+                                <rect key="frame" x="143.5" y="567" width="88" height="30"/>
                                 <state key="normal" title="Reverse Sort">
-                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 </state>
                                 <connections>
                                     <action selector="reverseSort:" destination="vXZ-lx-hvc" eventType="touchUpInside" id="3ph-FD-T7F"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cv7-dA-P8a">
-                                <rect key="frame" x="225" y="518" width="60" height="30"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cv7-dA-P8a">
+                                <rect key="frame" x="239.5" y="567" width="57" height="30"/>
                                 <state key="normal" title="Random">
-                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                    <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 </state>
                                 <connections>
                                     <action selector="randomSort:" destination="vXZ-lx-hvc" eventType="touchUpInside" id="Qm2-PQ-ghk"/>
                                 </connections>
                             </button>
+                            <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="DNu-UL-kyQ">
+                                <rect key="frame" x="16" y="612" width="51" height="31"/>
+                                <connections>
+                                    <action selector="toggleDebugMode:" destination="vXZ-lx-hvc" eventType="valueChanged" id="saA-Gv-pMA"/>
+                                </connections>
+                            </switch>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Debug mode" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GQQ-Bh-tdD">
+                                <rect key="frame" x="73" y="617" width="286" height="21"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
                         </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="cv7-dA-P8a" firstAttribute="leading" secondItem="81n-2H-7fH" secondAttribute="trailing" constant="8" id="6k6-kS-Uv4"/>
                             <constraint firstItem="81n-2H-7fH" firstAttribute="baseline" secondItem="cv7-dA-P8a" secondAttribute="baseline" id="EDF-c5-6UY"/>
                             <constraint firstItem="GOB-Ok-Z2R" firstAttribute="trailing" secondItem="kh9-bI-dsS" secondAttribute="trailingMargin" id="FcW-gp-TKr"/>
                             <constraint firstItem="cv7-dA-P8a" firstAttribute="top" secondItem="GOB-Ok-Z2R" secondAttribute="bottom" constant="8" id="LWK-fr-cJv"/>
                             <constraint firstItem="81n-2H-7fH" firstAttribute="leading" secondItem="A93-rB-AZ4" secondAttribute="trailing" constant="8" id="M4F-4D-BXj"/>
-                            <constraint firstItem="2fi-mo-0CV" firstAttribute="top" secondItem="81n-2H-7fH" secondAttribute="bottom" constant="20" id="Skf-gJ-Pvn"/>
+                            <constraint firstItem="DNu-UL-kyQ" firstAttribute="leading" secondItem="kh9-bI-dsS" secondAttribute="leadingMargin" id="O7c-MW-i3e"/>
+                            <constraint firstItem="DNu-UL-kyQ" firstAttribute="centerY" secondItem="GQQ-Bh-tdD" secondAttribute="centerY" id="OmV-xh-MjX"/>
+                            <constraint firstItem="GQQ-Bh-tdD" firstAttribute="top" secondItem="81n-2H-7fH" secondAttribute="bottom" constant="20" id="P8h-HO-l5l"/>
+                            <constraint firstItem="2fi-mo-0CV" firstAttribute="top" secondItem="81n-2H-7fH" secondAttribute="bottom" constant="70" id="Skf-gJ-Pvn"/>
                             <constraint firstAttribute="centerX" secondItem="81n-2H-7fH" secondAttribute="centerX" id="dPr-yc-eNh"/>
+                            <constraint firstItem="GQQ-Bh-tdD" firstAttribute="leading" secondItem="DNu-UL-kyQ" secondAttribute="trailing" constant="8" id="jez-lS-j5y"/>
+                            <constraint firstAttribute="trailingMargin" secondItem="GQQ-Bh-tdD" secondAttribute="trailing" id="pDH-RO-DoJ"/>
                             <constraint firstItem="GOB-Ok-Z2R" firstAttribute="top" secondItem="jyV-Pf-zRb" secondAttribute="bottom" constant="8" id="r9O-jI-RXe"/>
                             <constraint firstItem="81n-2H-7fH" firstAttribute="baseline" secondItem="A93-rB-AZ4" secondAttribute="baseline" id="sDL-eI-t03"/>
                             <constraint firstItem="GOB-Ok-Z2R" firstAttribute="leading" secondItem="kh9-bI-dsS" secondAttribute="leadingMargin" id="ykx-tI-cFm"/>
@@ -69,16 +90,18 @@
                     <navigationItem key="navigationItem" id="LTz-Tk-BIg"/>
                     <connections>
                         <outlet property="button" destination="A93-rB-AZ4" id="WYY-v8-55y"/>
+                        <outlet property="switchDebugMode" destination="DNu-UL-kyQ" id="zWL-2v-leX"/>
                         <outlet property="textView" destination="GOB-Ok-Z2R" id="fKy-K6-TxA"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="x5A-6p-PRh" sceneMemberID="firstResponder"/>
             </objects>
+            <point key="canvasLocation" x="26.5" y="34.5"/>
         </scene>
     </scenes>
     <simulatedMetricsContainer key="defaultSimulatedMetrics">
         <simulatedStatusBarMetrics key="statusBar"/>
         <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination" type="retina4"/>
+        <simulatedScreenMetrics key="destination" type="retina4_7.fullscreen"/>
     </simulatedMetricsContainer>
 </document>

From 9400d376568f12b48ae165f01caf31791c1f1cfc Mon Sep 17 00:00:00 2001
From: Bruno Coelho <4brunu@gmail.com>
Date: Tue, 4 Apr 2017 17:27:46 +0100
Subject: [PATCH 35/56] revert unintended generator change

---
 src/source/generator.scala | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/source/generator.scala b/src/source/generator.scala
index fcd9d811f..8261400a7 100644
--- a/src/source/generator.scala
+++ b/src/source/generator.scala
@@ -170,8 +170,7 @@ package object generatorTools {
   case class GenerateException(message: String) extends java.lang.Exception(message)
 
   def createFolder(name: String, folder: File) {
-    val sucess = folder.mkdirs()
-
+    folder.mkdirs()
     if (folder.exists) {
       if (!folder.isDirectory) {
         throw new GenerateException(s"Unable to create $name folder at ${q(folder.getPath)}, there's something in the way.")

From 8528ff9085f76dc0a9cd9779b44dca127b3906b9 Mon Sep 17 00:00:00 2001
From: Bruno Coelho <4brunu@gmail.com>
Date: Tue, 4 Apr 2017 18:14:47 +0100
Subject: [PATCH 36/56] move CMakeLists.txt file to root directory and rename
 target name to djinni_support_lib

---
 CMakeLists.txt             | 72 +++++++++++++++++++++++++++++++++++++
 support-lib/CMakeLists.txt | 74 --------------------------------------
 2 files changed, 72 insertions(+), 74 deletions(-)
 create mode 100644 CMakeLists.txt
 delete mode 100644 support-lib/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 000000000..90564bae0
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,72 @@
+cmake_minimum_required(VERSION 3.6.0)
+
+project(djinni_support_lib)
+
+include(GNUInstallDirs)
+
+set(SRC_SHARED
+  "support-lib/djinni_common.hpp"
+  "support-lib/proxy_cache_interface.hpp"
+  "support-lib/proxy_cache_impl.hpp"
+)
+
+set(SRC_JNI
+  "support-lib/jni/djinni_support.hpp"
+  "support-lib/jni/Marshal.hpp"
+  "support-lib/jni/djinni_support.cpp"
+)
+
+set(SRC_OBJC
+  "support-lib/objc/DJICppWrapperCache+Private.h"
+  "support-lib/objc/DJIError.h"
+  "support-lib/objc/DJIMarshal+Private.h"
+  "support-lib/objc/DJIObjcWrapperCache+Private.h"
+  "support-lib/objc/DJIError.mm"
+  "support-lib/objc/DJIProxyCaches.mm"
+)
+
+option(DJINNI_STATIC_LIB "Build Djinni support library as a static library instead of dynamic (the default)." off)
+if(DJINNI_STATIC_LIB)
+  add_library(djinni_support_lib STATIC ${SRC_SHARED})
+else()
+  add_library(djinni_support_lib SHARED ${SRC_SHARED})
+endif()
+source_group("" FILES ${SRC_SHARED})
+
+set_target_properties(djinni_support_lib PROPERTIES
+  CXX_STANDARD 11
+  CXX_STANDARD_REQUIRED true
+  CXX_EXTENSIONS false
+)
+
+# Objective-C support
+option(DJINNI_WITH_OBJC "Include the Objective-C support code in Djinni support library." off)
+if(DJINNI_WITH_OBJC)
+  target_include_directories(djinni_support_lib PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/support-lib/objc/>")
+  target_sources(djinni_support_lib PRIVATE ${SRC_OBJC})
+  source_group("objc" FILES ${SRC_OBJC})
+  target_compile_options(djinni_support_lib PUBLIC "-fobjc-arc")
+endif()
+
+# JNI support
+option(DJINNI_WITH_JNI "Include the JNI support code in Djinni support library." off)
+if(DJINNI_WITH_JNI)
+  if(NOT DJINNI_STATIC_LIB)
+    list(APPEND SRC_JNI "support-lib/jni/djinni_main.cpp")
+  endif()
+  target_include_directories(djinni_support_lib PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/support-lib/jni/>")
+  target_sources(djinni_support_lib PRIVATE ${SRC_JNI})
+  source_group("jni" FILES ${SRC_JNI})
+  # Do not use the host's jni.h on Android as it is provided automatically by the NDK
+  if(NOT ANDROID)
+    find_package(JNI REQUIRED QUIET)
+    target_include_directories(djinni_support_lib PUBLIC "${JNI_INCLUDE_DIRS}")
+  endif()
+endif()
+
+if(NOT (DJINNI_WITH_OBJC OR DJINNI_WITH_JNI))
+  message(FATAL_ERROR "At least one of DJINNI_WITH_OBJC or DJINNI_WITH_JNI must be enabled.")
+endif()
+
+# Store path to the "run" executable so it can be passed as argument to add_custom_command() scripts
+set(DJINNI_RUN_PATH "${CMAKE_CURRENT_SOURCE_DIR}/src/run" CACHE FILEPATH "Path to the Djinni generator executable.")
diff --git a/support-lib/CMakeLists.txt b/support-lib/CMakeLists.txt
deleted file mode 100644
index 1ef23d48f..000000000
--- a/support-lib/CMakeLists.txt
+++ /dev/null
@@ -1,74 +0,0 @@
-cmake_minimum_required(VERSION 3.6.0)
-
-project(Djinni)
-
-include(GNUInstallDirs)
-
-set(SRC_SHARED
-  "djinni_common.hpp"
-  "proxy_cache_interface.hpp"
-  "proxy_cache_impl.hpp"
-)
-
-set(SRC_JNI
-  "jni/djinni_support.hpp"
-  "jni/Marshal.hpp"
-  "jni/djinni_support.cpp"
-)
-
-set(SRC_OBJC
-  "objc/DJICppWrapperCache+Private.h"
-  "objc/DJIError.h"
-  "objc/DJIMarshal+Private.h"
-  "objc/DJIObjcWrapperCache+Private.h"
-  "objc/DJIError.mm"
-  "objc/DJIProxyCaches.mm"
-)
-
-option(DJINNI_STATIC_LIB "Build Djinni as a static library instead of dynamic (the default)." off)
-if(DJINNI_STATIC_LIB)
-  add_library(djinni STATIC ${SRC_SHARED})
-else()
-  add_library(djinni SHARED ${SRC_SHARED})
-endif()
-source_group("" FILES ${SRC_SHARED})
-
-set_target_properties(djinni PROPERTIES
-  CXX_STANDARD 11
-  CXX_STANDARD_REQUIRED true
-  CXX_EXTENSIONS false
-)
-
-# Objective-C support
-option(DJINNI_WITH_OBJC "Include the Objective-C support code in Djinni." off)
-if(DJINNI_WITH_OBJC)
-  target_include_directories(djinni PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/objc/>")
-  target_sources(djinni PRIVATE ${SRC_OBJC})
-  source_group("objc" FILES ${SRC_OBJC})
-  target_compile_options(djinni PUBLIC "-fobjc-arc")
-endif()
-
-# JNI support
-option(DJINNI_WITH_JNI "Include the JNI support code in Djinni." off)
-if(DJINNI_WITH_JNI)
-  if(NOT DJINNI_STATIC_LIB)
-    list(APPEND SRC_JNI "jni/djinni_main.cpp")
-  endif()
-  target_include_directories(djinni PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/jni/>")
-  target_sources(djinni PRIVATE ${SRC_JNI})
-  source_group("jni" FILES ${SRC_JNI})
-  # Do not use the host's jni.h on Android as it is provided automatically by the NDK
-  if(NOT ANDROID)
-    find_package(JNI REQUIRED QUIET)
-    target_include_directories(djinni PUBLIC "${JNI_INCLUDE_DIRS}")
-  endif()
-endif()
-
-target_compile_options(djinni PRIVATE "-fexceptions" "-frtti")
-
-if(NOT (DJINNI_WITH_OBJC OR DJINNI_WITH_JNI))
-  message(FATAL_ERROR "At least one of DJINNI_WITH_OBJC or DJINNI_WITH_JNI must be enabled.")
-endif()
-
-# Store path to the "run" executable so it can be passed as argument to add_custom_command() scripts
-set(DJINNI_RUN_PATH "${CMAKE_CURRENT_SOURCE_DIR}/src/run" CACHE FILEPATH "Path to the Djinni generator executable.")

From 66f6d9b448a0bbab0f3c371adfe56959ef6d15e2 Mon Sep 17 00:00:00 2001
From: Bruno Coelho <4brunu@gmail.com>
Date: Wed, 5 Apr 2017 17:30:08 +0100
Subject: [PATCH 37/56] Make Swift code more idiomatic

---
 .../TXSTextboxListenerDebugableImpl.swift     | 25 ++++++++-----------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/example/handwritten-src/swift/TXSTextboxListenerDebugableImpl.swift b/example/handwritten-src/swift/TXSTextboxListenerDebugableImpl.swift
index bb432958a..015a3b7de 100644
--- a/example/handwritten-src/swift/TXSTextboxListenerDebugableImpl.swift
+++ b/example/handwritten-src/swift/TXSTextboxListenerDebugableImpl.swift
@@ -1,24 +1,21 @@
-//
-//  TXSTextboxListenerImpl.swift
-//  TextSort
-//
-//  Created by Bruno Coelho on 10/03/2017.
-//  Copyright © 2017 Dropbox, Inc. All rights reserved.
-//
-
 import UIKit
 
-@objc class TXSTextboxListenerDebugableImpl : NSObject, TXSTextboxListener {
-    private var textView_: UITextView
+final class TXSTextboxListenerDebugableImpl : NSObject, TXSTextboxListener {
+    private var textView: UITextView
+    
+    @available(*, unavailable)
+    override init() {
+        fatalError("Unsupported")
+    }
     
     @objc(initWithUITextView:)
-    init (textView: UITextView) {
-        textView_ = textView
+    init(textView: UITextView) {
+        self.textView = textView
     }
     
-    @objc func update(_ items: TXSItemList) {
+    func update(_ items: TXSItemList) {
         let string = items.items.joined(separator: "\n")
         print("TXSTextboxListenerDebugableImpl -> update \n\(string)")
-        textView_.text = string
+        textView.text = string
     }
 }

From eb02361e20d09714b95c722c9dbafcd9dfffa2b0 Mon Sep 17 00:00:00 2001
From: Michael Jarrett <mjarrett@google.com>
Date: Thu, 6 Apr 2017 10:30:19 -0700
Subject: [PATCH 38/56] Making three changes to fix compilation in our
 environment.

- Adding global namespace scope to DJINNI_ASSERT to prevent conflict
  with local namespaces.
- Add <memory> include to reference shared_ptr.
- Use temporary variable in djinni_support.hpp to avoid compiler
  segfault.
---
 README.md                             | 3 +++
 support-lib/jni/djinni_support.hpp    | 9 +++++----
 support-lib/proxy_cache_interface.hpp | 1 +
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index c30b6294a..b23e9107a 100644
--- a/README.md
+++ b/README.md
@@ -437,6 +437,9 @@ Run `make test` to invoke the test suite, found in the test-suite subdirectory.
 - Iulia Tamas
 - Andrew Twyman
 
+## Contributors
+- Google Inc.
+
 ## Contacts
 - Andrew Twyman - `atwyman@dropbox.com`
 - Jacob Potter - `djinni@j4cbo.com`
diff --git a/support-lib/jni/djinni_support.hpp b/support-lib/jni/djinni_support.hpp
index a4fab781f..e7f424dcf 100644
--- a/support-lib/jni/djinni_support.hpp
+++ b/support-lib/jni/djinni_support.hpp
@@ -156,11 +156,11 @@ void jniThrowAssertionError(JNIEnv * env, const char * file, int line, const cha
 
 #define DJINNI_ASSERT_MSG(check, env, message) \
     do { \
-        djinni::jniExceptionCheck(env); \
+        ::djinni::jniExceptionCheck(env); \
         const bool check__res = bool(check); \
-        djinni::jniExceptionCheck(env); \
+        ::djinni::jniExceptionCheck(env); \
         if (!check__res) { \
-            djinni::jniThrowAssertionError(env, __FILE__, __LINE__, message); \
+            ::djinni::jniThrowAssertionError(env, __FILE__, __LINE__, message); \
         } \
     } while(false)
 #define DJINNI_ASSERT(check, env) DJINNI_ASSERT_MSG(check, env, #check)
@@ -340,7 +340,8 @@ template <class T>
 static const std::shared_ptr<T> & objectFromHandleAddress(jlong handle) {
     assert(handle);
     assert(handle > 4096);
-    const auto & ret = reinterpret_cast<const CppProxyHandle<T> *>(handle)->get();
+    const CppProxyHandle<T> *temp = reinterpret_cast<const CppProxyHandle<T> *>(handle);
+    const auto & ret = temp->get();
     assert(ret);
     return ret;
 }
diff --git a/support-lib/proxy_cache_interface.hpp b/support-lib/proxy_cache_interface.hpp
index 98f2b1917..73123c8bf 100644
--- a/support-lib/proxy_cache_interface.hpp
+++ b/support-lib/proxy_cache_interface.hpp
@@ -16,6 +16,7 @@
 
 #pragma once
 
+#include <memory>
 #include <functional>
 #include <typeindex>
 

From 6a3b969860e9cf8a94bab542fe6894444dd1a0eb Mon Sep 17 00:00:00 2001
From: Michael Jarrett <mjarrett@google.com>
Date: Thu, 6 Apr 2017 13:59:28 -0700
Subject: [PATCH 39/56] Adding comment to warn of the potential segfault in
 gcc.

---
 support-lib/jni/djinni_support.hpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/support-lib/jni/djinni_support.hpp b/support-lib/jni/djinni_support.hpp
index e7f424dcf..32e8f7014 100644
--- a/support-lib/jni/djinni_support.hpp
+++ b/support-lib/jni/djinni_support.hpp
@@ -340,6 +340,8 @@ template <class T>
 static const std::shared_ptr<T> & objectFromHandleAddress(jlong handle) {
     assert(handle);
     assert(handle > 4096);
+    // Below line segfaults gcc-4.8. Using a temporary variable hides the bug.
+    //const auto & ret = reinterpret_cast<const CppProxyHandle<T> *>(handle)->get();
     const CppProxyHandle<T> *temp = reinterpret_cast<const CppProxyHandle<T> *>(handle);
     const auto & ret = temp->get();
     assert(ret);

From bdbdcc05fa19a7b0303d10f1ed6a0d7d2fd3ad23 Mon Sep 17 00:00:00 2001
From: Michael Jarrett <mjarrett@google.com>
Date: Fri, 7 Apr 2017 13:11:00 -0700
Subject: [PATCH 40/56] Renaming "temp" to "proxy_handle" to make more
 readable.

---
 support-lib/jni/djinni_support.hpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/support-lib/jni/djinni_support.hpp b/support-lib/jni/djinni_support.hpp
index 32e8f7014..2b806a3fc 100644
--- a/support-lib/jni/djinni_support.hpp
+++ b/support-lib/jni/djinni_support.hpp
@@ -342,8 +342,9 @@ static const std::shared_ptr<T> & objectFromHandleAddress(jlong handle) {
     assert(handle > 4096);
     // Below line segfaults gcc-4.8. Using a temporary variable hides the bug.
     //const auto & ret = reinterpret_cast<const CppProxyHandle<T> *>(handle)->get();
-    const CppProxyHandle<T> *temp = reinterpret_cast<const CppProxyHandle<T> *>(handle);
-    const auto & ret = temp->get();
+    const CppProxyHandle<T> *proxy_handle =
+        reinterpret_cast<const CppProxyHandle<T> *>(handle);
+    const auto & ret = proxy_handle->get();
     assert(ret);
     return ret;
 }

From c73950edee999140ad1191ea131f400de9aca918 Mon Sep 17 00:00:00 2001
From: Michael Jarrett <mjarrett@google.com>
Date: Tue, 11 Apr 2017 09:45:20 -0700
Subject: [PATCH 41/56] Swap the README.md change for a CONTRIBUTORS file for
 attribution.

---
 CONTRIBUTORS | 8 ++++++++
 README.md    | 3 ---
 2 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 CONTRIBUTORS

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
new file mode 100644
index 000000000..c178ec908
--- /dev/null
+++ b/CONTRIBUTORS
@@ -0,0 +1,8 @@
+The following is a partial list of individuals or corporations
+who have identified their contributions to the djinni project.
+
+The complete list of contributors can be identified through
+Git history.
+
+- Google Inc.
+
diff --git a/README.md b/README.md
index b23e9107a..c30b6294a 100644
--- a/README.md
+++ b/README.md
@@ -437,9 +437,6 @@ Run `make test` to invoke the test suite, found in the test-suite subdirectory.
 - Iulia Tamas
 - Andrew Twyman
 
-## Contributors
-- Google Inc.
-
 ## Contacts
 - Andrew Twyman - `atwyman@dropbox.com`
 - Jacob Potter - `djinni@j4cbo.com`

From 554a3b2b548f1258f3706b509b0d6476e3557cab Mon Sep 17 00:00:00 2001
From: Andrew Twyman <atwyman@dropbox.com>
Date: Thu, 18 May 2017 15:28:29 -0700
Subject: [PATCH 42/56] Fix rsync commands to not update timestamps on
 unchanged contents

---
 example/run_djinni.sh    | 2 +-
 test-suite/run_djinni.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/example/run_djinni.sh b/example/run_djinni.sh
index eef4945e4..a136b6ad3 100755
--- a/example/run_djinni.sh
+++ b/example/run_djinni.sh
@@ -80,7 +80,7 @@ mirror() {
     local src="$1" ; shift
     local dest="$1" ; shift
     mkdir -p "$dest"
-    rsync -a --delete --checksum --itemize-changes "$src"/ "$dest" | grep -v '^\.' | sed "s/^/[$prefix]/"
+    rsync -r --delete --checksum --itemize-changes "$src"/ "$dest" | sed "s/^/[$prefix]/"
 }
 
 echo "Copying generated code to final directories..."
diff --git a/test-suite/run_djinni.sh b/test-suite/run_djinni.sh
index c619e9b13..8f419e97d 100755
--- a/test-suite/run_djinni.sh
+++ b/test-suite/run_djinni.sh
@@ -157,7 +157,7 @@ mirror() {
     local src="$1" ; shift
     local dest="$1" ; shift
     mkdir -p "$dest"
-    rsync -a --delete --checksum --itemize-changes "$src"/ "$dest" | grep -v '^\.' | sed "s/^/[$prefix]/"
+    rsync -r --delete --checksum --itemize-changes "$src"/ "$dest" | sed "s/^/[$prefix]/"
 }
 
 echo "Copying generated code to final directories..."

From b55ac101301efd0cadd2112c72f307e15841b984 Mon Sep 17 00:00:00 2001
From: Guillaume Giraud <Guillaume227@users.noreply.github.com>
Date: Wed, 28 Jun 2017 07:05:59 +0200
Subject: [PATCH 43/56] [Android] Fix Djinni initialization crash in multi
 shared library case (#310)

Fix Djinni initialization crash in multi shared library case on Android (i.e. djinni_support_lib is a shared library used by other shared libraries).

Replaced generic static_registration class with non-templatized helpers in JniClassInitializer, which simplifies the code and avoids the issues of multiple instantiations of the same static data.
---
 support-lib/jni/djinni_support.cpp | 27 ++++++++++++++++++--
 support-lib/jni/djinni_support.hpp | 41 ++++++++----------------------
 2 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/support-lib/jni/djinni_support.cpp b/support-lib/jni/djinni_support.cpp
index f4b20079d..067e1e4ee 100644
--- a/support-lib/jni/djinni_support.cpp
+++ b/support-lib/jni/djinni_support.cpp
@@ -28,12 +28,35 @@ namespace djinni {
 // Set only once from JNI_OnLoad before any other JNI calls, so no lock needed.
 static JavaVM * g_cachedJVM;
 
+/*static*/
+JniClassInitializer::registration_vec & JniClassInitializer::get_vec() {
+    static JniClassInitializer::registration_vec m;
+    return m;
+}
+
+/*static*/
+std::mutex & JniClassInitializer::get_mutex() {
+    static std::mutex mtx;
+    return mtx;
+}
+
+/*static*/
+JniClassInitializer::registration_vec JniClassInitializer::get_all() {
+    const std::lock_guard<std::mutex> lock(get_mutex());
+    return get_vec();
+}
+
+JniClassInitializer::JniClassInitializer(std::function<void()> init) {
+    const std::lock_guard<std::mutex> lock(get_mutex());
+    get_vec().push_back(std::move(init));
+}
+
 void jniInit(JavaVM * jvm) {
     g_cachedJVM = jvm;
 
     try {
-        for (const auto & kv : JniClassInitializer::Registration::get_all()) {
-            kv.second->init();
+        for (const auto & initializer : JniClassInitializer::get_all()) {
+            initializer();
         }
     } catch (const std::exception & e) {
         // Default exception handling only, since non-default might not be safe if init
diff --git a/support-lib/jni/djinni_support.hpp b/support-lib/jni/djinni_support.hpp
index 2b806a3fc..d9f5bbc8d 100644
--- a/support-lib/jni/djinni_support.hpp
+++ b/support-lib/jni/djinni_support.hpp
@@ -21,7 +21,7 @@
 #include <memory>
 #include <mutex>
 #include <string>
-#include <unordered_map>
+#include <vector>
 
 #include "../proxy_cache_interface.hpp"
 #include "../djinni_common.hpp"
@@ -165,42 +165,23 @@ void jniThrowAssertionError(JNIEnv * env, const char * file, int line, const cha
     } while(false)
 #define DJINNI_ASSERT(check, env) DJINNI_ASSERT_MSG(check, env, #check)
 
-/*
- * Helper for JniClassInitializer.
- */
-template <class Key, class T>
-class static_registration {
-public:
-    using registration_map = std::unordered_map<Key, T *>;
-    static registration_map get_all() {
-        const std::lock_guard<std::mutex> lock(get_mutex());
-        return get_map();
-    }
-    static_registration(const Key & key, T * obj) : m_key(key) {
-        const std::lock_guard<std::mutex> lock(get_mutex());
-        get_map().emplace(key, obj);
-    }
-    ~static_registration() {
-        const std::lock_guard<std::mutex> lock(get_mutex());
-        get_map().erase(m_key);
-    }
-private:
-    const Key m_key;
-    static registration_map & get_map()   { static registration_map m; return m;   }
-    static std::mutex       & get_mutex() { static std::mutex mtx;     return mtx; }
-};
-
 /*
  * Helper for JniClass. (This can't be a subclass because it needs to not be templatized.)
  */
 class JniClassInitializer {
+
+    using registration_vec = std::vector<std::function<void()>>;
+    static registration_vec get_all();
+
 private:
-    using Registration = static_registration<void *, const JniClassInitializer>;
-    const std::function<void()> init;
-    const Registration reg;
-    JniClassInitializer(const std::function<void()> & init) : init(init), reg(this, this) {}
+
+    JniClassInitializer(std::function<void()> init);
+
     template <class C> friend class JniClass;
     friend void jniInit(JavaVM *);
+
+    static registration_vec & get_vec();
+    static std::mutex       & get_mutex();
 };
 
 /*

From e54dab6672a22194841d9342bffcc801f5c1e208 Mon Sep 17 00:00:00 2001
From: Simon Warta <simon@kullo.net>
Date: Wed, 16 Aug 2017 07:42:22 +0200
Subject: [PATCH 44/56] Avoid unused variable warning when compiling
 djinni_support.cpp (#319)

---
 support-lib/jni/djinni_support.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/support-lib/jni/djinni_support.cpp b/support-lib/jni/djinni_support.cpp
index 067e1e4ee..1874e5644 100644
--- a/support-lib/jni/djinni_support.cpp
+++ b/support-lib/jni/djinni_support.cpp
@@ -58,7 +58,7 @@ void jniInit(JavaVM * jvm) {
         for (const auto & initializer : JniClassInitializer::get_all()) {
             initializer();
         }
-    } catch (const std::exception & e) {
+    } catch (const std::exception &) {
         // Default exception handling only, since non-default might not be safe if init
         // is incomplete.
         jniDefaultSetPendingFromCurrent(jniGetThreadEnv(), __func__);

From d8ef452e944ef765e833d9e411b04bbbb816e39e Mon Sep 17 00:00:00 2001
From: Alex Choi <choiip@gmail.com>
Date: Thu, 17 Aug 2017 14:20:54 +0800
Subject: [PATCH 45/56] Added missing std:: in platform_threads_impl (#321)

---
 extension-libs/platform-threads/cpp/platform_threads_impl.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extension-libs/platform-threads/cpp/platform_threads_impl.hpp b/extension-libs/platform-threads/cpp/platform_threads_impl.hpp
index e29f63aaa..762b27c90 100644
--- a/extension-libs/platform-threads/cpp/platform_threads_impl.hpp
+++ b/extension-libs/platform-threads/cpp/platform_threads_impl.hpp
@@ -48,7 +48,7 @@ class CppPlatformThreadsGeneric : public PlatformThreads {
      * it starts, before calling the normal ThreadFunc.
      */
     CppPlatformThreadsGeneric(std::function<void()> func_on_thread_start)
-    : m_func_on_thread_start(make_shared<std::function<void()>>(std::move(func_on_thread_start))) {}
+    : m_func_on_thread_start(std::make_shared<std::function<void()>>(std::move(func_on_thread_start))) {}
 
     /** Creates and starts a new thread which will call the given function. */
     virtual void create_thread(const std::string & /*name*/,
@@ -74,7 +74,7 @@ class CppPlatformThreadsGeneric : public PlatformThreads {
     }
 
 private:
-    const shared_ptr<std::function<void()>> m_func_on_thread_start;
+    const std::shared_ptr<std::function<void()>> m_func_on_thread_start;
 };
 
 /**

From 896aacb3d930c43e8e6cf83034ec71176553508d Mon Sep 17 00:00:00 2001
From: Josh Gustafson <j@gustafson.me>
Date: Wed, 6 Sep 2017 13:46:53 -0600
Subject: [PATCH 46/56] Fix CFStringEncoding/NSStringEncoding confusion

---
 support-lib/objc/DJIMarshal+Private.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/support-lib/objc/DJIMarshal+Private.h b/support-lib/objc/DJIMarshal+Private.h
index 5d600b33d..b889df3d8 100644
--- a/support-lib/objc/DJIMarshal+Private.h
+++ b/support-lib/objc/DJIMarshal+Private.h
@@ -119,14 +119,14 @@ struct String {
 };
 
 template<int wcharTypeSize>
-static CFStringEncoding getWCharEncoding()
+static NSStringEncoding getWCharEncoding()
 {
     static_assert(wcharTypeSize == 2 || wcharTypeSize == 4, "wchar_t must be represented by UTF-16 or UTF-32 encoding");
     return {}; // unreachable
 }
 
 template<>
-inline CFStringEncoding getWCharEncoding<2>() {
+inline NSStringEncoding getWCharEncoding<2>() {
     // case when wchar_t is represented by utf-16 encoding
 #if defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)
     return NSUTF16BigEndianStringEncoding;
@@ -136,7 +136,7 @@ inline CFStringEncoding getWCharEncoding<2>() {
 }
 
 template<>
-inline CFStringEncoding getWCharEncoding<4>() {
+inline NSStringEncoding getWCharEncoding<4>() {
     // case when wchar_t is represented by utf-32 encoding
 #if defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)
     return NSUTF32BigEndianStringEncoding;
@@ -153,7 +153,7 @@ struct WString {
 
     static CppType toCpp(ObjcType string) {
         assert(string);
-        NSStringEncoding encoding = CFStringConvertEncodingToNSStringEncoding(getWCharEncoding<sizeof(wchar_t)>());
+        NSStringEncoding encoding = getWCharEncoding<sizeof(wchar_t)>();
         NSData* data = [string dataUsingEncoding:encoding];
         return std::wstring((wchar_t*)[data bytes], [data length] / sizeof (wchar_t));
     }

From 85e0f3fb02541fc4f97fb51b1f4a414ddb201c4e Mon Sep 17 00:00:00 2001
From: Andrew Twyman <atwyman@dropbox.com>
Date: Mon, 25 Sep 2017 18:55:45 -0700
Subject: [PATCH 47/56] Add Xianwen to contacts

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index c30b6294a..681a3cc61 100644
--- a/README.md
+++ b/README.md
@@ -438,5 +438,6 @@ Run `make test` to invoke the test suite, found in the test-suite subdirectory.
 - Andrew Twyman
 
 ## Contacts
+- Xianwen Chen - `xianwen@dropbox.com`
 - Andrew Twyman - `atwyman@dropbox.com`
 - Jacob Potter - `djinni@j4cbo.com`

From 2af44158429597419cd064547434d4bc66823f5e Mon Sep 17 00:00:00 2001
From: Alex Choi <choiip@gmail.com>
Date: Fri, 29 Sep 2017 00:35:37 +0800
Subject: [PATCH 48/56] New "flags" archetype for enums oriented towards
 bitwise flags (#323)

---
 README.md                                     |  57 ++++--
 example/example.yaml                          |   2 +-
 src/source/CppGenerator.scala                 |  32 +++-
 src/source/CppMarshal.scala                   |   3 +-
 src/source/JNIGenerator.scala                 |  15 +-
 src/source/JNIMarshal.scala                   |   5 +-
 src/source/JavaGenerator.scala                |   6 +-
 src/source/JavaMarshal.scala                  |  28 ++-
 src/source/ObjcGenerator.scala                |   9 +-
 src/source/YamlGenerator.scala                |   3 +-
 src/source/ast.scala                          |   9 +-
 src/source/generator.scala                    |  27 +++
 src/source/parser.scala                       |  26 ++-
 support-lib/jni/djinni_support.cpp            |  34 ++++
 support-lib/jni/djinni_support.hpp            |  32 ++++
 support-lib/objc/DJIMarshal+Private.h         |  14 +-
 test-suite/djinni/enum.djinni                 |  30 ++++
 test-suite/generated-src/cpp/access_flags.hpp |  56 ++++++
 test-suite/generated-src/cpp/empty_flags.hpp  |  47 +++++
 .../generated-src/cpp/flag_roundtrip.hpp      |  26 +++
 .../generated-src/cpp/record_with_flags.hpp   |  19 ++
 .../com/dropbox/djinni/test/AccessFlags.java  |  20 +++
 .../com/dropbox/djinni/test/EmptyFlags.java   |  11 ++
 .../dropbox/djinni/test/FlagRoundtrip.java    |  47 +++++
 .../dropbox/djinni/test/RecordWithFlags.java  |  32 ++++
 .../generated-src/jni/NativeAccessFlags.hpp   |  26 +++
 .../generated-src/jni/NativeEmptyFlags.hpp    |  26 +++
 .../generated-src/jni/NativeFlagRoundtrip.cpp |  60 +++++++
 .../generated-src/jni/NativeFlagRoundtrip.hpp |  32 ++++
 .../jni/NativeRecordWithFlags.cpp             |  28 +++
 .../jni/NativeRecordWithFlags.hpp             |  32 ++++
 .../objc/DBAccessFlags+Private.h              |   6 +
 test-suite/generated-src/objc/DBAccessFlags.h |  19 ++
 .../generated-src/objc/DBEmptyFlags+Private.h |   6 +
 test-suite/generated-src/objc/DBEmptyFlags.h  |  10 ++
 .../objc/DBFlagRoundtrip+Private.h            |  31 ++++
 .../objc/DBFlagRoundtrip+Private.mm           |  83 +++++++++
 .../generated-src/objc/DBFlagRoundtrip.h      |  19 ++
 .../objc/DBRecordWithFlags+Private.h          |  24 +++
 .../objc/DBRecordWithFlags+Private.mm         |  21 +++
 .../generated-src/objc/DBRecordWithFlags.h    |  13 ++
 .../generated-src/objc/DBRecordWithFlags.mm   |  27 +++
 test-suite/generated-src/outFileList.txt      |  25 +++
 .../handwritten-src/cpp/flag_roundtrip.cpp    |  19 ++
 .../com/dropbox/djinni/test/EnumTest.java     |  30 ++++
 .../objc/tests/DBFlagsTests.mm                |  87 +++++++++
 test-suite/java/docker/centos_6/Dockerfile    |   2 +-
 .../java/docker/debian_jessie/Dockerfile      |   3 +-
 test-suite/java/docker/fedora_24/Dockerfile   |   2 +-
 .../DjinniObjcTest.xcodeproj/project.pbxproj  | 165 +++++++++++-------
 50 files changed, 1274 insertions(+), 112 deletions(-)
 create mode 100644 test-suite/generated-src/cpp/access_flags.hpp
 create mode 100644 test-suite/generated-src/cpp/empty_flags.hpp
 create mode 100644 test-suite/generated-src/cpp/flag_roundtrip.hpp
 create mode 100644 test-suite/generated-src/cpp/record_with_flags.hpp
 create mode 100644 test-suite/generated-src/java/com/dropbox/djinni/test/AccessFlags.java
 create mode 100644 test-suite/generated-src/java/com/dropbox/djinni/test/EmptyFlags.java
 create mode 100644 test-suite/generated-src/java/com/dropbox/djinni/test/FlagRoundtrip.java
 create mode 100644 test-suite/generated-src/java/com/dropbox/djinni/test/RecordWithFlags.java
 create mode 100644 test-suite/generated-src/jni/NativeAccessFlags.hpp
 create mode 100644 test-suite/generated-src/jni/NativeEmptyFlags.hpp
 create mode 100644 test-suite/generated-src/jni/NativeFlagRoundtrip.cpp
 create mode 100644 test-suite/generated-src/jni/NativeFlagRoundtrip.hpp
 create mode 100644 test-suite/generated-src/jni/NativeRecordWithFlags.cpp
 create mode 100644 test-suite/generated-src/jni/NativeRecordWithFlags.hpp
 create mode 100644 test-suite/generated-src/objc/DBAccessFlags+Private.h
 create mode 100644 test-suite/generated-src/objc/DBAccessFlags.h
 create mode 100644 test-suite/generated-src/objc/DBEmptyFlags+Private.h
 create mode 100644 test-suite/generated-src/objc/DBEmptyFlags.h
 create mode 100644 test-suite/generated-src/objc/DBFlagRoundtrip+Private.h
 create mode 100644 test-suite/generated-src/objc/DBFlagRoundtrip+Private.mm
 create mode 100644 test-suite/generated-src/objc/DBFlagRoundtrip.h
 create mode 100644 test-suite/generated-src/objc/DBRecordWithFlags+Private.h
 create mode 100644 test-suite/generated-src/objc/DBRecordWithFlags+Private.mm
 create mode 100644 test-suite/generated-src/objc/DBRecordWithFlags.h
 create mode 100644 test-suite/generated-src/objc/DBRecordWithFlags.mm
 create mode 100644 test-suite/handwritten-src/cpp/flag_roundtrip.cpp
 create mode 100644 test-suite/handwritten-src/objc/tests/DBFlagsTests.mm

diff --git a/README.md b/README.md
index 681a3cc61..4302daf2e 100644
--- a/README.md
+++ b/README.md
@@ -24,6 +24,7 @@ Djinni generates code based on interface definitions in an IDL file. An IDL file
 three kinds of declarations: enums, records, and interfaces.
 
 * Enums become C++ enum classes, Java enums, or ObjC `NS_ENUM`s.
+* Flags become C++ enum classes with convenient bit-oriented operators, Java enums with `EnumSet`, or ObjC `NS_OPTIONS`.
 * Records are pure-data value objects.
 * Interfaces are objects with defined methods to call (in C++, passed by `shared_ptr`). Djinni
   produces code allowing an interface implemented in C++ to be transparently used from ObjC or
@@ -40,6 +41,14 @@ Djinni's input is an interface description file. Here's an example:
         option3;
     }
 
+    my_flags = flags {
+      flag1;
+      flag2;
+      flag3;
+      no_flags = none;
+      all_flags = all;
+    }
+
     my_record = record {
         id: i32;
         info: string;
@@ -125,11 +134,11 @@ For more information, run `run --help` to see all command line arguments availab
 ##### Includes & Build target
 The following headers / code will be generated for each defined type:
 
-| Type      | C++ header             | C++ source                 | Java                | JNI header            | JNI source            |
-|-----------|------------------------|----------------------------|---------------------|-----------------------|-----------------------|
-| Enum      | my\_enum.hpp           |                            | MyEnum.java         | NativeMyEnum.hpp      | NativeMyEnum.cpp      |
-| Record    | my\_record[\_base].hpp | my\_record[\_base].cpp (+) | MyRecord[Base].java | NativeMyRecord.hpp    | NativeMyRecord.cpp    |
-| Interface | my\_interface.hpp      | my\_interface.cpp (+)      | MyInterface.java    | NativeMyInterface.hpp | NativeMyInterface.cpp |
+| Type       | C++ header             | C++ source                 | Java                | JNI header            | JNI source            |
+|------------|------------------------|----------------------------|---------------------|-----------------------|-----------------------|
+| Enum/Flags | my\_enum.hpp           |                            | MyEnum.java         | NativeMyEnum.hpp      | NativeMyEnum.cpp      |
+| Record     | my\_record[\_base].hpp | my\_record[\_base].cpp (+) | MyRecord[Base].java | NativeMyRecord.hpp    | NativeMyRecord.cpp    |
+| Interface  | my\_interface.hpp      | my\_interface.cpp (+)      | MyInterface.java    | NativeMyInterface.hpp | NativeMyInterface.cpp |
 
 (+) Generated only for types that contain constants.
 
@@ -164,13 +173,13 @@ you'll need to add calls to your own `JNI_OnLoad` and `JNI_OnUnload` functions.
 ##### Includes & Build Target
 Generated files for Objective-C / C++ are as follows (assuming prefix is `DB`):
 
-| Type      | C++ header             | C++ source                 | Objective-C files        | Objective-C++ files         |
-|-----------|------------------------|----------------------------|--------------------------|-----------------------------|
-| Enum      | my\_enum.hpp           |                            | DBMyEnum.h               |                             |
-| Record    | my\_record[\_base].hpp | my\_record[\_base].cpp (+) | DBMyRecord[Base].h       | DBMyRecord[Base]+Private.h  |
-|           |                        |                            | DBMyRecord[Base].mm (++) | DBMyRecord[Base]+Private.mm |
-| Interface | my\_interface.hpp      | my\_interface.cpp (+)      | DBMyInterface.h          | DBMyInterface+Private.h     |
-|           |                        |                            |                          | DBMyInterface+Private.mm    |
+| Type       | C++ header             | C++ source                 | Objective-C files        | Objective-C++ files         |
+|------------|------------------------|----------------------------|--------------------------|-----------------------------|
+| Enum/Flags | my\_enum.hpp           |                            | DBMyEnum.h               |                             |
+| Record     | my\_record[\_base].hpp | my\_record[\_base].cpp (+) | DBMyRecord[Base].h       | DBMyRecord[Base]+Private.h  |
+|            |                        |                            | DBMyRecord[Base].mm (++) | DBMyRecord[Base]+Private.mm |
+| Interface  | my\_interface.hpp      | my\_interface.cpp (+)      | DBMyInterface.h          | DBMyInterface+Private.h     |
+|            |                        |                            |                          | DBMyInterface+Private.mm    |
 
 (+) Generated only for types that contain constants.
 (++) Generated only for types with derived operations and/or constants. These have `.mm` extensions to allow non-trivial constants.
@@ -183,6 +192,28 @@ Note that `+Private` files can only be used with ObjC++ source (other headers ar
 Enums are translated to C++ `enum class`es with underlying type `int`, ObjC `NS_ENUM`s with
 underlying type `NSInteger`, and Java enums.
 
+### Flags
+Flags are translated to C++ `enum class`es with underlying type `unsigned` and a generated set
+of overloaded bitwise operators for convenience, ObjC `NS_OPTIONS` with underlying type
+`NSUInteger`, and Java `EnumSet<>`. Contrary to the above enums, the enumerants of flags represent
+single bits instead of integral values.
+
+When specifying a `flags` type in your IDL file you can assign special semantics to options:
+
+```
+my_flags = flags {
+  flag1;
+  flag2;
+  flag3;
+  no_flags = none;
+  all_flags = all;
+}
+```
+In the above example the elements marked with `none` and `all` are given special meaning.
+In C++ and ObjC the `no_flags` option is generated with a value that has no bits set (i.e. `0`),
+and `all_flags` is generated as a bitwise-or combination of all other values. In Java these
+special options are not generated as one can just use `EnumSet.noneOf()` and `EnumSet.allOf()`.
+
 ### Record
 Records are data objects. In C++, records contain all their elements by value, including other
 records (so a record cannot contain itself).
@@ -203,7 +234,7 @@ The available data types for a record, argument, or return value are:
    Objective-C. Primitives in a set will be boxed in Java and Objective-C.
  - Map (`map<typeA, typeB>`). This is `unordered_map<K, V>` in C++, `HashMap` in Java, and
    `NSDictionary` in Objective-C. Primitives in a map will be boxed in Java and Objective-C.
- - Enumerations
+ - Enumerations / Flags
  - Optionals (`optional<typeA>`). This is `std::experimental::optional<T>` in C++11, object /
    boxed primitive reference in Java (which can be `null`), and object / NSNumber strong
    reference in Objective-C (which can be `nil`).
diff --git a/example/example.yaml b/example/example.yaml
index 58be1760d..1d345c1a2 100644
--- a/example/example.yaml
+++ b/example/example.yaml
@@ -7,7 +7,7 @@
 name: mylib_record1
 # Specifies what kind of type this is.
 # Supports the same syntax as is used to declare types in .djinni files.
-# Examples: 'interface +c', 'record deriving(eq, or)', 'enum', 'interface +j +o'
+# Examples: 'interface +c', 'record deriving(eq, or)', 'enum', 'flags', 'interface +j +o'
 # This determines how Djinni integrates this type into function parameters, fields or return types and operators.
 typedef: 'record +c deriving(eq, ord)'
 # The (potentially empty) list of required type parameters.
diff --git a/src/source/CppGenerator.scala b/src/source/CppGenerator.scala
index 119636fd7..365509007 100644
--- a/src/source/CppGenerator.scala
+++ b/src/source/CppGenerator.scala
@@ -63,11 +63,33 @@ class CppGenerator(spec: Spec) extends Generator(spec) {
       refs.hpp.add("#include <functional>") // needed for std::hash
     }
 
+    val flagsType = "unsigned"
+    val enumType = "int"
+    val underlyingType = if(e.flags) flagsType else enumType
+
     writeHppFile(ident, origin, refs.hpp, refs.hppFwds, w => {
-      w.w(s"enum class $self : int").bracedSemi {
-        for (o <- e.options) {
-          writeDoc(w, o.doc)
-          w.wl(idCpp.enum(o.ident.name) + ",")
+      w.w(s"enum class $self : $underlyingType").bracedSemi {
+        writeEnumOptionNone(w, e, idCpp.enum)
+        writeEnumOptions(w, e, idCpp.enum)
+        writeEnumOptionAll(w, e, idCpp.enum)
+      }
+
+      if(e.flags) {
+        // Define some operators to make working with "enum class" flags actually practical
+        def binaryOp(op: String) {
+          w.w(s"constexpr $self operator$op($self lhs, $self rhs) noexcept").braced {
+            w.wl(s"return static_cast<$self>(static_cast<$flagsType>(lhs) $op static_cast<$flagsType>(rhs));")
+          }
+          w.w(s"constexpr $self& operator$op=($self& lhs, $self rhs) noexcept").braced {
+            w.wl(s"return lhs = lhs $op rhs;") // Ugly, yes, but complies with C++11 restricted constexpr
+          }
+        }
+        binaryOp("|")
+        binaryOp("&")
+        binaryOp("^")
+
+        w.w(s"constexpr $self operator~($self x) noexcept").braced {
+          w.wl(s"return static_cast<$self>(~static_cast<$flagsType>(x));")
         }
       }
     },
@@ -81,7 +103,7 @@ class CppGenerator(spec: Spec) extends Generator(spec) {
             w.wl("template <>")
             w.w(s"struct hash<$fqSelf>").bracedSemi {
               w.w(s"size_t operator()($fqSelf type) const").braced {
-                w.wl("return std::hash<int>()(static_cast<int>(type));")
+                w.wl(s"return std::hash<$underlyingType>()(static_cast<$underlyingType>(type));")
               }
             }
           }
diff --git a/src/source/CppMarshal.scala b/src/source/CppMarshal.scala
index 2279c00b5..df0e8d0e1 100644
--- a/src/source/CppMarshal.scala
+++ b/src/source/CppMarshal.scala
@@ -73,7 +73,8 @@ class CppMarshal(spec: Spec) extends Marshal(spec) {
       case e: Enum =>
         if (d.name != exclude) {
           if (forwardDeclareOnly) {
-            List(DeclRef(s"enum class ${typename(d.name, d.body)};", Some(spec.cppNamespace)))
+            val underlyingType = if(e.flags) " : unsigned" else ""
+            List(DeclRef(s"enum class ${typename(d.name, d.body)}${underlyingType};", Some(spec.cppNamespace)))
           } else {
             List(ImportRef(include(d.name)))
           }
diff --git a/src/source/JNIGenerator.scala b/src/source/JNIGenerator.scala
index c36234ec0..0720a151b 100644
--- a/src/source/JNIGenerator.scala
+++ b/src/source/JNIGenerator.scala
@@ -64,19 +64,26 @@ class JNIGenerator(spec: Spec) extends Generator(spec) {
     val cppSelf = cppMarshal.fqTypename(ident, e)
 
     writeJniHppFile(ident, origin, Iterable.concat(refs.jniHpp, refs.jniCpp), Nil, w => {
-      w.w(s"class $jniHelper final : ::djinni::JniEnum").bracedSemi {
+      val base = if(e.flags) "JniFlags" else "JniEnum"
+      val count = normalEnumOptions(e).length
+      w.w(s"class $jniHelper final : ::djinni::$base").bracedSemi {
         w.wlOutdent("public:")
         w.wl(s"using CppType = $cppSelf;")
         w.wl(s"using JniType = jobject;")
         w.wl
         w.wl(s"using Boxed = $jniHelper;")
         w.wl
-        w.wl(s"static CppType toCpp(JNIEnv* jniEnv, JniType j) { return static_cast<CppType>(::djinni::JniClass<$jniHelper>::get().ordinal(jniEnv, j)); }")
-        w.wl(s"static ::djinni::LocalRef<JniType> fromCpp(JNIEnv* jniEnv, CppType c) { return ::djinni::JniClass<$jniHelper>::get().create(jniEnv, static_cast<jint>(c)); }")
+        if(e.flags) {
+          w.wl(s"static CppType toCpp(JNIEnv* jniEnv, JniType j) { return static_cast<CppType>(::djinni::JniClass<$jniHelper>::get().flags(jniEnv, j)); }")
+          w.wl(s"static ::djinni::LocalRef<JniType> fromCpp(JNIEnv* jniEnv, CppType c) { return ::djinni::JniClass<$jniHelper>::get().create(jniEnv, static_cast<unsigned>(c), $count); }")
+        } else {
+          w.wl(s"static CppType toCpp(JNIEnv* jniEnv, JniType j) { return static_cast<CppType>(::djinni::JniClass<$jniHelper>::get().ordinal(jniEnv, j)); }")
+          w.wl(s"static ::djinni::LocalRef<JniType> fromCpp(JNIEnv* jniEnv, CppType c) { return ::djinni::JniClass<$jniHelper>::get().create(jniEnv, static_cast<jint>(c)); }")
+        }
         w.wl
         w.wlOutdent("private:")
         val classLookup = q(jniMarshal.undecoratedTypename(ident, e))
-        w.wl(s"$jniHelper() : JniEnum($classLookup) {}")
+        w.wl(s"$jniHelper() : $base($classLookup) {}")
         w.wl(s"friend ::djinni::JniClass<$jniHelper>;")
       }
     })
diff --git a/src/source/JNIMarshal.scala b/src/source/JNIMarshal.scala
index e9aaab342..877668e47 100644
--- a/src/source/JNIMarshal.scala
+++ b/src/source/JNIMarshal.scala
@@ -76,7 +76,10 @@ class JNIMarshal(spec: Spec) extends Marshal(spec) {
     }
     case e: MExtern => e.jni.typeSignature
     case MParam(_) => "Ljava/lang/Object;"
-    case d: MDef => s"L${undecoratedTypename(d.name, d.body)};"
+    case d: MDef => d.body match {
+      case e: Enum if e.flags => "Ljava/util/EnumSet;"
+      case _ => s"L${undecoratedTypename(d.name, d.body)};"
+    }
   }
 
   def javaMethodSignature(params: Iterable[Field], ret: Option[TypeRef]) = {
diff --git a/src/source/JavaGenerator.scala b/src/source/JavaGenerator.scala
index d97299a63..4fa739ee0 100644
--- a/src/source/JavaGenerator.scala
+++ b/src/source/JavaGenerator.scala
@@ -111,7 +111,7 @@ class JavaGenerator(spec: Spec) extends Generator(spec) {
       writeDoc(w, doc)
       javaAnnotationHeader.foreach(w.wl)
       w.w(s"${javaClassAccessModifierString}enum ${marshal.typename(ident, e)}").braced {
-        for (o <- e.options) {
+        for (o <- normalEnumOptions(e)) {
           writeDoc(w, o.doc)
           w.wl(idJava.enum(o.ident) + ",")
         }
@@ -242,7 +242,7 @@ class JavaGenerator(spec: Spec) extends Generator(spec) {
           for (f <- r.fields) {
             skipFirst { w.wl(",") }
             marshal.nullityAnnotation(f.ty).map(annotation => w.w(annotation + " "))
-            w.w(marshal.typename(f.ty) + " " + idJava.local(f.ident))
+            w.w(marshal.paramType(f.ty) + " " + idJava.local(f.ident))
           }
           w.wl(") {")
         }
@@ -258,7 +258,7 @@ class JavaGenerator(spec: Spec) extends Generator(spec) {
           w.wl
           writeDoc(w, f.doc)
           marshal.nullityAnnotation(f.ty).foreach(w.wl)
-          w.w("public " + marshal.typename(f.ty) + " " + idJava.method("get_" + f.ident.name) + "()").braced {
+          w.w("public " + marshal.returnType(Some(f.ty)) + " " + idJava.method("get_" + f.ident.name) + "()").braced {
             w.wl("return " + idJava.field(f.ident) + ";")
           }
         }
diff --git a/src/source/JavaMarshal.scala b/src/source/JavaMarshal.scala
index 91d765210..c359566f2 100644
--- a/src/source/JavaMarshal.scala
+++ b/src/source/JavaMarshal.scala
@@ -15,14 +15,14 @@ class JavaMarshal(spec: Spec) extends Marshal(spec) {
   override def fqTypename(tm: MExpr): String = toJavaType(tm, spec.javaPackage)
   def fqTypename(name: String, ty: TypeDef): String = withPackage(spec.javaPackage, idJava.ty(name))
 
-  override def paramType(tm: MExpr): String = typename(tm)
-  override def fqParamType(tm: MExpr): String = fqTypename(tm)
+  override def paramType(tm: MExpr): String = toJavaValueType(tm, None)
+  override def fqParamType(tm: MExpr): String = toJavaValueType(tm, spec.javaPackage)
 
-  override def returnType(ret: Option[TypeRef]): String = ret.fold("void")(ty => toJavaType(ty.resolved, None))
-  override def fqReturnType(ret: Option[TypeRef]): String = ret.fold("void")(ty => toJavaType(ty.resolved, spec.javaPackage))
+  override def returnType(ret: Option[TypeRef]): String = ret.fold("void")(ty => toJavaValueType(ty.resolved, None))
+  override def fqReturnType(ret: Option[TypeRef]): String = ret.fold("void")(ty => toJavaValueType(ty.resolved, spec.javaPackage))
 
-  override def fieldType(tm: MExpr): String = typename(tm)
-  override def fqFieldType(tm: MExpr): String = fqTypename(tm)
+  override def fieldType(tm: MExpr): String = toJavaValueType(tm, None)
+  override def fqFieldType(tm: MExpr): String = toJavaValueType(tm, spec.javaPackage)
 
   override def toCpp(tm: MExpr, expr: String): String = throw new AssertionError("direct java to cpp conversion not possible")
   override def fromCpp(tm: MExpr, expr: String): String = throw new AssertionError("direct cpp to java conversion not possible")
@@ -36,6 +36,7 @@ class JavaMarshal(spec: Spec) extends Marshal(spec) {
         case MDate => List(ImportRef("java.util.Date"))
         case _ => List()
       }
+    case e if isEnumFlags(e) => List(ImportRef("java.util.EnumSet"))
     case _ => List()
   }
 
@@ -66,6 +67,21 @@ class JavaMarshal(spec: Spec) extends Marshal(spec) {
     case e: Enum =>  true
   }
 
+  def isEnumFlags(m: Meta): Boolean = m match {
+    case MDef(_, _, _, Enum(_, true)) => true
+    case MExtern(_, _, _, Enum(_, true), _, _, _, _, _) => true
+    case _ => false
+  }
+  def isEnumFlags(tm: MExpr): Boolean = tm.base match {
+    case MOptional => isEnumFlags(tm.args.head)
+    case _ => isEnumFlags(tm.base)
+  }
+
+  private def toJavaValueType(tm: MExpr, packageName: Option[String]): String = {
+    val name = toJavaType(tm, packageName)
+    if(isEnumFlags(tm)) s"EnumSet<$name>" else name
+  }
+
   private def toJavaType(tm: MExpr, packageName: Option[String]): String = {
     def args(tm: MExpr) = if (tm.args.isEmpty) "" else tm.args.map(f(_, true)).mkString("<", ", ", ">")
     def f(tm: MExpr, needRef: Boolean): String = {
diff --git a/src/source/ObjcGenerator.scala b/src/source/ObjcGenerator.scala
index 3d573aad5..c62f60b9a 100644
--- a/src/source/ObjcGenerator.scala
+++ b/src/source/ObjcGenerator.scala
@@ -51,12 +51,11 @@ class ObjcGenerator(spec: Spec) extends BaseObjcGenerator(spec) {
     val self = marshal.typename(ident, e)
     writeObjcFile(marshal.headerName(ident), origin, refs.header, w => {
       writeDoc(w, doc)
-      w.wl(s"typedef NS_ENUM(NSInteger, $self)")
+      w.wl(if(e.flags) s"typedef NS_OPTIONS(NSUInteger, $self)" else s"typedef NS_ENUM(NSInteger, $self)")
       w.bracedSemi {
-        for (i <- e.options) {
-          writeDoc(w, i.doc)
-          w.wl(self + idObjc.enum(i.ident.name) + ",")
-        }
+        writeEnumOptionNone(w, e, self + idObjc.enum(_))
+        writeEnumOptions(w, e, self + idObjc.enum(_))
+        writeEnumOptionAll(w, e, self + idObjc.enum(_))
       }
     })
   }
diff --git a/src/source/YamlGenerator.scala b/src/source/YamlGenerator.scala
index 6b6fe8b83..42b53b568 100644
--- a/src/source/YamlGenerator.scala
+++ b/src/source/YamlGenerator.scala
@@ -106,7 +106,8 @@ class YamlGenerator(spec: Spec) extends Generator(spec) {
     td.body match {
       case i: Interface => "interface" + ext(i.ext)
       case r: Record => "record" + ext(r.ext) + deriving(r)
-      case e: Enum => "enum"
+      case Enum(_, false) => "enum"
+      case Enum(_, true) => "flags"
     }
   }
 
diff --git a/src/source/ast.scala b/src/source/ast.scala
index 6d2ca62c8..30117f019 100644
--- a/src/source/ast.scala
+++ b/src/source/ast.scala
@@ -61,9 +61,14 @@ sealed abstract class TypeDef
 
 case class Const(ident: Ident, ty: TypeRef, value: Any, doc: Doc)
 
-case class Enum(options: Seq[Enum.Option]) extends TypeDef
+case class Enum(options: Seq[Enum.Option], flags: Boolean) extends TypeDef
 object Enum {
-  case class Option(ident: Ident, doc: Doc)
+  object SpecialFlag extends Enumeration {
+    type SpecialFlag = Value
+    val NoFlags, AllFlags = Value
+  }
+  import SpecialFlag._
+  case class Option(ident: Ident, doc: Doc, specialFlag: scala.Option[SpecialFlag])
 }
 
 case class Record(ext: Ext, fields: Seq[Field], consts: Seq[Const], derivingTypes: Set[DerivingType]) extends TypeDef
diff --git a/src/source/generator.scala b/src/source/generator.scala
index 8261400a7..d1263987c 100644
--- a/src/source/generator.scala
+++ b/src/source/generator.scala
@@ -386,6 +386,33 @@ abstract class Generator(spec: Spec)
     w.w(end)
   }
 
+  def normalEnumOptions(e: Enum) = e.options.filter(_.specialFlag == None)
+
+  def writeEnumOptionNone(w: IndentWriter, e: Enum, ident: IdentConverter) {
+    for (o <- e.options.find(_.specialFlag == Some(Enum.SpecialFlag.NoFlags))) {
+      writeDoc(w, o.doc)
+      w.wl(ident(o.ident.name) + " = 0,")
+    }
+  }
+
+  def writeEnumOptions(w: IndentWriter, e: Enum, ident: IdentConverter) {
+    var shift = 0
+    for (o <- normalEnumOptions(e)) {
+      writeDoc(w, o.doc)
+      w.wl(ident(o.ident.name) + (if(e.flags) s" = 1 << $shift" else "") + ",")
+      shift += 1
+    }
+  }
+
+  def writeEnumOptionAll(w: IndentWriter, e: Enum, ident: IdentConverter) {
+    for (o <- e.options.find(_.specialFlag == Some(Enum.SpecialFlag.AllFlags))) {
+      writeDoc(w, o.doc)
+      w.w(ident(o.ident.name) + " = ")
+      w.w(normalEnumOptions(e).map(o => ident(o.ident.name)).fold("0")((acc, o) => acc + " | " + o))
+      w.wl(",")
+    }
+  }
+
   // --------------------------------------------------------------------------
 
   def writeDoc(w: IndentWriter, doc: Doc) {
diff --git a/src/source/parser.scala b/src/source/parser.scala
index 95f8a7696..b9db73eb8 100644
--- a/src/source/parser.scala
+++ b/src/source/parser.scala
@@ -105,7 +105,7 @@ private object IdlParser extends RegexParsers {
     success(Ext(foundJava, foundCpp, foundObjc))
   }
 
-  def typeDef: Parser[TypeDef] = record | enum | interface
+  def typeDef: Parser[TypeDef] = record | enum | flags | interface
 
   def recordHeader = "record" ~> extRecord
   def record: Parser[Record] = recordHeader ~ bracesList(field | const) ~ opt(deriving) ^^ {
@@ -127,10 +127,25 @@ private object IdlParser extends RegexParsers {
     }).toSet
   }
 
+  def flagsAll = "all".r
+  def flagsNone = "none".r
+
   def enumHeader = "enum".r
-  def enum: Parser[Enum] = enumHeader ~> bracesList(enumOption) ^^ Enum.apply
+  def flagsHeader = "flags".r
+  def enum: Parser[Enum] = enumHeader ~> bracesList(enumOption) ^^ {
+    case items => Enum(items, false)
+  }
+  def flags: Parser[Enum] = flagsHeader ~> bracesList(flagsOption) ^^ {
+    case items => Enum(items, true)
+  }
+
   def enumOption: Parser[Enum.Option] = doc ~ ident ^^ {
-    case doc~ident => Enum.Option(ident, doc)
+    case doc~ident => Enum.Option(ident, doc, None)
+  }
+  def flagsOption: Parser[Enum.Option] = doc ~ ident ~ opt("=" ~> (flagsAll | flagsNone)) ^^ {
+    case doc~ident~None => Enum.Option(ident, doc, None)
+    case doc~ident~Some("all") => Enum.Option(ident, doc, Some(Enum.SpecialFlag.AllFlags))
+    case doc~ident~Some("none") => Enum.Option(ident, doc, Some(Enum.SpecialFlag.NoFlags))
   }
 
   def interfaceHeader = "interface" ~> extInterface
@@ -142,8 +157,9 @@ private object IdlParser extends RegexParsers {
     }
   }
 
-  def externTypeDecl: Parser[TypeDef] = externEnum | externInterface | externRecord
-  def externEnum: Parser[Enum] = enumHeader ^^ { case _ => Enum(List()) }
+  def externTypeDecl: Parser[TypeDef] = externEnum | externFlags | externInterface | externRecord
+  def externEnum: Parser[Enum] = enumHeader ^^ { case _ => Enum(List(), false) }
+  def externFlags: Parser[Enum] = flagsHeader ^^ { case _ => Enum(List(), true) }
   def externRecord: Parser[Record] = recordHeader ~ opt(deriving) ^^ { case ext~deriving => Record(ext, List(), List(), deriving.getOrElse(Set[DerivingType]())) }
   def externInterface: Parser[Interface] = interfaceHeader ^^ { case ext => Interface(ext, List(), List()) }
 
diff --git a/support-lib/jni/djinni_support.cpp b/support-lib/jni/djinni_support.cpp
index 1874e5644..deb3cc3f8 100644
--- a/support-lib/jni/djinni_support.cpp
+++ b/support-lib/jni/djinni_support.cpp
@@ -267,6 +267,40 @@ LocalRef<jobject> JniEnum::create(JNIEnv * env, jint value) const {
     return result;
 }
 
+JniFlags::JniFlags(const std::string & name)
+    : JniEnum { name }
+    {}
+
+unsigned JniFlags::flags(JNIEnv * env, jobject obj) const {
+    DJINNI_ASSERT(obj && env->IsInstanceOf(obj, m_clazz.get()), env);
+    auto size = env->CallIntMethod(obj, m_methSize);
+    jniExceptionCheck(env);
+    unsigned flags = 0;
+    auto it = LocalRef<jobject>(env, env->CallObjectMethod(obj, m_methIterator));
+    jniExceptionCheck(env);
+    for(jint i = 0; i < size; ++i) {
+        auto jf = LocalRef<jobject>(env, env->CallObjectMethod(it, m_iterator.methNext));
+        jniExceptionCheck(env);
+        flags |= (1u << static_cast<unsigned>(ordinal(env, jf)));
+    }
+    return flags;
+}
+
+LocalRef<jobject> JniFlags::create(JNIEnv * env, unsigned flags, int bits) const {
+    auto j = LocalRef<jobject>(env, env->CallStaticObjectMethod(m_clazz.get(), m_methNoneOf, enumClass()));
+    jniExceptionCheck(env);
+    unsigned mask = 1;
+    for(int i = 0; i < bits; ++i, mask <<= 1) {
+        if((flags & mask) != 0) {
+            auto jf = create(env, static_cast<jint>(i));
+            jniExceptionCheck(env);
+            env->CallBooleanMethod(j, m_methAdd, jf.get());
+            jniExceptionCheck(env);
+        }
+    }
+    return j;
+}
+
 JniLocalScope::JniLocalScope(JNIEnv* p_env, jint capacity, bool throwOnError)
     : m_env(p_env)
     , m_success(_pushLocalFrame(m_env, capacity)) {
diff --git a/support-lib/jni/djinni_support.hpp b/support-lib/jni/djinni_support.hpp
index d9f5bbc8d..ddae5049d 100644
--- a/support-lib/jni/djinni_support.hpp
+++ b/support-lib/jni/djinni_support.hpp
@@ -546,6 +546,7 @@ class JniEnum {
 
 protected:
     JniEnum(const std::string & name);
+    jclass enumClass() const { return m_clazz.get(); }
 
 private:
     const GlobalRef<jclass> m_clazz;
@@ -553,6 +554,37 @@ class JniEnum {
     const jmethodID m_methOrdinal;
 };
 
+class JniFlags : private JniEnum {
+public:
+    /*
+     * Given a Java EnumSet convert it to the corresponding bit pattern
+     * which can then be static_cast<> to the actual enum.
+     */
+    unsigned flags(JNIEnv * env, jobject obj) const;
+
+    /*
+     * Create a Java EnumSet of the specified flags considering the given number of active bits.
+     */
+    LocalRef<jobject> create(JNIEnv * env, unsigned flags, int bits) const;
+
+    using JniEnum::create;
+
+protected:
+    JniFlags(const std::string & name);
+
+private:
+    const GlobalRef<jclass> m_clazz { jniFindClass("java/util/EnumSet") };
+    const jmethodID m_methNoneOf { jniGetStaticMethodID(m_clazz.get(), "noneOf", "(Ljava/lang/Class;)Ljava/util/EnumSet;") };
+    const jmethodID m_methAdd { jniGetMethodID(m_clazz.get(), "add", "(Ljava/lang/Object;)Z") };
+    const jmethodID m_methIterator { jniGetMethodID(m_clazz.get(), "iterator", "()Ljava/util/Iterator;") };
+    const jmethodID m_methSize { jniGetMethodID(m_clazz.get(), "size", "()I") };
+
+    struct {
+        const GlobalRef<jclass> clazz { jniFindClass("java/util/Iterator") };
+        const jmethodID methNext { jniGetMethodID(clazz.get(), "next", "()Ljava/lang/Object;") };
+    } m_iterator;
+};
+
 #define DJINNI_FUNCTION_PROLOGUE0(env_)
 #define DJINNI_FUNCTION_PROLOGUE1(env_, arg1_)
 
diff --git a/support-lib/objc/DJIMarshal+Private.h b/support-lib/objc/DJIMarshal+Private.h
index b889df3d8..f0ff9d9a5 100644
--- a/support-lib/objc/DJIMarshal+Private.h
+++ b/support-lib/objc/DJIMarshal+Private.h
@@ -11,6 +11,7 @@
 #include <chrono>
 #include <cstdint>
 #include <string>
+#include <type_traits>
 #include <unordered_set>
 #include <unordered_map>
 #include <vector>
@@ -94,8 +95,17 @@ struct Enum {
 
     struct Boxed {
         using ObjcType = NSNumber*;
-        static CppType toCpp(ObjcType x) noexcept { return Enum::toCpp(static_cast<Enum::ObjcType>([x integerValue])); }
-        static ObjcType fromCpp(CppType x) noexcept { return [NSNumber numberWithInteger:static_cast<NSInteger>(Enum::fromCpp(x))]; }
+        static CppType toCpp(ObjcType x) noexcept { return toCpp(x, Tag<typename std::underlying_type<CppType>::type>()); }
+        static ObjcType fromCpp(CppType x) noexcept { return fromCpp(x, Tag<typename std::underlying_type<CppType>::type>()); }
+
+    private:
+        template<class T> struct Tag { };
+
+        static CppType toCpp(ObjcType x, Tag<int>) noexcept { return Enum::toCpp(static_cast<Enum::ObjcType>([x integerValue])); }
+        static ObjcType fromCpp(CppType x, Tag<int>) noexcept { return [NSNumber numberWithInteger:static_cast<NSInteger>(Enum::fromCpp(x))]; }
+
+        static CppType toCpp(ObjcType x, Tag<unsigned>) noexcept { return Enum::toCpp(static_cast<Enum::ObjcType>([x unsignedIntegerValue])); }
+        static ObjcType fromCpp(CppType x, Tag<unsigned>) noexcept { return [NSNumber numberWithUnsignedInteger:static_cast<NSUInteger>(Enum::fromCpp(x))]; }
     };
 };
 
diff --git a/test-suite/djinni/enum.djinni b/test-suite/djinni/enum.djinni
index af56c695c..efbc9c492 100644
--- a/test-suite/djinni/enum.djinni
+++ b/test-suite/djinni/enum.djinni
@@ -26,3 +26,33 @@ enum_usage_interface = interface +c +j +o {
     s(s: set<color>): set<color>;
     m(m: map<color, color>): map<color, color>;
 }
+
+access_flags = flags {
+  nobody = none;
+  owner_read;
+  owner_write;
+  owner_execute;
+  group_read;
+  group_write;
+  group_execute;
+  system_read;
+  system_write;
+  system_execute;
+  everybody = all;
+}
+
+empty_flags = flags {
+  none = none;
+  all = all;
+}
+
+flag_roundtrip = interface +c {
+  static roundtrip_access(flag: access_flags): access_flags;
+  static roundtrip_empty(flag: empty_flags): empty_flags;
+  static roundtrip_access_boxed(flag: optional<access_flags>): optional<access_flags>;
+  static roundtrip_empty_boxed(flag: optional<empty_flags>): optional<empty_flags>;
+}
+
+record_with_flags = record {
+  access: access_flags;
+}
diff --git a/test-suite/generated-src/cpp/access_flags.hpp b/test-suite/generated-src/cpp/access_flags.hpp
new file mode 100644
index 000000000..00848a6e5
--- /dev/null
+++ b/test-suite/generated-src/cpp/access_flags.hpp
@@ -0,0 +1,56 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from enum.djinni
+
+#pragma once
+
+#include <functional>
+
+namespace testsuite {
+
+enum class access_flags : unsigned {
+    NOBODY = 0,
+    OWNER_READ = 1 << 0,
+    OWNER_WRITE = 1 << 1,
+    OWNER_EXECUTE = 1 << 2,
+    GROUP_READ = 1 << 3,
+    GROUP_WRITE = 1 << 4,
+    GROUP_EXECUTE = 1 << 5,
+    SYSTEM_READ = 1 << 6,
+    SYSTEM_WRITE = 1 << 7,
+    SYSTEM_EXECUTE = 1 << 8,
+    EVERYBODY = 0 | OWNER_READ | OWNER_WRITE | OWNER_EXECUTE | GROUP_READ | GROUP_WRITE | GROUP_EXECUTE | SYSTEM_READ | SYSTEM_WRITE | SYSTEM_EXECUTE,
+};
+constexpr access_flags operator|(access_flags lhs, access_flags rhs) noexcept {
+    return static_cast<access_flags>(static_cast<unsigned>(lhs) | static_cast<unsigned>(rhs));
+}
+constexpr access_flags& operator|=(access_flags& lhs, access_flags rhs) noexcept {
+    return lhs = lhs | rhs;
+}
+constexpr access_flags operator&(access_flags lhs, access_flags rhs) noexcept {
+    return static_cast<access_flags>(static_cast<unsigned>(lhs) & static_cast<unsigned>(rhs));
+}
+constexpr access_flags& operator&=(access_flags& lhs, access_flags rhs) noexcept {
+    return lhs = lhs & rhs;
+}
+constexpr access_flags operator^(access_flags lhs, access_flags rhs) noexcept {
+    return static_cast<access_flags>(static_cast<unsigned>(lhs) ^ static_cast<unsigned>(rhs));
+}
+constexpr access_flags& operator^=(access_flags& lhs, access_flags rhs) noexcept {
+    return lhs = lhs ^ rhs;
+}
+constexpr access_flags operator~(access_flags x) noexcept {
+    return static_cast<access_flags>(~static_cast<unsigned>(x));
+}
+
+}  // namespace testsuite
+
+namespace std {
+
+template <>
+struct hash<::testsuite::access_flags> {
+    size_t operator()(::testsuite::access_flags type) const {
+        return std::hash<unsigned>()(static_cast<unsigned>(type));
+    }
+};
+
+}  // namespace std
diff --git a/test-suite/generated-src/cpp/empty_flags.hpp b/test-suite/generated-src/cpp/empty_flags.hpp
new file mode 100644
index 000000000..25f08a39d
--- /dev/null
+++ b/test-suite/generated-src/cpp/empty_flags.hpp
@@ -0,0 +1,47 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from enum.djinni
+
+#pragma once
+
+#include <functional>
+
+namespace testsuite {
+
+enum class empty_flags : unsigned {
+    NONE = 0,
+    ALL = 0,
+};
+constexpr empty_flags operator|(empty_flags lhs, empty_flags rhs) noexcept {
+    return static_cast<empty_flags>(static_cast<unsigned>(lhs) | static_cast<unsigned>(rhs));
+}
+constexpr empty_flags& operator|=(empty_flags& lhs, empty_flags rhs) noexcept {
+    return lhs = lhs | rhs;
+}
+constexpr empty_flags operator&(empty_flags lhs, empty_flags rhs) noexcept {
+    return static_cast<empty_flags>(static_cast<unsigned>(lhs) & static_cast<unsigned>(rhs));
+}
+constexpr empty_flags& operator&=(empty_flags& lhs, empty_flags rhs) noexcept {
+    return lhs = lhs & rhs;
+}
+constexpr empty_flags operator^(empty_flags lhs, empty_flags rhs) noexcept {
+    return static_cast<empty_flags>(static_cast<unsigned>(lhs) ^ static_cast<unsigned>(rhs));
+}
+constexpr empty_flags& operator^=(empty_flags& lhs, empty_flags rhs) noexcept {
+    return lhs = lhs ^ rhs;
+}
+constexpr empty_flags operator~(empty_flags x) noexcept {
+    return static_cast<empty_flags>(~static_cast<unsigned>(x));
+}
+
+}  // namespace testsuite
+
+namespace std {
+
+template <>
+struct hash<::testsuite::empty_flags> {
+    size_t operator()(::testsuite::empty_flags type) const {
+        return std::hash<unsigned>()(static_cast<unsigned>(type));
+    }
+};
+
+}  // namespace std
diff --git a/test-suite/generated-src/cpp/flag_roundtrip.hpp b/test-suite/generated-src/cpp/flag_roundtrip.hpp
new file mode 100644
index 000000000..96ae75232
--- /dev/null
+++ b/test-suite/generated-src/cpp/flag_roundtrip.hpp
@@ -0,0 +1,26 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from enum.djinni
+
+#pragma once
+
+#include "../../handwritten-src/cpp/optional.hpp"
+
+namespace testsuite {
+
+enum class access_flags : unsigned;
+enum class empty_flags : unsigned;
+
+class FlagRoundtrip {
+public:
+    virtual ~FlagRoundtrip() {}
+
+    static access_flags roundtrip_access(access_flags flag);
+
+    static empty_flags roundtrip_empty(empty_flags flag);
+
+    static std::experimental::optional<access_flags> roundtrip_access_boxed(std::experimental::optional<access_flags> flag);
+
+    static std::experimental::optional<empty_flags> roundtrip_empty_boxed(std::experimental::optional<empty_flags> flag);
+};
+
+}  // namespace testsuite
diff --git a/test-suite/generated-src/cpp/record_with_flags.hpp b/test-suite/generated-src/cpp/record_with_flags.hpp
new file mode 100644
index 000000000..2a979c3fb
--- /dev/null
+++ b/test-suite/generated-src/cpp/record_with_flags.hpp
@@ -0,0 +1,19 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from enum.djinni
+
+#pragma once
+
+#include "access_flags.hpp"
+#include <utility>
+
+namespace testsuite {
+
+struct RecordWithFlags final {
+    access_flags access;
+
+    RecordWithFlags(access_flags access_)
+    : access(std::move(access_))
+    {}
+};
+
+}  // namespace testsuite
diff --git a/test-suite/generated-src/java/com/dropbox/djinni/test/AccessFlags.java b/test-suite/generated-src/java/com/dropbox/djinni/test/AccessFlags.java
new file mode 100644
index 000000000..6fc9fa6e9
--- /dev/null
+++ b/test-suite/generated-src/java/com/dropbox/djinni/test/AccessFlags.java
@@ -0,0 +1,20 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from enum.djinni
+
+package com.dropbox.djinni.test;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
+public enum AccessFlags {
+    OWNER_READ,
+    OWNER_WRITE,
+    OWNER_EXECUTE,
+    GROUP_READ,
+    GROUP_WRITE,
+    GROUP_EXECUTE,
+    SYSTEM_READ,
+    SYSTEM_WRITE,
+    SYSTEM_EXECUTE,
+    ;
+}
diff --git a/test-suite/generated-src/java/com/dropbox/djinni/test/EmptyFlags.java b/test-suite/generated-src/java/com/dropbox/djinni/test/EmptyFlags.java
new file mode 100644
index 000000000..8828a9651
--- /dev/null
+++ b/test-suite/generated-src/java/com/dropbox/djinni/test/EmptyFlags.java
@@ -0,0 +1,11 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from enum.djinni
+
+package com.dropbox.djinni.test;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
+public enum EmptyFlags {
+    ;
+}
diff --git a/test-suite/generated-src/java/com/dropbox/djinni/test/FlagRoundtrip.java b/test-suite/generated-src/java/com/dropbox/djinni/test/FlagRoundtrip.java
new file mode 100644
index 000000000..70138bc1e
--- /dev/null
+++ b/test-suite/generated-src/java/com/dropbox/djinni/test/FlagRoundtrip.java
@@ -0,0 +1,47 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from enum.djinni
+
+package com.dropbox.djinni.test;
+
+import java.util.EnumSet;
+import java.util.concurrent.atomic.AtomicBoolean;
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
+public abstract class FlagRoundtrip {
+    @Nonnull
+    public static native EnumSet<AccessFlags> roundtripAccess(@Nonnull EnumSet<AccessFlags> flag);
+
+    @Nonnull
+    public static native EnumSet<EmptyFlags> roundtripEmpty(@Nonnull EnumSet<EmptyFlags> flag);
+
+    @CheckForNull
+    public static native EnumSet<AccessFlags> roundtripAccessBoxed(@CheckForNull EnumSet<AccessFlags> flag);
+
+    @CheckForNull
+    public static native EnumSet<EmptyFlags> roundtripEmptyBoxed(@CheckForNull EnumSet<EmptyFlags> flag);
+
+    private static final class CppProxy extends FlagRoundtrip
+    {
+        private final long nativeRef;
+        private final AtomicBoolean destroyed = new AtomicBoolean(false);
+
+        private CppProxy(long nativeRef)
+        {
+            if (nativeRef == 0) throw new RuntimeException("nativeRef is zero");
+            this.nativeRef = nativeRef;
+        }
+
+        private native void nativeDestroy(long nativeRef);
+        public void destroy()
+        {
+            boolean destroyed = this.destroyed.getAndSet(true);
+            if (!destroyed) nativeDestroy(this.nativeRef);
+        }
+        protected void finalize() throws java.lang.Throwable
+        {
+            destroy();
+            super.finalize();
+        }
+    }
+}
diff --git a/test-suite/generated-src/java/com/dropbox/djinni/test/RecordWithFlags.java b/test-suite/generated-src/java/com/dropbox/djinni/test/RecordWithFlags.java
new file mode 100644
index 000000000..00f85d43c
--- /dev/null
+++ b/test-suite/generated-src/java/com/dropbox/djinni/test/RecordWithFlags.java
@@ -0,0 +1,32 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from enum.djinni
+
+package com.dropbox.djinni.test;
+
+import java.util.EnumSet;
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
+public class RecordWithFlags {
+
+
+    /*package*/ final EnumSet<AccessFlags> mAccess;
+
+    public RecordWithFlags(
+            @Nonnull EnumSet<AccessFlags> access) {
+        this.mAccess = access;
+    }
+
+    @Nonnull
+    public EnumSet<AccessFlags> getAccess() {
+        return mAccess;
+    }
+
+    @Override
+    public String toString() {
+        return "RecordWithFlags{" +
+                "mAccess=" + mAccess +
+        "}";
+    }
+
+}
diff --git a/test-suite/generated-src/jni/NativeAccessFlags.hpp b/test-suite/generated-src/jni/NativeAccessFlags.hpp
new file mode 100644
index 000000000..cea29ea76
--- /dev/null
+++ b/test-suite/generated-src/jni/NativeAccessFlags.hpp
@@ -0,0 +1,26 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from enum.djinni
+
+#pragma once
+
+#include "access_flags.hpp"
+#include "djinni_support.hpp"
+
+namespace djinni_generated {
+
+class NativeAccessFlags final : ::djinni::JniFlags {
+public:
+    using CppType = ::testsuite::access_flags;
+    using JniType = jobject;
+
+    using Boxed = NativeAccessFlags;
+
+    static CppType toCpp(JNIEnv* jniEnv, JniType j) { return static_cast<CppType>(::djinni::JniClass<NativeAccessFlags>::get().flags(jniEnv, j)); }
+    static ::djinni::LocalRef<JniType> fromCpp(JNIEnv* jniEnv, CppType c) { return ::djinni::JniClass<NativeAccessFlags>::get().create(jniEnv, static_cast<unsigned>(c), 9); }
+
+private:
+    NativeAccessFlags() : JniFlags("com/dropbox/djinni/test/AccessFlags") {}
+    friend ::djinni::JniClass<NativeAccessFlags>;
+};
+
+}  // namespace djinni_generated
diff --git a/test-suite/generated-src/jni/NativeEmptyFlags.hpp b/test-suite/generated-src/jni/NativeEmptyFlags.hpp
new file mode 100644
index 000000000..3ee38c72a
--- /dev/null
+++ b/test-suite/generated-src/jni/NativeEmptyFlags.hpp
@@ -0,0 +1,26 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from enum.djinni
+
+#pragma once
+
+#include "djinni_support.hpp"
+#include "empty_flags.hpp"
+
+namespace djinni_generated {
+
+class NativeEmptyFlags final : ::djinni::JniFlags {
+public:
+    using CppType = ::testsuite::empty_flags;
+    using JniType = jobject;
+
+    using Boxed = NativeEmptyFlags;
+
+    static CppType toCpp(JNIEnv* jniEnv, JniType j) { return static_cast<CppType>(::djinni::JniClass<NativeEmptyFlags>::get().flags(jniEnv, j)); }
+    static ::djinni::LocalRef<JniType> fromCpp(JNIEnv* jniEnv, CppType c) { return ::djinni::JniClass<NativeEmptyFlags>::get().create(jniEnv, static_cast<unsigned>(c), 0); }
+
+private:
+    NativeEmptyFlags() : JniFlags("com/dropbox/djinni/test/EmptyFlags") {}
+    friend ::djinni::JniClass<NativeEmptyFlags>;
+};
+
+}  // namespace djinni_generated
diff --git a/test-suite/generated-src/jni/NativeFlagRoundtrip.cpp b/test-suite/generated-src/jni/NativeFlagRoundtrip.cpp
new file mode 100644
index 000000000..917305901
--- /dev/null
+++ b/test-suite/generated-src/jni/NativeFlagRoundtrip.cpp
@@ -0,0 +1,60 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from enum.djinni
+
+#include "NativeFlagRoundtrip.hpp"  // my header
+#include "Marshal.hpp"
+#include "NativeAccessFlags.hpp"
+#include "NativeEmptyFlags.hpp"
+
+namespace djinni_generated {
+
+NativeFlagRoundtrip::NativeFlagRoundtrip() : ::djinni::JniInterface<::testsuite::FlagRoundtrip, NativeFlagRoundtrip>("com/dropbox/djinni/test/FlagRoundtrip$CppProxy") {}
+
+NativeFlagRoundtrip::~NativeFlagRoundtrip() = default;
+
+
+CJNIEXPORT void JNICALL Java_com_dropbox_djinni_test_FlagRoundtrip_00024CppProxy_nativeDestroy(JNIEnv* jniEnv, jobject /*this*/, jlong nativeRef)
+{
+    try {
+        DJINNI_FUNCTION_PROLOGUE1(jniEnv, nativeRef);
+        delete reinterpret_cast<::djinni::CppProxyHandle<::testsuite::FlagRoundtrip>*>(nativeRef);
+    } JNI_TRANSLATE_EXCEPTIONS_RETURN(jniEnv, )
+}
+
+CJNIEXPORT jobject JNICALL Java_com_dropbox_djinni_test_FlagRoundtrip_roundtripAccess(JNIEnv* jniEnv, jobject /*this*/, jobject j_flag)
+{
+    try {
+        DJINNI_FUNCTION_PROLOGUE0(jniEnv);
+        auto r = ::testsuite::FlagRoundtrip::roundtrip_access(::djinni_generated::NativeAccessFlags::toCpp(jniEnv, j_flag));
+        return ::djinni::release(::djinni_generated::NativeAccessFlags::fromCpp(jniEnv, r));
+    } JNI_TRANSLATE_EXCEPTIONS_RETURN(jniEnv, 0 /* value doesn't matter */)
+}
+
+CJNIEXPORT jobject JNICALL Java_com_dropbox_djinni_test_FlagRoundtrip_roundtripEmpty(JNIEnv* jniEnv, jobject /*this*/, jobject j_flag)
+{
+    try {
+        DJINNI_FUNCTION_PROLOGUE0(jniEnv);
+        auto r = ::testsuite::FlagRoundtrip::roundtrip_empty(::djinni_generated::NativeEmptyFlags::toCpp(jniEnv, j_flag));
+        return ::djinni::release(::djinni_generated::NativeEmptyFlags::fromCpp(jniEnv, r));
+    } JNI_TRANSLATE_EXCEPTIONS_RETURN(jniEnv, 0 /* value doesn't matter */)
+}
+
+CJNIEXPORT jobject JNICALL Java_com_dropbox_djinni_test_FlagRoundtrip_roundtripAccessBoxed(JNIEnv* jniEnv, jobject /*this*/, jobject j_flag)
+{
+    try {
+        DJINNI_FUNCTION_PROLOGUE0(jniEnv);
+        auto r = ::testsuite::FlagRoundtrip::roundtrip_access_boxed(::djinni::Optional<std::experimental::optional, ::djinni_generated::NativeAccessFlags>::toCpp(jniEnv, j_flag));
+        return ::djinni::release(::djinni::Optional<std::experimental::optional, ::djinni_generated::NativeAccessFlags>::fromCpp(jniEnv, r));
+    } JNI_TRANSLATE_EXCEPTIONS_RETURN(jniEnv, 0 /* value doesn't matter */)
+}
+
+CJNIEXPORT jobject JNICALL Java_com_dropbox_djinni_test_FlagRoundtrip_roundtripEmptyBoxed(JNIEnv* jniEnv, jobject /*this*/, jobject j_flag)
+{
+    try {
+        DJINNI_FUNCTION_PROLOGUE0(jniEnv);
+        auto r = ::testsuite::FlagRoundtrip::roundtrip_empty_boxed(::djinni::Optional<std::experimental::optional, ::djinni_generated::NativeEmptyFlags>::toCpp(jniEnv, j_flag));
+        return ::djinni::release(::djinni::Optional<std::experimental::optional, ::djinni_generated::NativeEmptyFlags>::fromCpp(jniEnv, r));
+    } JNI_TRANSLATE_EXCEPTIONS_RETURN(jniEnv, 0 /* value doesn't matter */)
+}
+
+}  // namespace djinni_generated
diff --git a/test-suite/generated-src/jni/NativeFlagRoundtrip.hpp b/test-suite/generated-src/jni/NativeFlagRoundtrip.hpp
new file mode 100644
index 000000000..668faf24a
--- /dev/null
+++ b/test-suite/generated-src/jni/NativeFlagRoundtrip.hpp
@@ -0,0 +1,32 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from enum.djinni
+
+#pragma once
+
+#include "djinni_support.hpp"
+#include "flag_roundtrip.hpp"
+
+namespace djinni_generated {
+
+class NativeFlagRoundtrip final : ::djinni::JniInterface<::testsuite::FlagRoundtrip, NativeFlagRoundtrip> {
+public:
+    using CppType = std::shared_ptr<::testsuite::FlagRoundtrip>;
+    using CppOptType = std::shared_ptr<::testsuite::FlagRoundtrip>;
+    using JniType = jobject;
+
+    using Boxed = NativeFlagRoundtrip;
+
+    ~NativeFlagRoundtrip();
+
+    static CppType toCpp(JNIEnv* jniEnv, JniType j) { return ::djinni::JniClass<NativeFlagRoundtrip>::get()._fromJava(jniEnv, j); }
+    static ::djinni::LocalRef<JniType> fromCppOpt(JNIEnv* jniEnv, const CppOptType& c) { return {jniEnv, ::djinni::JniClass<NativeFlagRoundtrip>::get()._toJava(jniEnv, c)}; }
+    static ::djinni::LocalRef<JniType> fromCpp(JNIEnv* jniEnv, const CppType& c) { return fromCppOpt(jniEnv, c); }
+
+private:
+    NativeFlagRoundtrip();
+    friend ::djinni::JniClass<NativeFlagRoundtrip>;
+    friend ::djinni::JniInterface<::testsuite::FlagRoundtrip, NativeFlagRoundtrip>;
+
+};
+
+}  // namespace djinni_generated
diff --git a/test-suite/generated-src/jni/NativeRecordWithFlags.cpp b/test-suite/generated-src/jni/NativeRecordWithFlags.cpp
new file mode 100644
index 000000000..9a4af8576
--- /dev/null
+++ b/test-suite/generated-src/jni/NativeRecordWithFlags.cpp
@@ -0,0 +1,28 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from enum.djinni
+
+#include "NativeRecordWithFlags.hpp"  // my header
+#include "NativeAccessFlags.hpp"
+
+namespace djinni_generated {
+
+NativeRecordWithFlags::NativeRecordWithFlags() = default;
+
+NativeRecordWithFlags::~NativeRecordWithFlags() = default;
+
+auto NativeRecordWithFlags::fromCpp(JNIEnv* jniEnv, const CppType& c) -> ::djinni::LocalRef<JniType> {
+    const auto& data = ::djinni::JniClass<NativeRecordWithFlags>::get();
+    auto r = ::djinni::LocalRef<JniType>{jniEnv->NewObject(data.clazz.get(), data.jconstructor,
+                                                           ::djinni::get(::djinni_generated::NativeAccessFlags::fromCpp(jniEnv, c.access)))};
+    ::djinni::jniExceptionCheck(jniEnv);
+    return r;
+}
+
+auto NativeRecordWithFlags::toCpp(JNIEnv* jniEnv, JniType j) -> CppType {
+    ::djinni::JniLocalScope jscope(jniEnv, 2);
+    assert(j != nullptr);
+    const auto& data = ::djinni::JniClass<NativeRecordWithFlags>::get();
+    return {::djinni_generated::NativeAccessFlags::toCpp(jniEnv, jniEnv->GetObjectField(j, data.field_mAccess))};
+}
+
+}  // namespace djinni_generated
diff --git a/test-suite/generated-src/jni/NativeRecordWithFlags.hpp b/test-suite/generated-src/jni/NativeRecordWithFlags.hpp
new file mode 100644
index 000000000..ed963cf6b
--- /dev/null
+++ b/test-suite/generated-src/jni/NativeRecordWithFlags.hpp
@@ -0,0 +1,32 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from enum.djinni
+
+#pragma once
+
+#include "djinni_support.hpp"
+#include "record_with_flags.hpp"
+
+namespace djinni_generated {
+
+class NativeRecordWithFlags final {
+public:
+    using CppType = ::testsuite::RecordWithFlags;
+    using JniType = jobject;
+
+    using Boxed = NativeRecordWithFlags;
+
+    ~NativeRecordWithFlags();
+
+    static CppType toCpp(JNIEnv* jniEnv, JniType j);
+    static ::djinni::LocalRef<JniType> fromCpp(JNIEnv* jniEnv, const CppType& c);
+
+private:
+    NativeRecordWithFlags();
+    friend ::djinni::JniClass<NativeRecordWithFlags>;
+
+    const ::djinni::GlobalRef<jclass> clazz { ::djinni::jniFindClass("com/dropbox/djinni/test/RecordWithFlags") };
+    const jmethodID jconstructor { ::djinni::jniGetMethodID(clazz.get(), "<init>", "(Ljava/util/EnumSet;)V") };
+    const jfieldID field_mAccess { ::djinni::jniGetFieldID(clazz.get(), "mAccess", "Ljava/util/EnumSet;") };
+};
+
+}  // namespace djinni_generated
diff --git a/test-suite/generated-src/objc/DBAccessFlags+Private.h b/test-suite/generated-src/objc/DBAccessFlags+Private.h
new file mode 100644
index 000000000..96d26938e
--- /dev/null
+++ b/test-suite/generated-src/objc/DBAccessFlags+Private.h
@@ -0,0 +1,6 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from enum.djinni
+
+#include "access_flags.hpp"
+#import "DJIMarshal+Private.h"
+
diff --git a/test-suite/generated-src/objc/DBAccessFlags.h b/test-suite/generated-src/objc/DBAccessFlags.h
new file mode 100644
index 000000000..4a968b9cc
--- /dev/null
+++ b/test-suite/generated-src/objc/DBAccessFlags.h
@@ -0,0 +1,19 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from enum.djinni
+
+#import <Foundation/Foundation.h>
+
+typedef NS_OPTIONS(NSUInteger, DBAccessFlags)
+{
+    DBAccessFlagsNobody = 0,
+    DBAccessFlagsOwnerRead = 1 << 0,
+    DBAccessFlagsOwnerWrite = 1 << 1,
+    DBAccessFlagsOwnerExecute = 1 << 2,
+    DBAccessFlagsGroupRead = 1 << 3,
+    DBAccessFlagsGroupWrite = 1 << 4,
+    DBAccessFlagsGroupExecute = 1 << 5,
+    DBAccessFlagsSystemRead = 1 << 6,
+    DBAccessFlagsSystemWrite = 1 << 7,
+    DBAccessFlagsSystemExecute = 1 << 8,
+    DBAccessFlagsEverybody = 0 | DBAccessFlagsOwnerRead | DBAccessFlagsOwnerWrite | DBAccessFlagsOwnerExecute | DBAccessFlagsGroupRead | DBAccessFlagsGroupWrite | DBAccessFlagsGroupExecute | DBAccessFlagsSystemRead | DBAccessFlagsSystemWrite | DBAccessFlagsSystemExecute,
+};
diff --git a/test-suite/generated-src/objc/DBEmptyFlags+Private.h b/test-suite/generated-src/objc/DBEmptyFlags+Private.h
new file mode 100644
index 000000000..223cb273d
--- /dev/null
+++ b/test-suite/generated-src/objc/DBEmptyFlags+Private.h
@@ -0,0 +1,6 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from enum.djinni
+
+#include "empty_flags.hpp"
+#import "DJIMarshal+Private.h"
+
diff --git a/test-suite/generated-src/objc/DBEmptyFlags.h b/test-suite/generated-src/objc/DBEmptyFlags.h
new file mode 100644
index 000000000..d08f17f2e
--- /dev/null
+++ b/test-suite/generated-src/objc/DBEmptyFlags.h
@@ -0,0 +1,10 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from enum.djinni
+
+#import <Foundation/Foundation.h>
+
+typedef NS_OPTIONS(NSUInteger, DBEmptyFlags)
+{
+    DBEmptyFlagsNone = 0,
+    DBEmptyFlagsAll = 0,
+};
diff --git a/test-suite/generated-src/objc/DBFlagRoundtrip+Private.h b/test-suite/generated-src/objc/DBFlagRoundtrip+Private.h
new file mode 100644
index 000000000..6a3cd9cc6
--- /dev/null
+++ b/test-suite/generated-src/objc/DBFlagRoundtrip+Private.h
@@ -0,0 +1,31 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from enum.djinni
+
+#include "flag_roundtrip.hpp"
+#include <memory>
+
+static_assert(__has_feature(objc_arc), "Djinni requires ARC to be enabled for this file");
+
+@class DBFlagRoundtrip;
+
+namespace djinni_generated {
+
+class FlagRoundtrip
+{
+public:
+    using CppType = std::shared_ptr<::testsuite::FlagRoundtrip>;
+    using CppOptType = std::shared_ptr<::testsuite::FlagRoundtrip>;
+    using ObjcType = DBFlagRoundtrip*;
+
+    using Boxed = FlagRoundtrip;
+
+    static CppType toCpp(ObjcType objc);
+    static ObjcType fromCppOpt(const CppOptType& cpp);
+    static ObjcType fromCpp(const CppType& cpp) { return fromCppOpt(cpp); }
+
+private:
+    class ObjcProxy;
+};
+
+}  // namespace djinni_generated
+
diff --git a/test-suite/generated-src/objc/DBFlagRoundtrip+Private.mm b/test-suite/generated-src/objc/DBFlagRoundtrip+Private.mm
new file mode 100644
index 000000000..beeb3207e
--- /dev/null
+++ b/test-suite/generated-src/objc/DBFlagRoundtrip+Private.mm
@@ -0,0 +1,83 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from enum.djinni
+
+#import "DBFlagRoundtrip+Private.h"
+#import "DBFlagRoundtrip.h"
+#import "DBAccessFlags+Private.h"
+#import "DBEmptyFlags+Private.h"
+#import "DJICppWrapperCache+Private.h"
+#import "DJIError.h"
+#import "DJIMarshal+Private.h"
+#include <exception>
+#include <stdexcept>
+#include <utility>
+
+static_assert(__has_feature(objc_arc), "Djinni requires ARC to be enabled for this file");
+
+@interface DBFlagRoundtrip ()
+
+- (id)initWithCpp:(const std::shared_ptr<::testsuite::FlagRoundtrip>&)cppRef;
+
+@end
+
+@implementation DBFlagRoundtrip {
+    ::djinni::CppProxyCache::Handle<std::shared_ptr<::testsuite::FlagRoundtrip>> _cppRefHandle;
+}
+
+- (id)initWithCpp:(const std::shared_ptr<::testsuite::FlagRoundtrip>&)cppRef
+{
+    if (self = [super init]) {
+        _cppRefHandle.assign(cppRef);
+    }
+    return self;
+}
+
++ (DBAccessFlags)roundtripAccess:(DBAccessFlags)flag {
+    try {
+        auto objcpp_result_ = ::testsuite::FlagRoundtrip::roundtrip_access(::djinni::Enum<::testsuite::access_flags, DBAccessFlags>::toCpp(flag));
+        return ::djinni::Enum<::testsuite::access_flags, DBAccessFlags>::fromCpp(objcpp_result_);
+    } DJINNI_TRANSLATE_EXCEPTIONS()
+}
+
++ (DBEmptyFlags)roundtripEmpty:(DBEmptyFlags)flag {
+    try {
+        auto objcpp_result_ = ::testsuite::FlagRoundtrip::roundtrip_empty(::djinni::Enum<::testsuite::empty_flags, DBEmptyFlags>::toCpp(flag));
+        return ::djinni::Enum<::testsuite::empty_flags, DBEmptyFlags>::fromCpp(objcpp_result_);
+    } DJINNI_TRANSLATE_EXCEPTIONS()
+}
+
++ (nullable NSNumber *)roundtripAccessBoxed:(nullable NSNumber *)flag {
+    try {
+        auto objcpp_result_ = ::testsuite::FlagRoundtrip::roundtrip_access_boxed(::djinni::Optional<std::experimental::optional, ::djinni::Enum<::testsuite::access_flags, DBAccessFlags>>::toCpp(flag));
+        return ::djinni::Optional<std::experimental::optional, ::djinni::Enum<::testsuite::access_flags, DBAccessFlags>>::fromCpp(objcpp_result_);
+    } DJINNI_TRANSLATE_EXCEPTIONS()
+}
+
++ (nullable NSNumber *)roundtripEmptyBoxed:(nullable NSNumber *)flag {
+    try {
+        auto objcpp_result_ = ::testsuite::FlagRoundtrip::roundtrip_empty_boxed(::djinni::Optional<std::experimental::optional, ::djinni::Enum<::testsuite::empty_flags, DBEmptyFlags>>::toCpp(flag));
+        return ::djinni::Optional<std::experimental::optional, ::djinni::Enum<::testsuite::empty_flags, DBEmptyFlags>>::fromCpp(objcpp_result_);
+    } DJINNI_TRANSLATE_EXCEPTIONS()
+}
+
+namespace djinni_generated {
+
+auto FlagRoundtrip::toCpp(ObjcType objc) -> CppType
+{
+    if (!objc) {
+        return nullptr;
+    }
+    return objc->_cppRefHandle.get();
+}
+
+auto FlagRoundtrip::fromCppOpt(const CppOptType& cpp) -> ObjcType
+{
+    if (!cpp) {
+        return nil;
+    }
+    return ::djinni::get_cpp_proxy<DBFlagRoundtrip>(cpp);
+}
+
+}  // namespace djinni_generated
+
+@end
diff --git a/test-suite/generated-src/objc/DBFlagRoundtrip.h b/test-suite/generated-src/objc/DBFlagRoundtrip.h
new file mode 100644
index 000000000..d4c6e6d54
--- /dev/null
+++ b/test-suite/generated-src/objc/DBFlagRoundtrip.h
@@ -0,0 +1,19 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from enum.djinni
+
+#import "DBAccessFlags.h"
+#import "DBEmptyFlags.h"
+#import <Foundation/Foundation.h>
+
+
+@interface DBFlagRoundtrip : NSObject
+
++ (DBAccessFlags)roundtripAccess:(DBAccessFlags)flag;
+
++ (DBEmptyFlags)roundtripEmpty:(DBEmptyFlags)flag;
+
++ (nullable NSNumber *)roundtripAccessBoxed:(nullable NSNumber *)flag;
+
++ (nullable NSNumber *)roundtripEmptyBoxed:(nullable NSNumber *)flag;
+
+@end
diff --git a/test-suite/generated-src/objc/DBRecordWithFlags+Private.h b/test-suite/generated-src/objc/DBRecordWithFlags+Private.h
new file mode 100644
index 000000000..e74cfd889
--- /dev/null
+++ b/test-suite/generated-src/objc/DBRecordWithFlags+Private.h
@@ -0,0 +1,24 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from enum.djinni
+
+#import "DBRecordWithFlags.h"
+#include "record_with_flags.hpp"
+
+static_assert(__has_feature(objc_arc), "Djinni requires ARC to be enabled for this file");
+
+@class DBRecordWithFlags;
+
+namespace djinni_generated {
+
+struct RecordWithFlags
+{
+    using CppType = ::testsuite::RecordWithFlags;
+    using ObjcType = DBRecordWithFlags*;
+
+    using Boxed = RecordWithFlags;
+
+    static CppType toCpp(ObjcType objc);
+    static ObjcType fromCpp(const CppType& cpp);
+};
+
+}  // namespace djinni_generated
diff --git a/test-suite/generated-src/objc/DBRecordWithFlags+Private.mm b/test-suite/generated-src/objc/DBRecordWithFlags+Private.mm
new file mode 100644
index 000000000..1a0731f94
--- /dev/null
+++ b/test-suite/generated-src/objc/DBRecordWithFlags+Private.mm
@@ -0,0 +1,21 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from enum.djinni
+
+#import "DBRecordWithFlags+Private.h"
+#import "DBAccessFlags+Private.h"
+#include <cassert>
+
+namespace djinni_generated {
+
+auto RecordWithFlags::toCpp(ObjcType obj) -> CppType
+{
+    assert(obj);
+    return {::djinni::Enum<::testsuite::access_flags, DBAccessFlags>::toCpp(obj.access)};
+}
+
+auto RecordWithFlags::fromCpp(const CppType& cpp) -> ObjcType
+{
+    return [[DBRecordWithFlags alloc] initWithAccess:(::djinni::Enum<::testsuite::access_flags, DBAccessFlags>::fromCpp(cpp.access))];
+}
+
+}  // namespace djinni_generated
diff --git a/test-suite/generated-src/objc/DBRecordWithFlags.h b/test-suite/generated-src/objc/DBRecordWithFlags.h
new file mode 100644
index 000000000..a47b151ed
--- /dev/null
+++ b/test-suite/generated-src/objc/DBRecordWithFlags.h
@@ -0,0 +1,13 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from enum.djinni
+
+#import "DBAccessFlags.h"
+#import <Foundation/Foundation.h>
+
+@interface DBRecordWithFlags : NSObject
+- (nonnull instancetype)initWithAccess:(DBAccessFlags)access;
++ (nonnull instancetype)recordWithFlagsWithAccess:(DBAccessFlags)access;
+
+@property (nonatomic, readonly) DBAccessFlags access;
+
+@end
diff --git a/test-suite/generated-src/objc/DBRecordWithFlags.mm b/test-suite/generated-src/objc/DBRecordWithFlags.mm
new file mode 100644
index 000000000..ef9e1cfd4
--- /dev/null
+++ b/test-suite/generated-src/objc/DBRecordWithFlags.mm
@@ -0,0 +1,27 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file generated by Djinni from enum.djinni
+
+#import "DBRecordWithFlags.h"
+
+
+@implementation DBRecordWithFlags
+
+- (nonnull instancetype)initWithAccess:(DBAccessFlags)access
+{
+    if (self = [super init]) {
+        _access = access;
+    }
+    return self;
+}
+
++ (nonnull instancetype)recordWithFlagsWithAccess:(DBAccessFlags)access
+{
+    return [[self alloc] initWithAccess:access];
+}
+
+- (NSString *)description
+{
+    return [NSString stringWithFormat:@"<%@ %p access:%@>", self.class, (void *)self, @(self.access)];
+}
+
+@end
diff --git a/test-suite/generated-src/outFileList.txt b/test-suite/generated-src/outFileList.txt
index 0229246a0..205fcccf9 100644
--- a/test-suite/generated-src/outFileList.txt
+++ b/test-suite/generated-src/outFileList.txt
@@ -35,6 +35,10 @@ djinni-output-temp/cpp/user_token.hpp
 djinni-output-temp/cpp/color.hpp
 djinni-output-temp/cpp/enum_usage_record.hpp
 djinni-output-temp/cpp/enum_usage_interface.hpp
+djinni-output-temp/cpp/access_flags.hpp
+djinni-output-temp/cpp/empty_flags.hpp
+djinni-output-temp/cpp/flag_roundtrip.hpp
+djinni-output-temp/cpp/record_with_flags.hpp
 djinni-output-temp/cpp/client_returned_record.hpp
 djinni-output-temp/cpp/client_interface.hpp
 djinni-output-temp/cpp/reverse_client_interface.hpp
@@ -77,6 +81,10 @@ djinni-output-temp/java/UserToken.java
 djinni-output-temp/java/Color.java
 djinni-output-temp/java/EnumUsageRecord.java
 djinni-output-temp/java/EnumUsageInterface.java
+djinni-output-temp/java/AccessFlags.java
+djinni-output-temp/java/EmptyFlags.java
+djinni-output-temp/java/FlagRoundtrip.java
+djinni-output-temp/java/RecordWithFlags.java
 djinni-output-temp/java/ClientReturnedRecord.java
 djinni-output-temp/java/ClientInterface.java
 djinni-output-temp/java/ReverseClientInterface.java
@@ -145,6 +153,12 @@ djinni-output-temp/jni/NativeEnumUsageRecord.hpp
 djinni-output-temp/jni/NativeEnumUsageRecord.cpp
 djinni-output-temp/jni/NativeEnumUsageInterface.hpp
 djinni-output-temp/jni/NativeEnumUsageInterface.cpp
+djinni-output-temp/jni/NativeAccessFlags.hpp
+djinni-output-temp/jni/NativeEmptyFlags.hpp
+djinni-output-temp/jni/NativeFlagRoundtrip.hpp
+djinni-output-temp/jni/NativeFlagRoundtrip.cpp
+djinni-output-temp/jni/NativeRecordWithFlags.hpp
+djinni-output-temp/jni/NativeRecordWithFlags.cpp
 djinni-output-temp/jni/NativeClientReturnedRecord.hpp
 djinni-output-temp/jni/NativeClientReturnedRecord.cpp
 djinni-output-temp/jni/NativeClientInterface.hpp
@@ -209,6 +223,11 @@ djinni-output-temp/objc/DBColor.h
 djinni-output-temp/objc/DBEnumUsageRecord.h
 djinni-output-temp/objc/DBEnumUsageRecord.mm
 djinni-output-temp/objc/DBEnumUsageInterface.h
+djinni-output-temp/objc/DBAccessFlags.h
+djinni-output-temp/objc/DBEmptyFlags.h
+djinni-output-temp/objc/DBFlagRoundtrip.h
+djinni-output-temp/objc/DBRecordWithFlags.h
+djinni-output-temp/objc/DBRecordWithFlags.mm
 djinni-output-temp/objc/DBClientReturnedRecord.h
 djinni-output-temp/objc/DBClientReturnedRecord.mm
 djinni-output-temp/objc/DBClientInterface.h
@@ -285,6 +304,12 @@ djinni-output-temp/objc/DBEnumUsageRecord+Private.h
 djinni-output-temp/objc/DBEnumUsageRecord+Private.mm
 djinni-output-temp/objc/DBEnumUsageInterface+Private.h
 djinni-output-temp/objc/DBEnumUsageInterface+Private.mm
+djinni-output-temp/objc/DBAccessFlags+Private.h
+djinni-output-temp/objc/DBEmptyFlags+Private.h
+djinni-output-temp/objc/DBFlagRoundtrip+Private.h
+djinni-output-temp/objc/DBFlagRoundtrip+Private.mm
+djinni-output-temp/objc/DBRecordWithFlags+Private.h
+djinni-output-temp/objc/DBRecordWithFlags+Private.mm
 djinni-output-temp/objc/DBClientReturnedRecord+Private.h
 djinni-output-temp/objc/DBClientReturnedRecord+Private.mm
 djinni-output-temp/objc/DBClientInterface+Private.h
diff --git a/test-suite/handwritten-src/cpp/flag_roundtrip.cpp b/test-suite/handwritten-src/cpp/flag_roundtrip.cpp
new file mode 100644
index 000000000..3b7b2d163
--- /dev/null
+++ b/test-suite/handwritten-src/cpp/flag_roundtrip.cpp
@@ -0,0 +1,19 @@
+#include "flag_roundtrip.hpp"
+
+using namespace testsuite;
+
+access_flags FlagRoundtrip::roundtrip_access(access_flags flag) {
+  return flag;
+}
+
+empty_flags FlagRoundtrip::roundtrip_empty(empty_flags flag) {
+  return flag;
+}
+
+std::experimental::optional<access_flags> FlagRoundtrip::roundtrip_access_boxed(std::experimental::optional<access_flags> flag) {
+  return flag;
+}
+
+std::experimental::optional<empty_flags> FlagRoundtrip::roundtrip_empty_boxed(std::experimental::optional<empty_flags> flag) {
+  return flag;
+}
diff --git a/test-suite/handwritten-src/java/com/dropbox/djinni/test/EnumTest.java b/test-suite/handwritten-src/java/com/dropbox/djinni/test/EnumTest.java
index b0fbb6962..1ff8215ca 100644
--- a/test-suite/handwritten-src/java/com/dropbox/djinni/test/EnumTest.java
+++ b/test-suite/handwritten-src/java/com/dropbox/djinni/test/EnumTest.java
@@ -2,6 +2,7 @@
 
 import junit.framework.TestCase;
 
+import java.util.EnumSet;
 import java.util.HashMap;
 
 public class EnumTest extends TestCase {
@@ -17,4 +18,33 @@ public void testEnumKey() {
         m.put(Color.VIOLET, "violet");
         TestHelpers.checkEnumMap(m);
     }
+
+    public void testAccessFlagRoundtrip() {
+        EnumSet[] flags = {
+            EnumSet.noneOf(AccessFlags.class),
+            EnumSet.allOf(AccessFlags.class),
+            EnumSet.of(AccessFlags.OWNER_READ),
+            EnumSet.of(AccessFlags.OWNER_READ, AccessFlags.OWNER_WRITE),
+            EnumSet.of(AccessFlags.OWNER_READ, AccessFlags.OWNER_WRITE, AccessFlags.OWNER_EXECUTE),
+        };
+
+        for(EnumSet flag : flags) {
+            assertEquals(flag, FlagRoundtrip.roundtripAccess(flag));
+            assertEquals(flag, FlagRoundtrip.roundtripAccessBoxed(flag));
+        }
+        assertEquals(null, FlagRoundtrip.roundtripAccessBoxed(null));
+    }
+
+    public void testEmptyFlagRoundtrip() {
+        EnumSet[] flags = {
+            EnumSet.noneOf(EmptyFlags.class),
+            EnumSet.allOf(EmptyFlags.class),
+        };
+
+        for(EnumSet flag : flags) {
+            assertEquals(flag, FlagRoundtrip.roundtripEmpty(flag));
+            assertEquals(flag, FlagRoundtrip.roundtripEmptyBoxed(flag));
+        }
+        assertEquals(null, FlagRoundtrip.roundtripEmptyBoxed(null));
+    }
 }
diff --git a/test-suite/handwritten-src/objc/tests/DBFlagsTests.mm b/test-suite/handwritten-src/objc/tests/DBFlagsTests.mm
new file mode 100644
index 000000000..5014dc3e5
--- /dev/null
+++ b/test-suite/handwritten-src/objc/tests/DBFlagsTests.mm
@@ -0,0 +1,87 @@
+//
+//  DBFlagsTests.m
+//  DjinniObjcTest
+//
+//  Created by knejp on 2.8.15.
+//  Copyright (c) 2015 Dropbox, Inc. All rights reserved.
+//
+
+#import "DBAccessFlags.h"
+#import "DBEmptyFlags.h"
+#import "DBFlagRoundtrip.h"
+#import "DJIMarshal+Private.h"
+
+#include "access_flags.hpp"
+#include "empty_flags.hpp"
+
+#import <XCTest/XCTest.h>
+
+using testsuite::access_flags;
+
+@interface DBFlagsTests : XCTestCase
+
+@end
+
+@implementation DBFlagsTests
+
+- (void)testOperators {
+  using T = ::djinni::Enum<access_flags, DBAccessFlags>;
+  XCTAssertEqual(DBAccessFlagsOwnerRead | DBAccessFlagsOwnerWrite,
+                 T::fromCpp(access_flags::OWNER_READ | access_flags::OWNER_WRITE),
+                 "flag mismatch");
+  XCTAssertEqual(DBAccessFlagsOwnerRead & DBAccessFlagsEverybody,
+                 T::fromCpp(access_flags::OWNER_READ & access_flags::EVERYBODY),
+                 "flag mismatch");
+  XCTAssertEqual(DBAccessFlagsOwnerRead ^ DBAccessFlagsNobody,
+                 T::fromCpp(access_flags::OWNER_READ ^ access_flags::NOBODY),
+                 "flag mismatch");
+
+  XCTAssertEqual(access_flags::GROUP_READ | access_flags::GROUP_EXECUTE,
+                 T::toCpp(DBAccessFlagsGroupRead | DBAccessFlagsGroupExecute),
+                 "flag mismatch");
+  XCTAssertEqual(access_flags::GROUP_READ & access_flags::EVERYBODY,
+                 T::toCpp(DBAccessFlagsGroupRead & DBAccessFlagsEverybody),
+                 "flag mismatch");
+  XCTAssertEqual(access_flags::GROUP_READ ^ access_flags::NOBODY,
+                 T::toCpp(DBAccessFlagsGroupRead ^ DBAccessFlagsNobody),
+                 "flag mismatch");
+
+  XCTAssertEqual(access_flags::SYSTEM_READ,
+                 access_flags::SYSTEM_READ | access_flags::NOBODY,
+                 "neutral flag wrong");
+
+  XCTAssertEqual(access_flags::NOBODY,
+                 access_flags::SYSTEM_WRITE & ~access_flags::SYSTEM_WRITE,
+                 "bitwise not wrong");
+}
+
+- (void)testRoundtripAccess {
+  DBAccessFlags flags[] = {
+    DBAccessFlagsNobody,
+    DBAccessFlagsEverybody,
+    DBAccessFlagsOwnerRead,
+    DBAccessFlagsOwnerRead | DBAccessFlagsOwnerWrite,
+    DBAccessFlagsOwnerRead | DBAccessFlagsOwnerWrite | DBAccessFlagsOwnerExecute,
+  };
+
+  for(auto flag : flags) {
+    XCTAssertEqual(flag, [DBFlagRoundtrip roundtripAccess:flag], "roundtrip failed");
+    XCTAssertEqual(flag, [[DBFlagRoundtrip roundtripAccessBoxed:@(flag)] unsignedIntegerValue], "roundtrip failed");
+  }
+  XCTAssertEqual(nil, [DBFlagRoundtrip roundtripAccessBoxed:nil], "roundtrip failed");
+}
+
+- (void)testRoundtripEmpty {
+  DBEmptyFlags flags[] = {
+    DBEmptyFlagsNone,
+    DBEmptyFlagsAll,
+  };
+
+  for(auto flag : flags) {
+    XCTAssertEqual(flag, [DBFlagRoundtrip roundtripEmpty:flag], "roundtrip failed");
+    XCTAssertEqual(flag, [[DBFlagRoundtrip roundtripEmptyBoxed:@(flag)] unsignedIntegerValue], "roundtrip failed");
+  }
+  XCTAssertEqual(nil, [DBFlagRoundtrip roundtripEmptyBoxed:nil], "roundtrip failed");
+}
+
+@end
diff --git a/test-suite/java/docker/centos_6/Dockerfile b/test-suite/java/docker/centos_6/Dockerfile
index af6794fda..6c5e02fa1 100644
--- a/test-suite/java/docker/centos_6/Dockerfile
+++ b/test-suite/java/docker/centos_6/Dockerfile
@@ -27,7 +27,7 @@ RUN wget http://archive.apache.org/dist/ant/binaries/apache-ant-1.9.3-bin.tar.gz
 RUN tar xvfvz apache-ant-1.9.3-bin.tar.gz -C /opt
 ENV ANT_HOME /opt/apache-ant-1.9.3/bin/ant
 RUN ln -s /opt/apache-ant-1.9.3/bin/ant /usr/bin/ant
-ENV JAVA_HOME /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.51-1.b16.el6_7.x86_64
+ENV JAVA_HOME /usr/lib/jvm/java-1.8.0-openjdk.x86_64
 
 VOLUME /opt/djinni
 CMD /opt/djinni/test-suite/java/docker/build_and_run_tests.sh
diff --git a/test-suite/java/docker/debian_jessie/Dockerfile b/test-suite/java/docker/debian_jessie/Dockerfile
index b6be3de2a..d63332125 100644
--- a/test-suite/java/docker/debian_jessie/Dockerfile
+++ b/test-suite/java/docker/debian_jessie/Dockerfile
@@ -6,11 +6,12 @@ RUN echo "deb http://http.debian.net/debian jessie-backports main" >> /etc/apt/s
 RUN apt-get update
 
 RUN apt-get -y install build-essential clang llvm cmake
+RUN apt-get install -y -t jessie-backports ca-certificates-java
 RUN apt-get install -y openjdk-8-jdk ant
 
 # Select Java 8
 RUN update-java-alternatives -s java-1.8.0-openjdk-amd64
-RUN rm /usr/lib/jvm/default-java
+RUN rm -f /usr/lib/jvm/default-java
 RUN ln -s /usr/lib/jvm/java-8-openjdk-amd64 /usr/lib/jvm/default-java
 
 ENV CXX clang++
diff --git a/test-suite/java/docker/fedora_24/Dockerfile b/test-suite/java/docker/fedora_24/Dockerfile
index f95a1a8f7..e55a2a206 100644
--- a/test-suite/java/docker/fedora_24/Dockerfile
+++ b/test-suite/java/docker/fedora_24/Dockerfile
@@ -12,7 +12,7 @@ RUN echo 1 | update-alternatives --config javac
 
 # Get modern ant
 RUN yum install -y ant
-ENV JAVA_HOME /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.92-5.b14.fc24.x86_64
+ENV JAVA_HOME /usr/lib/jvm/java-1.8.0-openjdk
 
 VOLUME /opt/djinni
 CMD /opt/djinni/test-suite/java/docker/build_and_run_tests.sh
diff --git a/test-suite/objc/DjinniObjcTest.xcodeproj/project.pbxproj b/test-suite/objc/DjinniObjcTest.xcodeproj/project.pbxproj
index 78ae60514..36b34b027 100644
--- a/test-suite/objc/DjinniObjcTest.xcodeproj/project.pbxproj
+++ b/test-suite/objc/DjinniObjcTest.xcodeproj/project.pbxproj
@@ -96,8 +96,13 @@
 		B5F06AA51D4987EF005BE736 /* DBEnumUsageInterface+Private.mm in Sources */ = {isa = PBXBuildFile; fileRef = B5F06AA01D4987EF005BE736 /* DBEnumUsageInterface+Private.mm */; };
 		B5F06AA61D4987EF005BE736 /* DBEnumUsageRecord.mm in Sources */ = {isa = PBXBuildFile; fileRef = B5F06AA21D4987EF005BE736 /* DBEnumUsageRecord.mm */; };
 		B5F06AA71D4987EF005BE736 /* DBEnumUsageRecord+Private.mm in Sources */ = {isa = PBXBuildFile; fileRef = B5F06AA41D4987EF005BE736 /* DBEnumUsageRecord+Private.mm */; };
+		CF56738C1BE05D1E006330E7 /* DBRecordWithFlags.mm in Sources */ = {isa = PBXBuildFile; fileRef = CF5673891BE05D1E006330E7 /* DBRecordWithFlags.mm */; };
+		CF56738D1BE05D1E006330E7 /* DBRecordWithFlags+Private.mm in Sources */ = {isa = PBXBuildFile; fileRef = CF56738B1BE05D1E006330E7 /* DBRecordWithFlags+Private.mm */; };
 		CFAED8751B54291900E3B8A3 /* DBEmptyRecord.mm in Sources */ = {isa = PBXBuildFile; fileRef = CFAED8721B54291900E3B8A3 /* DBEmptyRecord.mm */; };
 		CFAED8761B54291900E3B8A3 /* DBEmptyRecord+Private.mm in Sources */ = {isa = PBXBuildFile; fileRef = CFAED8741B54291900E3B8A3 /* DBEmptyRecord+Private.mm */; };
+		CFBBB8EB1B6E38C5002EF52F /* DBFlagsTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = CFBBB8EA1B6E38C5002EF52F /* DBFlagsTests.mm */; };
+		CFBBB8EF1B6EF071002EF52F /* flag_roundtrip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CFBBB8EE1B6EF071002EF52F /* flag_roundtrip.cpp */; };
+		CFBBB8F31B6EF092002EF52F /* DBFlagRoundtrip+Private.mm in Sources */ = {isa = PBXBuildFile; fileRef = CFBBB8F21B6EF092002EF52F /* DBFlagRoundtrip+Private.mm */; };
 		CFC5D9D01B15105100BF2DF8 /* extern_record_with_derivings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CFC5D9CE1B15105100BF2DF8 /* extern_record_with_derivings.cpp */; };
 		CFC5D9D11B15105100BF2DF8 /* extern_record_with_derivings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CFC5D9CE1B15105100BF2DF8 /* extern_record_with_derivings.cpp */; };
 		CFC5D9D61B15106400BF2DF8 /* DBExternRecordWithDerivings.mm in Sources */ = {isa = PBXBuildFile; fileRef = CFC5D9D31B15106400BF2DF8 /* DBExternRecordWithDerivings.mm */; };
@@ -159,6 +164,8 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		176915461F7B837D00967E9D /* DBAccessFlags+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "DBAccessFlags+Private.h"; sourceTree = "<group>"; };
+		176915471F7B837D00967E9D /* DBEmptyFlags+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "DBEmptyFlags+Private.h"; sourceTree = "<group>"; };
 		650CA04E1C2AB460007ADDDB /* listener_caller.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = listener_caller.hpp; sourceTree = "<group>"; };
 		650CA0551C2AB48E007ADDDB /* DBListenerCaller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DBListenerCaller.h; sourceTree = "<group>"; };
 		650CA0561C2AB48E007ADDDB /* DBListenerCaller+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "DBListenerCaller+Private.h"; sourceTree = "<group>"; };
@@ -371,11 +378,26 @@
 		B5F06AA21D4987EF005BE736 /* DBEnumUsageRecord.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DBEnumUsageRecord.mm; sourceTree = "<group>"; };
 		B5F06AA31D4987EF005BE736 /* DBEnumUsageRecord+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "DBEnumUsageRecord+Private.h"; sourceTree = "<group>"; };
 		B5F06AA41D4987EF005BE736 /* DBEnumUsageRecord+Private.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "DBEnumUsageRecord+Private.mm"; sourceTree = "<group>"; };
+		CF5673881BE05D1E006330E7 /* DBRecordWithFlags.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DBRecordWithFlags.h; sourceTree = "<group>"; };
+		CF5673891BE05D1E006330E7 /* DBRecordWithFlags.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DBRecordWithFlags.mm; sourceTree = "<group>"; };
+		CF56738A1BE05D1E006330E7 /* DBRecordWithFlags+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "DBRecordWithFlags+Private.h"; sourceTree = "<group>"; };
+		CF56738B1BE05D1E006330E7 /* DBRecordWithFlags+Private.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "DBRecordWithFlags+Private.mm"; sourceTree = "<group>"; };
+		CF56738E1BE05D2B006330E7 /* record_with_flags.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = record_with_flags.hpp; sourceTree = "<group>"; };
 		CFAED8711B54291900E3B8A3 /* DBEmptyRecord.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DBEmptyRecord.h; sourceTree = "<group>"; };
 		CFAED8721B54291900E3B8A3 /* DBEmptyRecord.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DBEmptyRecord.mm; sourceTree = "<group>"; };
 		CFAED8731B54291900E3B8A3 /* DBEmptyRecord+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "DBEmptyRecord+Private.h"; sourceTree = "<group>"; };
 		CFAED8741B54291900E3B8A3 /* DBEmptyRecord+Private.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "DBEmptyRecord+Private.mm"; sourceTree = "<group>"; };
 		CFAED8771B54292600E3B8A3 /* empty_record.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = empty_record.hpp; sourceTree = "<group>"; };
+		CFBBB8E71B6E3747002EF52F /* empty_flags.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = empty_flags.hpp; sourceTree = "<group>"; };
+		CFBBB8E91B6E3770002EF52F /* DBEmptyFlags.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DBEmptyFlags.h; sourceTree = "<group>"; };
+		CFBBB8EA1B6E38C5002EF52F /* DBFlagsTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DBFlagsTests.mm; sourceTree = "<group>"; };
+		CFBBB8EC1B6E3A67002EF52F /* DBAccessFlags.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DBAccessFlags.h; sourceTree = "<group>"; };
+		CFBBB8ED1B6E3A72002EF52F /* access_flags.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = access_flags.hpp; sourceTree = "<group>"; };
+		CFBBB8EE1B6EF071002EF52F /* flag_roundtrip.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = flag_roundtrip.cpp; sourceTree = "<group>"; };
+		CFBBB8F01B6EF092002EF52F /* DBFlagRoundtrip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DBFlagRoundtrip.h; sourceTree = "<group>"; };
+		CFBBB8F11B6EF092002EF52F /* DBFlagRoundtrip+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "DBFlagRoundtrip+Private.h"; sourceTree = "<group>"; };
+		CFBBB8F21B6EF092002EF52F /* DBFlagRoundtrip+Private.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "DBFlagRoundtrip+Private.mm"; sourceTree = "<group>"; };
+		CFBBB8F41B6EF0A0002EF52F /* flag_roundtrip.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = flag_roundtrip.hpp; sourceTree = "<group>"; };
 		CFC5D9CE1B15105100BF2DF8 /* extern_record_with_derivings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = extern_record_with_derivings.cpp; sourceTree = "<group>"; };
 		CFC5D9CF1B15105100BF2DF8 /* extern_record_with_derivings.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = extern_record_with_derivings.hpp; sourceTree = "<group>"; };
 		CFC5D9D21B15106400BF2DF8 /* DBExternRecordWithDerivings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DBExternRecordWithDerivings.h; sourceTree = "<group>"; };
@@ -479,6 +501,7 @@
 				CFC5DA101B15B5FB00BF2DF8 /* Duration-jni.hpp */,
 				CFC5D9FA1B152D4400BF2DF8 /* Duration-objc.hpp */,
 				650CA05D1C2AB5AB007ADDDB /* ListenerCaller.cpp */,
+				CFBBB8EE1B6EF071002EF52F /* flag_roundtrip.cpp */,
 				A278D45219BA3601006FD937 /* test_helpers.cpp */,
 				CFC5D9FB1B152E4300BF2DF8 /* TranslateDuration.cpp */,
 				6551684E1C40511C003682A4 /* return_one_two.cpp */,
@@ -496,6 +519,7 @@
 				6536CD7B19A6C99800DD7715 /* DBCppExceptionTests.mm */,
 				CFEFA65B1B25CFEA008EE2D0 /* DBDateRecordTests.mm */,
 				CFC5D9F11B15276900BF2DF8 /* DBDurationTests.m */,
+				CFBBB8EA1B6E38C5002EF52F /* DBFlagsTests.mm */,
 				6536CD7C19A6C99800DD7715 /* DBMapRecordTests.mm */,
 				650CA05B1C2AB524007ADDDB /* DBMultipleInheritanceTests.m */,
 				6536CD7D19A6C99800DD7715 /* DBNestedCollectionTests.mm */,
@@ -548,62 +572,8 @@
 		A24249181AF192E0003BF8F0 /* generated-objc */ = {
 			isa = PBXGroup;
 			children = (
-				B58B16B61D5AD56600EF92B5 /* DBInterfaceUsingExtendedRecord.mm */,
-				B58B16A81D5AC9BC00EF92B5 /* DBRecordUsingExtendedRecord+Private.mm */,
-				B58B16A91D5AC9BC00EF92B5 /* DBRecordUsingExtendedRecord+Private.h */,
-				B58B16AA1D5AC9BC00EF92B5 /* DBRecordUsingExtendedRecord.mm */,
-				B58B16AB1D5AC9BC00EF92B5 /* DBRecordUsingExtendedRecord.h */,
-				B58B16AC1D5AC9BC00EF92B5 /* DBInterfaceUsingExtendedRecord+Private.mm */,
-				B58B16AD1D5AC9BC00EF92B5 /* DBInterfaceUsingExtendedRecord+Private.h */,
-				B58B16AE1D5AC9BC00EF92B5 /* DBInterfaceUsingExtendedRecord.h */,
-				B51911491D555EE900772DFE /* DBVarnameRecord+Private.mm */,
-				B519114A1D555EE900772DFE /* DBVarnameRecord+Private.h */,
-				B519114B1D555EE900772DFE /* DBVarnameRecord.mm */,
-				B519114C1D555EE900772DFE /* DBVarnameRecord.h */,
-				B519114D1D555EE900772DFE /* DBVarnameInterface+Private.mm */,
-				B519114E1D555EE900772DFE /* DBVarnameInterface+Private.h */,
-				B519114F1D555EE900772DFE /* DBVarnameInterface.h */,
-				B51911151D542A7000772DFE /* DBWcharTestHelpers+Private.mm */,
-				B51911161D542A7000772DFE /* DBWcharTestHelpers+Private.h */,
-				B51911171D542A7000772DFE /* DBWcharTestHelpers.h */,
-				B5153F971D54284100012654 /* DBJavaOnlyListener+Private.mm */,
-				B5153F981D54284100012654 /* DBJavaOnlyListener+Private.h */,
-				B5153F991D54284100012654 /* DBJavaOnlyListener.h */,
-				B5153F891D54283700012654 /* DBWcharTestRec+Private.mm */,
-				B5153F8A1D54283700012654 /* DBWcharTestRec+Private.h */,
-				B5153F8B1D54283700012654 /* DBWcharTestRec.mm */,
-				B5153F8C1D54283700012654 /* DBWcharTestRec.h */,
-				B5153F901D54283700012654 /* DBUsesSingleLanguageListeners+Private.mm */,
-				B5153F911D54283700012654 /* DBUsesSingleLanguageListeners+Private.h */,
-				B5153F921D54283700012654 /* DBUsesSingleLanguageListeners.h */,
-				B5F06A9D1D4987EF005BE736 /* DBColor+Private.h */,
-				B5F06A9E1D4987EF005BE736 /* DBEnumUsageInterface.h */,
-				B5F06A9F1D4987EF005BE736 /* DBEnumUsageInterface+Private.h */,
-				B5F06AA01D4987EF005BE736 /* DBEnumUsageInterface+Private.mm */,
-				B5F06AA11D4987EF005BE736 /* DBEnumUsageRecord.h */,
-				B5F06AA21D4987EF005BE736 /* DBEnumUsageRecord.mm */,
-				B5F06AA31D4987EF005BE736 /* DBEnumUsageRecord+Private.h */,
-				B5F06AA41D4987EF005BE736 /* DBEnumUsageRecord+Private.mm */,
-				B5F06A6E1D4973BD005BE736 /* DBConflict.h */,
-				B5F06A6F1D4973BD005BE736 /* DBConflict+Private.h */,
-				B5F06A701D4973BD005BE736 /* DBConflict+Private.mm */,
-				B5F06A711D4973BD005BE736 /* DBConflictUser.h */,
-				B5F06A721D4973BD005BE736 /* DBConflictUser+Private.h */,
-				B5F06A731D4973BD005BE736 /* DBConflictUser+Private.mm */,
-				B5F06A781D4973BD005BE736 /* DBExtendedRecord.h */,
-				B5F06A791D4973BD005BE736 /* DBExtendedRecord.mm */,
-				B5F06A7A1D4973BD005BE736 /* DBExtendedRecord+Private.h */,
-				B5F06A7B1D4973BD005BE736 /* DBExtendedRecord+Private.mm */,
-				B5F06A7F1D4973BD005BE736 /* DBObjcOnlyListener.h */,
-				B5F06A801D4973BD005BE736 /* DBObjcOnlyListener+Private.h */,
-				B5F06A811D4973BD005BE736 /* DBObjcOnlyListener+Private.mm */,
-				B5D8FC321C23E2F40045ADCF /* DBConstantRecord.h */,
-				B5D8FC331C23E2F40045ADCF /* DBConstantRecord.mm */,
-				B5D8FC341C23E2F40045ADCF /* DBConstantRecord+Private.h */,
-				B5D8FC351C23E2F40045ADCF /* DBConstantRecord+Private.mm */,
-				B5E9C93D1C1F9E9E0073C123 /* DBReverseClientInterface.h */,
-				B5E9C93E1C1F9E9E0073C123 /* DBReverseClientInterface+Private.h */,
-				B5E9C93F1C1F9E9E0073C123 /* DBReverseClientInterface+Private.mm */,
+				CFBBB8EC1B6E3A67002EF52F /* DBAccessFlags.h */,
+				176915461F7B837D00967E9D /* DBAccessFlags+Private.h */,
 				B52DA5641B103F6D005CE75F /* DBAssortedPrimitives.h */,
 				B52DA5651B103F6D005CE75F /* DBAssortedPrimitives.mm */,
 				B52DA5661B103F6D005CE75F /* DBAssortedPrimitives+Private.h */,
@@ -616,6 +586,17 @@
 				A242491F1AF192E0003BF8F0 /* DBClientReturnedRecord+Private.h */,
 				A238CA761AF84B7100CDDCE5 /* DBClientReturnedRecord+Private.mm */,
 				A24249221AF192E0003BF8F0 /* DBColor.h */,
+				B5F06A9D1D4987EF005BE736 /* DBColor+Private.h */,
+				B5F06A6E1D4973BD005BE736 /* DBConflict.h */,
+				B5F06A6F1D4973BD005BE736 /* DBConflict+Private.h */,
+				B5F06A701D4973BD005BE736 /* DBConflict+Private.mm */,
+				B5F06A711D4973BD005BE736 /* DBConflictUser.h */,
+				B5F06A721D4973BD005BE736 /* DBConflictUser+Private.h */,
+				B5F06A731D4973BD005BE736 /* DBConflictUser+Private.mm */,
+				B5D8FC321C23E2F40045ADCF /* DBConstantRecord.h */,
+				B5D8FC331C23E2F40045ADCF /* DBConstantRecord.mm */,
+				B5D8FC341C23E2F40045ADCF /* DBConstantRecord+Private.h */,
+				B5D8FC351C23E2F40045ADCF /* DBConstantRecord+Private.mm */,
 				A24249261AF192E0003BF8F0 /* DBConstants.h */,
 				A248501C1AF96EBC00AFE907 /* DBConstants.mm */,
 				A24249251AF192E0003BF8F0 /* DBConstants+Private.h */,
@@ -631,6 +612,23 @@
 				A248501D1AF96EBC00AFE907 /* DBDateRecord.mm */,
 				A242492B1AF192E0003BF8F0 /* DBDateRecord+Private.h */,
 				A238CA7A1AF84B7100CDDCE5 /* DBDateRecord+Private.mm */,
+				CFBBB8E91B6E3770002EF52F /* DBEmptyFlags.h */,
+				176915471F7B837D00967E9D /* DBEmptyFlags+Private.h */,
+				CFAED8711B54291900E3B8A3 /* DBEmptyRecord.h */,
+				CFAED8721B54291900E3B8A3 /* DBEmptyRecord.mm */,
+				CFAED8731B54291900E3B8A3 /* DBEmptyRecord+Private.h */,
+				CFAED8741B54291900E3B8A3 /* DBEmptyRecord+Private.mm */,
+				B5F06A9E1D4987EF005BE736 /* DBEnumUsageInterface.h */,
+				B5F06A9F1D4987EF005BE736 /* DBEnumUsageInterface+Private.h */,
+				B5F06AA01D4987EF005BE736 /* DBEnumUsageInterface+Private.mm */,
+				B5F06AA11D4987EF005BE736 /* DBEnumUsageRecord.h */,
+				B5F06AA21D4987EF005BE736 /* DBEnumUsageRecord.mm */,
+				B5F06AA31D4987EF005BE736 /* DBEnumUsageRecord+Private.h */,
+				B5F06AA41D4987EF005BE736 /* DBEnumUsageRecord+Private.mm */,
+				B5F06A781D4973BD005BE736 /* DBExtendedRecord.h */,
+				B5F06A791D4973BD005BE736 /* DBExtendedRecord.mm */,
+				B5F06A7A1D4973BD005BE736 /* DBExtendedRecord+Private.h */,
+				B5F06A7B1D4973BD005BE736 /* DBExtendedRecord+Private.mm */,
 				CFC5D9E21B1513E800BF2DF8 /* DBExternInterface1.h */,
 				CFC5D9E31B1513E800BF2DF8 /* DBExternInterface1+Private.h */,
 				CFC5D9E41B1513E800BF2DF8 /* DBExternInterface1+Private.mm */,
@@ -641,13 +639,19 @@
 				CFC5D9D31B15106400BF2DF8 /* DBExternRecordWithDerivings.mm */,
 				CFC5D9D41B15106400BF2DF8 /* DBExternRecordWithDerivings+Private.h */,
 				CFC5D9D51B15106400BF2DF8 /* DBExternRecordWithDerivings+Private.mm */,
-				CFAED8711B54291900E3B8A3 /* DBEmptyRecord.h */,
-				CFAED8721B54291900E3B8A3 /* DBEmptyRecord.mm */,
-				CFAED8731B54291900E3B8A3 /* DBEmptyRecord+Private.h */,
-				CFAED8741B54291900E3B8A3 /* DBEmptyRecord+Private.mm */,
 				6551683C1C404B81003682A4 /* DBFirstListener.h */,
 				6551683D1C404B81003682A4 /* DBFirstListener+Private.h */,
 				6551683E1C404B81003682A4 /* DBFirstListener+Private.mm */,
+				CFBBB8F01B6EF092002EF52F /* DBFlagRoundtrip.h */,
+				CFBBB8F11B6EF092002EF52F /* DBFlagRoundtrip+Private.h */,
+				CFBBB8F21B6EF092002EF52F /* DBFlagRoundtrip+Private.mm */,
+				B58B16AE1D5AC9BC00EF92B5 /* DBInterfaceUsingExtendedRecord.h */,
+				B58B16B61D5AD56600EF92B5 /* DBInterfaceUsingExtendedRecord.mm */,
+				B58B16AD1D5AC9BC00EF92B5 /* DBInterfaceUsingExtendedRecord+Private.h */,
+				B58B16AC1D5AC9BC00EF92B5 /* DBInterfaceUsingExtendedRecord+Private.mm */,
+				B5153F991D54284100012654 /* DBJavaOnlyListener.h */,
+				B5153F981D54284100012654 /* DBJavaOnlyListener+Private.h */,
+				B5153F971D54284100012654 /* DBJavaOnlyListener+Private.mm */,
 				650CA0551C2AB48E007ADDDB /* DBListenerCaller.h */,
 				650CA0561C2AB48E007ADDDB /* DBListenerCaller+Private.h */,
 				650CA0571C2AB48E007ADDDB /* DBListenerCaller+Private.mm */,
@@ -667,10 +671,17 @@
 				A24850211AF96EBC00AFE907 /* DBNestedCollection.mm */,
 				A24249371AF192E0003BF8F0 /* DBNestedCollection+Private.h */,
 				A238CA821AF84B7100CDDCE5 /* DBNestedCollection+Private.mm */,
+				B5F06A7F1D4973BD005BE736 /* DBObjcOnlyListener.h */,
+				B5F06A801D4973BD005BE736 /* DBObjcOnlyListener+Private.h */,
+				B5F06A811D4973BD005BE736 /* DBObjcOnlyListener+Private.mm */,
 				A242493B1AF192E0003BF8F0 /* DBPrimitiveList.h */,
 				A24850221AF96EBC00AFE907 /* DBPrimitiveList.mm */,
 				A242493A1AF192E0003BF8F0 /* DBPrimitiveList+Private.h */,
 				A238CA841AF84B7100CDDCE5 /* DBPrimitiveList+Private.mm */,
+				B58B16AB1D5AC9BC00EF92B5 /* DBRecordUsingExtendedRecord.h */,
+				B58B16AA1D5AC9BC00EF92B5 /* DBRecordUsingExtendedRecord.mm */,
+				B58B16A91D5AC9BC00EF92B5 /* DBRecordUsingExtendedRecord+Private.h */,
+				B58B16A81D5AC9BC00EF92B5 /* DBRecordUsingExtendedRecord+Private.mm */,
 				A242493E1AF192E0003BF8F0 /* DBRecordWithDerivings.h */,
 				A24850231AF96EBC00AFE907 /* DBRecordWithDerivings.mm */,
 				A242493D1AF192E0003BF8F0 /* DBRecordWithDerivings+Private.h */,
@@ -679,6 +690,10 @@
 				CFC5DA051B1532F600BF2DF8 /* DBRecordWithDurationAndDerivings.mm */,
 				CFC5DA061B1532F600BF2DF8 /* DBRecordWithDurationAndDerivings+Private.h */,
 				CFC5DA071B1532F600BF2DF8 /* DBRecordWithDurationAndDerivings+Private.mm */,
+				CF5673881BE05D1E006330E7 /* DBRecordWithFlags.h */,
+				CF5673891BE05D1E006330E7 /* DBRecordWithFlags.mm */,
+				CF56738A1BE05D1E006330E7 /* DBRecordWithFlags+Private.h */,
+				CF56738B1BE05D1E006330E7 /* DBRecordWithFlags+Private.mm */,
 				A24249411AF192E0003BF8F0 /* DBRecordWithNestedDerivings.h */,
 				A24850241AF96EBC00AFE907 /* DBRecordWithNestedDerivings.mm */,
 				A24249401AF192E0003BF8F0 /* DBRecordWithNestedDerivings+Private.h */,
@@ -689,6 +704,9 @@
 				655168491C4050A4003682A4 /* DBReturnTwo.h */,
 				6551684A1C4050A4003682A4 /* DBReturnTwo+Private.h */,
 				6551684B1C4050A4003682A4 /* DBReturnTwo+Private.mm */,
+				B5E9C93D1C1F9E9E0073C123 /* DBReverseClientInterface.h */,
+				B5E9C93E1C1F9E9E0073C123 /* DBReverseClientInterface+Private.h */,
+				B5E9C93F1C1F9E9E0073C123 /* DBReverseClientInterface+Private.mm */,
 				6551683F1C404B81003682A4 /* DBSecondListener.h */,
 				655168401C404B81003682A4 /* DBSecondListener+Private.h */,
 				655168411C404B81003682A4 /* DBSecondListener+Private.mm */,
@@ -705,6 +723,23 @@
 				A242494A1AF192E0003BF8F0 /* DBUserToken.h */,
 				A24249491AF192E0003BF8F0 /* DBUserToken+Private.h */,
 				CFFD588A1B019E79001E10B6 /* DBUserToken+Private.mm */,
+				B5153F921D54283700012654 /* DBUsesSingleLanguageListeners.h */,
+				B5153F911D54283700012654 /* DBUsesSingleLanguageListeners+Private.h */,
+				B5153F901D54283700012654 /* DBUsesSingleLanguageListeners+Private.mm */,
+				B519114F1D555EE900772DFE /* DBVarnameInterface.h */,
+				B519114E1D555EE900772DFE /* DBVarnameInterface+Private.h */,
+				B519114D1D555EE900772DFE /* DBVarnameInterface+Private.mm */,
+				B519114C1D555EE900772DFE /* DBVarnameRecord.h */,
+				B519114B1D555EE900772DFE /* DBVarnameRecord.mm */,
+				B519114A1D555EE900772DFE /* DBVarnameRecord+Private.h */,
+				B51911491D555EE900772DFE /* DBVarnameRecord+Private.mm */,
+				B51911171D542A7000772DFE /* DBWcharTestHelpers.h */,
+				B51911161D542A7000772DFE /* DBWcharTestHelpers+Private.h */,
+				B51911151D542A7000772DFE /* DBWcharTestHelpers+Private.mm */,
+				B5153F8C1D54283700012654 /* DBWcharTestRec.h */,
+				B5153F8B1D54283700012654 /* DBWcharTestRec.mm */,
+				B5153F8A1D54283700012654 /* DBWcharTestRec+Private.h */,
+				B5153F891D54283700012654 /* DBWcharTestRec+Private.mm */,
 			);
 			name = "generated-objc";
 			path = "../generated-src/objc";
@@ -730,6 +765,7 @@
 				B5F06A6A1D497396005BE736 /* java_only_listener.hpp */,
 				B5F06A6B1D497396005BE736 /* objc_only_listener.hpp */,
 				B5F06A6C1D497396005BE736 /* uses_single_language_listeners.hpp */,
+				CFBBB8ED1B6E3A72002EF52F /* access_flags.hpp */,
 				B5D8FC381C23E30D0045ADCF /* constant_record.hpp */,
 				B5E9C93C1C1F9DCA0073C123 /* reverse_client_interface.hpp */,
 				B52DA56C1B103FBE005CE75F /* assorted_primitives.cpp */,
@@ -744,12 +780,14 @@
 				A24249651AF192FC003BF8F0 /* cpp_exception.hpp */,
 				CFF89B921B5D2CC7007F6EC2 /* date_record.cpp */,
 				A24249661AF192FC003BF8F0 /* date_record.hpp */,
+				CFBBB8E71B6E3747002EF52F /* empty_flags.hpp */,
 				CFAED8771B54292600E3B8A3 /* empty_record.hpp */,
 				CFC5D9E01B1513D800BF2DF8 /* extern_interface_1.hpp */,
 				CFC5D9E11B1513D800BF2DF8 /* extern_interface_2.hpp */,
 				CFC5D9CE1B15105100BF2DF8 /* extern_record_with_derivings.cpp */,
 				CFC5D9CF1B15105100BF2DF8 /* extern_record_with_derivings.hpp */,
 				6551683A1C404B58003682A4 /* first_listener.hpp */,
+				CFBBB8F41B6EF0A0002EF52F /* flag_roundtrip.hpp */,
 				650CA04E1C2AB460007ADDDB /* listener_caller.hpp */,
 				A24249671AF192FC003BF8F0 /* map_date_record.hpp */,
 				A24249681AF192FC003BF8F0 /* map_list_record.hpp */,
@@ -760,6 +798,7 @@
 				A242496D1AF192FC003BF8F0 /* record_with_derivings.hpp */,
 				CFC5DA0C1B15330000BF2DF8 /* record_with_duration_and_derivings.cpp */,
 				CFC5DA0D1B15330000BF2DF8 /* record_with_duration_and_derivings.hpp */,
+				CF56738E1BE05D2B006330E7 /* record_with_flags.hpp */,
 				A242496E1AF192FC003BF8F0 /* record_with_nested_derivings.cpp */,
 				A242496F1AF192FC003BF8F0 /* record_with_nested_derivings.hpp */,
 				655168441C40508A003682A4 /* return_one.hpp */,
@@ -882,6 +921,7 @@
 				CFF89B931B5D2CC7007F6EC2 /* date_record.cpp in Sources */,
 				A24850301AF96EBC00AFE907 /* DBRecordWithNestedDerivings.mm in Sources */,
 				CFFD58B11B041BD9001E10B6 /* DBConstantsInterface.mm in Sources */,
+				CFBBB8EF1B6EF071002EF52F /* flag_roundtrip.cpp in Sources */,
 				B52DA56E1B103FC5005CE75F /* assorted_primitives.cpp in Sources */,
 				CFFD58B31B041BD9001E10B6 /* DBConstantsInterface+Private.mm in Sources */,
 				CFC5D9FC1B152E4300BF2DF8 /* TranslateDuration.cpp in Sources */,
@@ -900,6 +940,10 @@
 				CFFD58911B019E79001E10B6 /* DBUserToken+Private.mm in Sources */,
 				B5153F9A1D54284100012654 /* DBJavaOnlyListener+Private.mm in Sources */,
 				B5F06A9A1D497A66005BE736 /* extended_record.cpp in Sources */,
+				CFFD58911B019E79001E10B6 /* DBUserToken+Private.mm in Sources */,
+				CF56738C1BE05D1E006330E7 /* DBRecordWithFlags.mm in Sources */,
+				CF56738D1BE05D1E006330E7 /* DBRecordWithFlags+Private.mm in Sources */,
+				CFBBB8F31B6EF092002EF52F /* DBFlagRoundtrip+Private.mm in Sources */,
 				A2CB54B419BA6E6000A9E600 /* DJIError.mm in Sources */,
 				B5E9C9401C1F9E9E0073C123 /* DBReverseClientInterface+Private.mm in Sources */,
 				B58B16B41D5AD55B00EF92B5 /* record_using_extended_record.cpp in Sources */,
@@ -967,6 +1011,7 @@
 				CFFD588E1B019E79001E10B6 /* DBCppException+Private.mm in Sources */,
 				CFC5DA021B15318B00BF2DF8 /* DBTestDuration+Private.mm in Sources */,
 				CFFD58B41B041BD9001E10B6 /* DBConstantsInterface+Private.mm in Sources */,
+				CFBBB8EB1B6E38C5002EF52F /* DBFlagsTests.mm in Sources */,
 				CFFD58901B019E79001E10B6 /* DBTestHelpers+Private.mm in Sources */,
 				650CA0601C2AB6DB007ADDDB /* DBMultipleInheritanceTests.m in Sources */,
 				CFFD58921B019E79001E10B6 /* DBUserToken+Private.mm in Sources */,

From 462050496975b16d4c22584463559ee24d2bdc51 Mon Sep 17 00:00:00 2001
From: Yannick Heinrich <yannick.heinrich@gmail.com>
Date: Wed, 4 Oct 2017 13:31:10 +0200
Subject: [PATCH 49/56] Add assembly to produce standalone jar. (#324)

---
 Makefile                | 16 ++++++++++++++--
 README.md               | 42 +++++++++++++++++++++++++++++++++++++++++
 src/project/plugins.sbt |  2 ++
 3 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index ef0a50586..08aa379d8 100644
--- a/Makefile
+++ b/Makefile
@@ -6,13 +6,17 @@ ifndef ANDROID_NDK_HOME
 ANDROID_NDK_HOME = $(abspath $(dir $(realpath $(shell which ndk-build))))
 endif
 
+SCALA_VERSION=2.11
+DJINNI_VERSION=0.1-SNAPSHOT
+OUTPUT_JAR=src/target/scala-$(SCALA_VERSION)/djinni-assembly-$(DJINNI_VERSION).jar
+
 #
 # Global targets.
 #
 
 all: djinni example_ios example_android example_localhost test
 
-clean:
+clean: djinni_jar_clean
 	-ndk-build -C example/android/app/ clean
 	-xcodebuild -workspace example/objc/TextSort.xcworkspace -scheme TextSort -configuration 'Debug' -sdk iphonesimulator clean
 	-rm -rf libs/
@@ -30,6 +34,14 @@ clean:
 djinni:
 	cd src && ./build
 
+$(OUTPUT_JAR):
+	cd src && sbt assembly
+
+djinni_jar: $(OUTPUT_JAR)
+
+djinni_jar_clean:
+	cd src && sbt clean
+
 # we specify a root target for android to prevent all of the targets from spidering out
 GypAndroid.mk: ./deps/gyp example/libtextsort.gyp support-lib/support_lib.gyp example/example.djinni
 	./example/run_djinni.sh
@@ -58,4 +70,4 @@ example_localhost: ./deps/java
 test: ./deps/java
 	make -C test-suite
 
-.PHONY: example_android example_ios example_localhost test djinni clean all
+.PHONY: example_android example_ios example_localhost test djinni clean all dinni_jar
diff --git a/README.md b/README.md
index 4302daf2e..ba8942fe6 100644
--- a/README.md
+++ b/README.md
@@ -450,6 +450,48 @@ integers are not included because they are not available in Java.
 ## Test Suite
 Run `make test` to invoke the test suite, found in the test-suite subdirectory. It will build and run Java code on a local JVMy, plus Objective-C on an iOS simulator.  The latter will only work on a Mac with Xcode.
 
+## Generate a standalone jar
+
+The `djinni_jar` target of the main `Makefile` creates a standalone `.jar`. 
+This uses the [sbt assembly plugin](https://github.com/sbt/sbt-assembly) under the hoods.
+
+Simply call this target from the root directory:
+```shell
+make djinni_jar
+```
+This will produce a `.jar` file inside the `src/target/scala_<SCALA_VERSION>/djinni-assembly-<VERSION>.jar`.
+
+You can move and use it as any other executable `.jar`.
+
+Assuming the `.jar` is located at `$DJINNI_JAR_DIR` its version equals `0.1-SNAPSHOT`:
+```shell
+# Example
+java -jar $DJINNI_JAR_DIR/djinni-assembly-0.1-SNAPSHOT.jar \
+    --java-out "$temp_out/java" \
+    --java-package $java_package \
+    --java-class-access-modifier "package" \
+    --java-nullable-annotation "javax.annotation.CheckForNull" \
+    --java-nonnull-annotation "javax.annotation.Nonnull" \
+    --ident-java-field mFooBar \
+    \
+    --cpp-out "$temp_out/cpp" \
+    --cpp-namespace textsort \
+    --ident-cpp-enum-type foo_bar \
+    \
+    --jni-out "$temp_out/jni" \
+    --ident-jni-class NativeFooBar \
+    --ident-jni-file NativeFooBar \
+    \
+    --objc-out "$temp_out/objc" \
+    --objcpp-out "$temp_out/objc" \
+    --objc-type-prefix TXS \
+    --objc-swift-bridging-header "TextSort-Bridging-Header" \
+    \
+    --idl "$in"
+```
+
+*Note*: The `all` target of the main `Makefile` includes the `djinni_jar` target.
+
 ## Community Links
 
 * Join the discussion with other developers at the [Mobile C++ Slack Community](https://mobilecpp.herokuapp.com/)
diff --git a/src/project/plugins.sbt b/src/project/plugins.sbt
index c67c87fba..88e51ec69 100644
--- a/src/project/plugins.sbt
+++ b/src/project/plugins.sbt
@@ -1 +1,3 @@
 addSbtPlugin("com.typesafe.sbt" % "sbt-start-script" % "0.10.0")
+
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.5")
\ No newline at end of file

From 9aec1880ec8c863e8fc967db60e4b6e4bd766e86 Mon Sep 17 00:00:00 2001
From: Bruno Coelho <4brunu@users.noreply.github.com>
Date: Wed, 4 Oct 2017 12:49:39 +0100
Subject: [PATCH 50/56] Android parcelable support (#308)

---
 src/source/CppGenerator.scala                 |   2 +-
 src/source/JavaGenerator.scala                | 164 +++++++++++++-
 src/source/Main.scala                         |   4 +
 src/source/YamlGenerator.scala                |   9 +-
 src/source/ast.scala                          |   2 +-
 src/source/generator.scala                    |   1 +
 src/source/meta.scala                         |   4 +-
 src/source/parser.scala                       |   1 +
 test-suite/djinni/enum.djinni                 |   2 +-
 test-suite/djinni/nested_collection.djinni    |   2 +-
 test-suite/djinni/primtypes.djinni            |   2 +-
 .../djinni/vendor/third-party/date.djinni     |   2 +-
 .../djinni/vendor/third-party/date.yaml       |   4 +-
 .../djinni/test/AssortedPrimitives.java       | 119 ++++++++++-
 .../com/dropbox/djinni/test/DateRecord.java   |  30 ++-
 .../dropbox/djinni/test/EnumUsageRecord.java  |  51 ++++-
 .../dropbox/djinni/test/NestedCollection.java |  31 ++-
 .../java/android/os/Parcel.java               | 201 ++++++++++++++++++
 .../java/android/os/Parcelable.java           | 129 +++++++++++
 .../com/dropbox/djinni/test/AllTests.java     |   1 +
 .../djinni/test/AndroidParcelableTest.java    |  85 ++++++++
 test-suite/run_djinni.sh                      |   1 +
 22 files changed, 826 insertions(+), 21 deletions(-)
 create mode 100644 test-suite/handwritten-src/java/android/os/Parcel.java
 create mode 100644 test-suite/handwritten-src/java/android/os/Parcelable.java
 create mode 100644 test-suite/handwritten-src/java/com/dropbox/djinni/test/AndroidParcelableTest.java

diff --git a/src/source/CppGenerator.scala b/src/source/CppGenerator.scala
index 365509007..28d309b1a 100644
--- a/src/source/CppGenerator.scala
+++ b/src/source/CppGenerator.scala
@@ -232,7 +232,7 @@ class CppGenerator(spec: Spec) extends Generator(spec) {
 
     writeHppFile(cppName, origin, refs.hpp, refs.hppFwds, writeCppPrototype)
 
-    if (r.consts.nonEmpty || r.derivingTypes.nonEmpty) {
+    if (r.consts.nonEmpty || r.derivingTypes.contains(DerivingType.Eq) || r.derivingTypes.contains(DerivingType.Ord)) {
       writeCppFile(cppName, origin, refs.cpp, w => {
         generateCppConstants(w, r.consts, actualSelf)
 
diff --git a/src/source/JavaGenerator.scala b/src/source/JavaGenerator.scala
index 4fa739ee0..1c0c23804 100644
--- a/src/source/JavaGenerator.scala
+++ b/src/source/JavaGenerator.scala
@@ -220,13 +220,13 @@ class JavaGenerator(spec: Spec) extends Generator(spec) {
       javaAnnotationHeader.foreach(w.wl)
       val self = marshal.typename(javaName, r)
 
-      val comparableFlag =
-        if (r.derivingTypes.contains(DerivingType.Ord)) {
-          s" implements Comparable<$self>"
-        } else {
-          ""
-        }
-      w.w(s"${javaClassAccessModifierString}${javaFinal}class ${self + javaTypeParams(params)}$comparableFlag").braced {
+      val interfaces = scala.collection.mutable.ArrayBuffer[String]()
+      if (r.derivingTypes.contains(DerivingType.Ord))
+          interfaces += s"Comparable<$self>"
+      if (spec.javaImplementAndroidOsParcelable && r.derivingTypes.contains(DerivingType.AndroidParcelable))
+          interfaces += "android.os.Parcelable"
+      val implementsSection = if (interfaces.isEmpty) "" else " implements " + interfaces.mkString(", ")
+      w.w(s"${javaClassAccessModifierString}${javaFinal}class ${self + javaTypeParams(params)}$implementsSection").braced {
         w.wl
         generateJavaConstants(w, r.consts)
         // Field definitions.
@@ -358,6 +358,9 @@ class JavaGenerator(spec: Spec) extends Generator(spec) {
         }
         w.wl
 
+        if (spec.javaImplementAndroidOsParcelable && r.derivingTypes.contains(DerivingType.AndroidParcelable))
+          writeParcelable(w, self, r);
+
         if (r.derivingTypes.contains(DerivingType.Ord)) {
           def primitiveCompare(ident: Ident) {
             w.wl(s"if (this.${idJava.field(ident)} < other.${idJava.field(ident)}) {").nested {
@@ -407,4 +410,151 @@ class JavaGenerator(spec: Spec) extends Generator(spec) {
   def javaTypeParams(params: Seq[TypeParam]): String =
     if (params.isEmpty) "" else params.map(p => idJava.typeParam(p.ident)).mkString("<", ", ", ">")
 
+  def writeParcelable(w: IndentWriter, self: String, r: Record) = {
+    // Generates the methods and the constructor to implement the interface android.os.Parcelable
+
+    // CREATOR
+    w.wl
+    w.wl(s"public static final android.os.Parcelable.Creator<$self> CREATOR")
+    w.w(s"    = new android.os.Parcelable.Creator<$self>()").bracedSemi {
+      w.wl("@Override")
+      w.w(s"public $self createFromParcel(android.os.Parcel in)").braced {
+        w.wl(s"return new $self(in);")
+      }
+      w.wl
+      w.wl("@Override")
+      w.w(s"public $self[] newArray(int size)").braced {
+        w.wl(s"return new $self[size];")
+      }
+    }
+
+    // constructor (Parcel)
+    def deserializeField(f: Field, m: Meta, inOptional: Boolean) {
+      m match {
+        case MString => w.wl(s"this.${idJava.field(f.ident)} = in.readString();")
+        case MBinary => {
+          w.wl(s"this.${idJava.field(f.ident)} = in.createByteArray();")
+        }
+        case MDate => w.wl(s"this.${idJava.field(f.ident)} = new ${marshal.typename(f.ty)}(in.readLong());")
+        case t: MPrimitive => t.jName match {
+          case "short" => w.wl(s"this.${idJava.field(f.ident)} = (short)in.readInt();")
+          case "int" => w.wl(s"this.${idJava.field(f.ident)} = in.readInt();")
+          case "long" => w.wl(s"this.${idJava.field(f.ident)} = in.readLong();")
+          case "byte" => w.wl(s"this.${idJava.field(f.ident)} = in.readByte();")
+          case "boolean" => w.wl(s"this.${idJava.field(f.ident)} = in.readByte() != 0;")
+          case "float" => w.wl(s"this.${idJava.field(f.ident)} = in.readFloat();")
+          case "double" => w.wl(s"this.${idJava.field(f.ident)} = in.readDouble();")
+          case _ => throw new AssertionError("Unreachable")
+        }
+        case df: MDef => df.defType match {
+          case DRecord => w.wl(s"this.${idJava.field(f.ident)} = new ${marshal.typename(f.ty)}(in);")
+          case DEnum => w.wl(s"this.${idJava.field(f.ident)} = ${marshal.typename(f.ty)}.values()[in.readInt()];")
+          case _ => throw new AssertionError("Unreachable")
+        }
+        case e: MExtern => e.defType match {
+          case DRecord => w.wl(s"this.${idJava.field(f.ident)} = ${e.java.readFromParcel.format(marshal.typename(f.ty))};")
+          case DEnum => w.wl(s"this.${idJava.field(f.ident)} = ${marshal.typename(f.ty)}.values()[in.readInt()];")
+          case _ => throw new AssertionError("Unreachable")
+        }
+        case MList => {
+          w.wl(s"this.${idJava.field(f.ident)} = new ${marshal.typename(f.ty)}();")
+          w.wl(s"in.readList(this.${idJava.field(f.ident)}, getClass().getClassLoader());")
+        }
+        case MSet =>  {
+          val collectionTypeName = marshal.typename(f.ty).replaceFirst("HashSet<(.*)>", "$1")
+          w.wl(s"ArrayList<${collectionTypeName}> ${idJava.field(f.ident)}Temp = new ArrayList<${collectionTypeName}>();")
+          w.wl(s"in.readList(${idJava.field(f.ident)}Temp, getClass().getClassLoader());")
+          w.wl(s"this.${idJava.field(f.ident)} = new ${marshal.typename(f.ty)}(${idJava.field(f.ident)}Temp);")
+        }
+        case MMap => {
+          w.wl(s"this.${idJava.field(f.ident)} = new ${marshal.typename(f.ty)}();")
+          w.wl(s"in.readMap(this.${idJava.field(f.ident)}, getClass().getClassLoader());")
+        }
+        case MOptional => {
+          if (inOptional)
+          	throw new AssertionError("nested optional?")
+          w.wl("if (in.readByte() == 0) {").nested {
+            w.wl(s"this.${idJava.field(f.ident)} = null;")
+          }
+          w.wl("} else {").nested {
+            deserializeField(f, f.ty.resolved.args.head.base, true)
+          }
+          w.wl("}")
+        }
+        case _ => throw new AssertionError("Unreachable")
+      }
+    }
+    w.wl
+    w.w(s"public $self(android.os.Parcel in)").braced {
+      for (f <- r.fields)
+        deserializeField(f, f.ty.resolved.base, false)
+    }
+
+    // describeContents
+    w.wl
+    w.wl("@Override")
+    w.w("public int describeContents()").braced {
+      w.wl("return 0;")
+    }
+
+    // writeToParcel
+    def serializeField(f: Field, m: Meta, inOptional: Boolean) {
+      m match {
+        case MString => w.wl(s"out.writeString(this.${idJava.field(f.ident)});")
+        case MBinary => {
+          w.wl(s"out.writeByteArray(this.${idJava.field(f.ident)});")
+        }
+        case MDate => w.wl(s"out.writeLong(this.${idJava.field(f.ident)}.getTime());")
+        case t: MPrimitive => t.jName match {
+          case "short" | "int" => w.wl(s"out.writeInt(this.${idJava.field(f.ident)});")
+          case "long" => w.wl(s"out.writeLong(this.${idJava.field(f.ident)});")
+          case "byte" => w.wl(s"out.writeByte(this.${idJava.field(f.ident)});")
+          case "boolean" => w.wl(s"out.writeByte(this.${idJava.field(f.ident)} ? (byte)1 : 0);")
+          case "float" => w.wl(s"out.writeFloat(this.${idJava.field(f.ident)});")
+          case "double" => w.wl(s"out.writeDouble(this.${idJava.field(f.ident)});")
+          case _ => throw new AssertionError("Unreachable")
+        }
+        case df: MDef => df.defType match {
+          case DRecord => w.wl(s"this.${idJava.field(f.ident)}.writeToParcel(out, flags);")
+          case DEnum => w.wl(s"out.writeInt(this.${idJava.field(f.ident)}.ordinal());")
+          case _ => throw new AssertionError("Unreachable")
+        }
+        case e: MExtern => e.defType match {
+          case DRecord => w.wl(e.java.writeToParcel.format(idJava.field(f.ident)) + ";")
+          case DEnum => w.wl(s"out.writeInt((int)this.${idJava.field(f.ident)});")
+          case _ => throw new AssertionError("Unreachable")
+        }
+        case MList => {
+          w.wl(s"out.writeList(this.${idJava.field(f.ident)});")
+        }
+        case MSet => {
+          val collectionTypeName = marshal.typename(f.ty).replaceFirst("HashSet<(.*)>", "$1")
+          w.wl(s"out.writeList(new ArrayList<${collectionTypeName}>(this.${idJava.field(f.ident)}));")
+        }
+        case MMap => w.wl(s"out.writeMap(this.${idJava.field(f.ident)});")
+        case MOptional => {
+          if (inOptional)
+          	throw new AssertionError("nested optional?")
+          w.wl(s"if (this.${idJava.field(f.ident)} != null) {").nested {
+            w.wl("out.writeByte((byte)1);")
+            serializeField(f, f.ty.resolved.args.head.base, true)
+          }
+          w.wl("} else {").nested {
+            w.wl("out.writeByte((byte)0);")
+          }
+          w.wl("}")
+        }
+        case _ => throw new AssertionError("Unreachable")
+      }
+    }
+
+    w.wl
+    w.wl("@Override")
+    w.w("public void writeToParcel(android.os.Parcel out, int flags)").braced {
+      for (f <- r.fields)
+        serializeField(f, f.ty.resolved.base, false)
+    }
+    w.wl
+  }
+
 }
diff --git a/src/source/Main.scala b/src/source/Main.scala
index 68a2b5baf..84d97f017 100644
--- a/src/source/Main.scala
+++ b/src/source/Main.scala
@@ -44,6 +44,7 @@ object Main {
     var javaAnnotation: Option[String] = None
     var javaNullableAnnotation: Option[String] = None
     var javaNonnullAnnotation: Option[String] = None
+    var javaImplementAndroidOsParcelable : Boolean = false
     var javaUseFinalForRecord: Boolean = true
     var jniOutFolder: Option[File] = None
     var jniHeaderOutFolderOptional: Option[File] = None
@@ -114,6 +115,8 @@ object Main {
         .text("Java annotation (@Nullable) to place on all fields and return values that are optional")
       opt[String]("java-nonnull-annotation").valueName("<nonnull-annotation-class>").foreach(x => javaNonnullAnnotation = Some(x))
         .text("Java annotation (@Nonnull) to place on all fields and return values that are not optional")
+      opt[Boolean]("java-implement-android-os-parcelable").valueName("<true/false>").foreach(x => javaImplementAndroidOsParcelable = x)
+        .text("all generated java classes will implement the interface android.os.Parcelable")
       opt[Boolean]("java-use-final-for-record").valueName("<use-final-for-record>").foreach(x => javaUseFinalForRecord = x)
         .text("Whether generated Java classes for records should be marked 'final' (default: true). ")
       note("")
@@ -303,6 +306,7 @@ object Main {
       javaAnnotation,
       javaNullableAnnotation,
       javaNonnullAnnotation,
+      javaImplementAndroidOsParcelable,
       javaUseFinalForRecord,
       cppOutFolder,
       cppHeaderOutFolder,
diff --git a/src/source/YamlGenerator.scala b/src/source/YamlGenerator.scala
index 42b53b568..44e0655c7 100644
--- a/src/source/YamlGenerator.scala
+++ b/src/source/YamlGenerator.scala
@@ -100,6 +100,7 @@ class YamlGenerator(spec: Spec) extends Generator(spec) {
         r.derivingTypes.collect {
           case Record.DerivingType.Eq => "eq"
           case Record.DerivingType.Ord => "ord"
+          case Record.DerivingType.AndroidParcelable => "parcelable"
         }.mkString(" deriving(", ", ", ")")
       }
     }
@@ -135,7 +136,9 @@ class YamlGenerator(spec: Spec) extends Generator(spec) {
     "boxed" -> QuotedString(javaMarshal.fqTypename(td.ident, td.body)),
     "reference" -> javaMarshal.isReference(td),
     "generic" -> true,
-    "hash" -> QuotedString("%s.hashCode()")
+    "hash" -> QuotedString("%s.hashCode()"),
+    "writeToParcel" -> QuotedString("%s.writeToParcel(out, flags)"),
+    "readFromParcel" -> QuotedString("new %s(in)")
   )
 
   private def jni(td: TypeDecl) = Map[String, Any](
@@ -205,7 +208,9 @@ object YamlGenerator {
       nested(td, "java")("boxed").toString,
       nested(td, "java")("reference").asInstanceOf[Boolean],
       nested(td, "java")("generic").asInstanceOf[Boolean],
-      nested(td, "java")("hash").toString),
+      nested(td, "java")("hash").toString,
+      if (nested(td, "java") contains "writeToParcel") nested(td, "java")("writeToParcel").toString else "%s.writeToParcel(out, flags)",
+      if (nested(td, "java") contains "readFromParcel") nested(td, "java")("readFromParcel").toString else "new %s(in)"),
     MExtern.Jni(
       nested(td, "jni")("translator").toString,
       nested(td, "jni")("header").toString,
diff --git a/src/source/ast.scala b/src/source/ast.scala
index 30117f019..fb171240b 100644
--- a/src/source/ast.scala
+++ b/src/source/ast.scala
@@ -75,7 +75,7 @@ case class Record(ext: Ext, fields: Seq[Field], consts: Seq[Const], derivingType
 object Record {
   object DerivingType extends Enumeration {
     type DerivingType = Value
-    val Eq, Ord = Value
+    val Eq, Ord, AndroidParcelable = Value
   }
 }
 
diff --git a/src/source/generator.scala b/src/source/generator.scala
index d1263987c..e5f687722 100644
--- a/src/source/generator.scala
+++ b/src/source/generator.scala
@@ -36,6 +36,7 @@ package object generatorTools {
                    javaAnnotation: Option[String],
                    javaNullableAnnotation: Option[String],
                    javaNonnullAnnotation: Option[String],
+                   javaImplementAndroidOsParcelable: Boolean,
                    javaUseFinalForRecord: Boolean,
                    cppOutFolder: Option[File],
                    cppHeaderOutFolder: Option[File],
diff --git a/src/source/meta.scala b/src/source/meta.scala
index 13ab7ba53..78e5997cf 100644
--- a/src/source/meta.scala
+++ b/src/source/meta.scala
@@ -57,7 +57,9 @@ object MExtern {
     boxed: String, // Java typename used if boxing is required, must be an object.
     reference: Boolean, // True if the unboxed type is an object reference and qualifies for any kind of "nonnull" annotation in Java. Only used for "record" types.
     generic: Boolean, // Set to false to exclude type arguments from the Java class. This is should be true by default. Useful if template arguments are only used in C++.
-    hash: String // A well-formed expression to get the hash value. Must be a format string with a single "%s" placeholder. Only used for "record" types types with "eq" deriving when needed.
+    hash: String, // A well-formed expression to get the hash value. Must be a format string with a single "%s" placeholder. Only used for "record" types types with "eq" deriving when needed.
+    writeToParcel: String, // A well-formed expression to write value into android.os.Parcel. Must be a format string with a single "%s" placeholder. Only used for "record" types types
+    readFromParcel: String // A well-formed expression to read value from android.os.Parcel. Must be a format string with a single "%s" placeholder. Only used for "record" types types
   )
   case class Jni(
     translator: String, // C++ typename containing toCpp/fromCpp methods
diff --git a/src/source/parser.scala b/src/source/parser.scala
index b9db73eb8..9e79e9960 100644
--- a/src/source/parser.scala
+++ b/src/source/parser.scala
@@ -123,6 +123,7 @@ private object IdlParser extends RegexParsers {
     _.map(ident => ident.name match {
       case "eq" => Record.DerivingType.Eq
       case "ord" => Record.DerivingType.Ord
+      case "parcelable" => Record.DerivingType.AndroidParcelable
       case _ => return err( s"""Unrecognized deriving type "${ident.name}"""")
     }).toSet
   }
diff --git a/test-suite/djinni/enum.djinni b/test-suite/djinni/enum.djinni
index efbc9c492..968b15d17 100644
--- a/test-suite/djinni/enum.djinni
+++ b/test-suite/djinni/enum.djinni
@@ -17,7 +17,7 @@ enum_usage_record = record {
     l: list<color>;
     s: set<color>;
     m: map<color, color>;
-}
+} deriving(parcelable)
 
 enum_usage_interface = interface +c +j +o {
     e(e: color): color;
diff --git a/test-suite/djinni/nested_collection.djinni b/test-suite/djinni/nested_collection.djinni
index 08b4ab73a..c7f5a9689 100644
--- a/test-suite/djinni/nested_collection.djinni
+++ b/test-suite/djinni/nested_collection.djinni
@@ -1,3 +1,3 @@
 nested_collection = record {
     set_list : list<set<string>>;
-}
+} deriving(parcelable)
diff --git a/test-suite/djinni/primtypes.djinni b/test-suite/djinni/primtypes.djinni
index 35cd43075..02a5b51d6 100644
--- a/test-suite/djinni/primtypes.djinni
+++ b/test-suite/djinni/primtypes.djinni
@@ -14,4 +14,4 @@ assorted_primitives = record {
     o_sixtyfour: optional<i64>;
     o_fthirtytwo: optional<f32>;
     o_fsixtyfour: optional<f64>;
-} deriving (eq)
+} deriving (eq, parcelable)
diff --git a/test-suite/djinni/vendor/third-party/date.djinni b/test-suite/djinni/vendor/third-party/date.djinni
index be9ba9d39..a1e8a2410 100644
--- a/test-suite/djinni/vendor/third-party/date.djinni
+++ b/test-suite/djinni/vendor/third-party/date.djinni
@@ -2,7 +2,7 @@
 
 date_record = record {
     created_at: extern_date;
-} deriving(eq, ord)
+} deriving(eq, ord, parcelable)
 
 map_date_record = record {
     dates_by_id: map<string, extern_date>;
diff --git a/test-suite/djinni/vendor/third-party/date.yaml b/test-suite/djinni/vendor/third-party/date.yaml
index b49bbf602..557b01796 100644
--- a/test-suite/djinni/vendor/third-party/date.yaml
+++ b/test-suite/djinni/vendor/third-party/date.yaml
@@ -1,7 +1,7 @@
 # This is an example YAML file mimicking the builtin "date" type as external type
 ---
 name: extern_date
-typedef: 'record deriving(eq, ord)'
+typedef: 'record deriving(eq, ord, parcelable)'
 params: []
 prefix: ''
 cpp:
@@ -23,6 +23,8 @@ java:
   reference: true
   generic: true
   hash: '%s.hashCode()'
+  writeToParcel: 'out.writeLong(%s.getTime())'
+  readFromParcel: 'new %s(in.readLong())'
 jni:
   translator: '::djinni::Date'
   header: '"Marshal.hpp"'
diff --git a/test-suite/generated-src/java/com/dropbox/djinni/test/AssortedPrimitives.java b/test-suite/generated-src/java/com/dropbox/djinni/test/AssortedPrimitives.java
index 6c5bdd3fc..49b372fcd 100644
--- a/test-suite/generated-src/java/com/dropbox/djinni/test/AssortedPrimitives.java
+++ b/test-suite/generated-src/java/com/dropbox/djinni/test/AssortedPrimitives.java
@@ -6,7 +6,7 @@
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
-public class AssortedPrimitives {
+public class AssortedPrimitives implements android.os.Parcelable {
 
 
     /*package*/ final boolean mB;
@@ -194,4 +194,121 @@ public String toString() {
         "}";
     }
 
+
+    public static final android.os.Parcelable.Creator<AssortedPrimitives> CREATOR
+        = new android.os.Parcelable.Creator<AssortedPrimitives>() {
+        @Override
+        public AssortedPrimitives createFromParcel(android.os.Parcel in) {
+            return new AssortedPrimitives(in);
+        }
+
+        @Override
+        public AssortedPrimitives[] newArray(int size) {
+            return new AssortedPrimitives[size];
+        }
+    };
+
+    public AssortedPrimitives(android.os.Parcel in) {
+        this.mB = in.readByte() != 0;
+        this.mEight = in.readByte();
+        this.mSixteen = (short)in.readInt();
+        this.mThirtytwo = in.readInt();
+        this.mSixtyfour = in.readLong();
+        this.mFthirtytwo = in.readFloat();
+        this.mFsixtyfour = in.readDouble();
+        if (in.readByte() == 0) {
+            this.mOB = null;
+        } else {
+            this.mOB = in.readByte() != 0;
+        }
+        if (in.readByte() == 0) {
+            this.mOEight = null;
+        } else {
+            this.mOEight = in.readByte();
+        }
+        if (in.readByte() == 0) {
+            this.mOSixteen = null;
+        } else {
+            this.mOSixteen = (short)in.readInt();
+        }
+        if (in.readByte() == 0) {
+            this.mOThirtytwo = null;
+        } else {
+            this.mOThirtytwo = in.readInt();
+        }
+        if (in.readByte() == 0) {
+            this.mOSixtyfour = null;
+        } else {
+            this.mOSixtyfour = in.readLong();
+        }
+        if (in.readByte() == 0) {
+            this.mOFthirtytwo = null;
+        } else {
+            this.mOFthirtytwo = in.readFloat();
+        }
+        if (in.readByte() == 0) {
+            this.mOFsixtyfour = null;
+        } else {
+            this.mOFsixtyfour = in.readDouble();
+        }
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(android.os.Parcel out, int flags) {
+        out.writeByte(this.mB ? (byte)1 : 0);
+        out.writeByte(this.mEight);
+        out.writeInt(this.mSixteen);
+        out.writeInt(this.mThirtytwo);
+        out.writeLong(this.mSixtyfour);
+        out.writeFloat(this.mFthirtytwo);
+        out.writeDouble(this.mFsixtyfour);
+        if (this.mOB != null) {
+            out.writeByte((byte)1);
+            out.writeByte(this.mOB ? (byte)1 : 0);
+        } else {
+            out.writeByte((byte)0);
+        }
+        if (this.mOEight != null) {
+            out.writeByte((byte)1);
+            out.writeByte(this.mOEight);
+        } else {
+            out.writeByte((byte)0);
+        }
+        if (this.mOSixteen != null) {
+            out.writeByte((byte)1);
+            out.writeInt(this.mOSixteen);
+        } else {
+            out.writeByte((byte)0);
+        }
+        if (this.mOThirtytwo != null) {
+            out.writeByte((byte)1);
+            out.writeInt(this.mOThirtytwo);
+        } else {
+            out.writeByte((byte)0);
+        }
+        if (this.mOSixtyfour != null) {
+            out.writeByte((byte)1);
+            out.writeLong(this.mOSixtyfour);
+        } else {
+            out.writeByte((byte)0);
+        }
+        if (this.mOFthirtytwo != null) {
+            out.writeByte((byte)1);
+            out.writeFloat(this.mOFthirtytwo);
+        } else {
+            out.writeByte((byte)0);
+        }
+        if (this.mOFsixtyfour != null) {
+            out.writeByte((byte)1);
+            out.writeDouble(this.mOFsixtyfour);
+        } else {
+            out.writeByte((byte)0);
+        }
+    }
+
 }
diff --git a/test-suite/generated-src/java/com/dropbox/djinni/test/DateRecord.java b/test-suite/generated-src/java/com/dropbox/djinni/test/DateRecord.java
index f2334ea27..ab412a8b4 100644
--- a/test-suite/generated-src/java/com/dropbox/djinni/test/DateRecord.java
+++ b/test-suite/generated-src/java/com/dropbox/djinni/test/DateRecord.java
@@ -6,7 +6,7 @@
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
-public class DateRecord implements Comparable<DateRecord> {
+public class DateRecord implements Comparable<DateRecord>, android.os.Parcelable {
 
 
     /*package*/ final java.util.Date mCreatedAt;
@@ -46,6 +46,34 @@ public String toString() {
     }
 
 
+    public static final android.os.Parcelable.Creator<DateRecord> CREATOR
+        = new android.os.Parcelable.Creator<DateRecord>() {
+        @Override
+        public DateRecord createFromParcel(android.os.Parcel in) {
+            return new DateRecord(in);
+        }
+
+        @Override
+        public DateRecord[] newArray(int size) {
+            return new DateRecord[size];
+        }
+    };
+
+    public DateRecord(android.os.Parcel in) {
+        this.mCreatedAt = new java.util.Date(in.readLong());
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(android.os.Parcel out, int flags) {
+        out.writeLong(mCreatedAt.getTime());
+    }
+
+
     @Override
     public int compareTo(@Nonnull DateRecord other)  {
         int tempResult;
diff --git a/test-suite/generated-src/java/com/dropbox/djinni/test/EnumUsageRecord.java b/test-suite/generated-src/java/com/dropbox/djinni/test/EnumUsageRecord.java
index 5d52bbde2..4d3bb58d5 100644
--- a/test-suite/generated-src/java/com/dropbox/djinni/test/EnumUsageRecord.java
+++ b/test-suite/generated-src/java/com/dropbox/djinni/test/EnumUsageRecord.java
@@ -9,7 +9,7 @@
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
-public class EnumUsageRecord {
+public class EnumUsageRecord implements android.os.Parcelable {
 
 
     /*package*/ final Color mE;
@@ -71,4 +71,53 @@ public String toString() {
         "}";
     }
 
+
+    public static final android.os.Parcelable.Creator<EnumUsageRecord> CREATOR
+        = new android.os.Parcelable.Creator<EnumUsageRecord>() {
+        @Override
+        public EnumUsageRecord createFromParcel(android.os.Parcel in) {
+            return new EnumUsageRecord(in);
+        }
+
+        @Override
+        public EnumUsageRecord[] newArray(int size) {
+            return new EnumUsageRecord[size];
+        }
+    };
+
+    public EnumUsageRecord(android.os.Parcel in) {
+        this.mE = Color.values()[in.readInt()];
+        if (in.readByte() == 0) {
+            this.mO = null;
+        } else {
+            this.mO = Color.values()[in.readInt()];
+        }
+        this.mL = new ArrayList<Color>();
+        in.readList(this.mL, getClass().getClassLoader());
+        ArrayList<Color> mSTemp = new ArrayList<Color>();
+        in.readList(mSTemp, getClass().getClassLoader());
+        this.mS = new HashSet<Color>(mSTemp);
+        this.mM = new HashMap<Color, Color>();
+        in.readMap(this.mM, getClass().getClassLoader());
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(android.os.Parcel out, int flags) {
+        out.writeInt(this.mE.ordinal());
+        if (this.mO != null) {
+            out.writeByte((byte)1);
+            out.writeInt(this.mO.ordinal());
+        } else {
+            out.writeByte((byte)0);
+        }
+        out.writeList(this.mL);
+        out.writeList(new ArrayList<Color>(this.mS));
+        out.writeMap(this.mM);
+    }
+
 }
diff --git a/test-suite/generated-src/java/com/dropbox/djinni/test/NestedCollection.java b/test-suite/generated-src/java/com/dropbox/djinni/test/NestedCollection.java
index 7d18b9b36..69a735a83 100644
--- a/test-suite/generated-src/java/com/dropbox/djinni/test/NestedCollection.java
+++ b/test-suite/generated-src/java/com/dropbox/djinni/test/NestedCollection.java
@@ -8,7 +8,7 @@
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
-public class NestedCollection {
+public class NestedCollection implements android.os.Parcelable {
 
 
     /*package*/ final ArrayList<HashSet<String>> mSetList;
@@ -30,4 +30,33 @@ public String toString() {
         "}";
     }
 
+
+    public static final android.os.Parcelable.Creator<NestedCollection> CREATOR
+        = new android.os.Parcelable.Creator<NestedCollection>() {
+        @Override
+        public NestedCollection createFromParcel(android.os.Parcel in) {
+            return new NestedCollection(in);
+        }
+
+        @Override
+        public NestedCollection[] newArray(int size) {
+            return new NestedCollection[size];
+        }
+    };
+
+    public NestedCollection(android.os.Parcel in) {
+        this.mSetList = new ArrayList<HashSet<String>>();
+        in.readList(this.mSetList, getClass().getClassLoader());
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(android.os.Parcel out, int flags) {
+        out.writeList(this.mSetList);
+    }
+
 }
diff --git a/test-suite/handwritten-src/java/android/os/Parcel.java b/test-suite/handwritten-src/java/android/os/Parcel.java
new file mode 100644
index 000000000..9874abdf0
--- /dev/null
+++ b/test-suite/handwritten-src/java/android/os/Parcel.java
@@ -0,0 +1,201 @@
+/*
+ * Mock replacement for Android's implementation of android.os.Parcel
+ * Used in tests to check the generation of the records that implement the parcelable interface
+ */
+package android.os;
+
+import java.io.*;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public final class Parcel {
+
+    private ByteArrayOutputStream mOutStream;
+    private ObjectOutputStream mOut;
+    private ObjectInputStream mIn;
+
+    public Parcel() {
+        try {
+            mOutStream = new ByteArrayOutputStream();
+            mOut = new ObjectOutputStream(mOutStream);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+    }
+
+    public final void flush() {
+        try {
+            mOut.flush();
+            mIn = new ObjectInputStream(new ByteArrayInputStream(
+                mOutStream.toByteArray()));
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+    }
+
+    public final void writeString(String val) {
+        try {
+            mOut.writeUTF(val);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+    }
+
+    public final String readString() {
+        try {
+            return mIn.readUTF();
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return null;
+        }
+    }
+
+    public final void writeInt(int val) {
+        try {
+            mOut.writeInt(val);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+    }
+
+    public final int readInt() {
+        try {
+            return mIn.readInt();
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return 0;
+        }
+    }
+
+    public final void writeLong(long val) {
+        try {
+            mOut.writeLong(val);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+    }
+
+    public final long readLong() {
+        try {
+            return mIn.readLong();
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return 0;
+        }
+    }
+
+    public final void writeFloat(float val) {
+        try {
+            mOut.writeFloat(val);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+    }
+
+    public final float readFloat() {
+        try {
+            return mIn.readFloat();
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return 0;
+        }
+    }
+
+    public final void writeDouble(double val) {
+        try {
+            mOut.writeDouble(val);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+    }
+
+    public final double readDouble() {
+        try {
+            return mIn.readDouble();
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return 0;
+        }
+    }
+
+    public final void writeByte(byte val) {
+        try {
+            mOut.writeByte(val);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+    }
+
+    public final byte readByte() {
+        try {
+            return mIn.readByte();
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return 0;
+        }
+    }
+
+    public final void writeSerializable(Serializable s) {
+        try {
+            mOut.writeObject(s);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+    }
+
+    public final Serializable readSerializable() {
+        try {
+            return (Serializable)mIn.readObject();
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return null;
+        }
+    }
+
+    public final void writeList(List val) {
+        try {
+            mOut.writeInt(val.size());
+            for(Object obj : val)
+               mOut.writeObject(obj);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+    }
+
+    public final void readList(List outVal, ClassLoader loader) {
+        try {
+            int size = mIn.readInt();
+            for(int i = 0; i < size; ++i)
+               outVal.add(mIn.readObject());
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+    }
+
+    public final void writeMap(Map val) {
+        try {
+            Set<Map.Entry<Object,Object>> entries = val.entrySet();
+            mOut.writeInt(entries.size());
+            for(Map.Entry<Object, Object> obj : entries) {
+                mOut.writeObject(obj.getKey());
+                mOut.writeObject(obj.getValue());
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+    }
+
+    public final void readMap(Map outVal, ClassLoader loader) {
+        try {
+            int size = mIn.readInt();
+            for(int i = 0; i < size; ++i) {
+                Object key = mIn.readObject();
+                Object value = mIn.readObject();
+                outVal.put(key, value);
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+    }
+};
diff --git a/test-suite/handwritten-src/java/android/os/Parcelable.java b/test-suite/handwritten-src/java/android/os/Parcelable.java
new file mode 100644
index 000000000..e8af7148a
--- /dev/null
+++ b/test-suite/handwritten-src/java/android/os/Parcelable.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright (C) 2006 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package android.os;
+/**
+ * Interface for classes whose instances can be written to
+ * and restored from a {@link Parcel}.  Classes implementing the Parcelable
+ * interface must also have a non-null static field called <code>CREATOR</code>
+ * of a type that implements the {@link Parcelable.Creator} interface.
+ * 
+ * <p>A typical implementation of Parcelable is:</p>
+ * 
+ * <pre>
+ * public class MyParcelable implements Parcelable {
+ *     private int mData;
+ *
+ *     public int describeContents() {
+ *         return 0;
+ *     }
+ *
+ *     public void writeToParcel(Parcel out, int flags) {
+ *         out.writeInt(mData);
+ *     }
+ *
+ *     public static final Parcelable.Creator&lt;MyParcelable&gt; CREATOR
+ *             = new Parcelable.Creator&lt;MyParcelable&gt;() {
+ *         public MyParcelable createFromParcel(Parcel in) {
+ *             return new MyParcelable(in);
+ *         }
+ *
+ *         public MyParcelable[] newArray(int size) {
+ *             return new MyParcelable[size];
+ *         }
+ *     };
+ *     
+ *     private MyParcelable(Parcel in) {
+ *         mData = in.readInt();
+ *     }
+ * }</pre>
+ */
+public interface Parcelable {
+    /**
+     * Flag for use with {@link #writeToParcel}: the object being written
+     * is a return value, that is the result of a function such as
+     * "<code>Parcelable someFunction()</code>",
+     * "<code>void someFunction(out Parcelable)</code>", or
+     * "<code>void someFunction(inout Parcelable)</code>".  Some implementations
+     * may want to release resources at this point.
+     */
+    public static final int PARCELABLE_WRITE_RETURN_VALUE = 0x0001;
+    
+    /**
+     * Bit masks for use with {@link #describeContents}: each bit represents a
+     * kind of object considered to have potential special significance when
+     * marshalled.
+     */
+    public static final int CONTENTS_FILE_DESCRIPTOR = 0x0001;
+    
+    /**
+     * Describe the kinds of special objects contained in this Parcelable's
+     * marshalled representation.
+     *  
+     * @return a bitmask indicating the set of special object types marshalled
+     * by the Parcelable.
+     */
+    public int describeContents();
+    
+    /**
+     * Flatten this object in to a Parcel.
+     * 
+     * @param dest The Parcel in which the object should be written.
+     * @param flags Additional flags about how the object should be written.
+     * May be 0 or {@link #PARCELABLE_WRITE_RETURN_VALUE}.
+     */
+    public void writeToParcel(Parcel dest, int flags);
+    /**
+     * Interface that must be implemented and provided as a public CREATOR
+     * field that generates instances of your Parcelable class from a Parcel.
+     */
+    public interface Creator<T> {
+        /**
+         * Create a new instance of the Parcelable class, instantiating it
+         * from the given Parcel whose data had previously been written by
+         * {@link Parcelable#writeToParcel Parcelable.writeToParcel()}.
+         * 
+         * @param source The Parcel to read the object's data from.
+         * @return Returns a new instance of the Parcelable class.
+         */
+        public T createFromParcel(Parcel source);
+        
+        /**
+         * Create a new array of the Parcelable class.
+         * 
+         * @param size Size of the array.
+         * @return Returns an array of the Parcelable class, with every entry
+         * initialized to null.
+         */
+        public T[] newArray(int size);
+    }
+    /**
+     * Specialization of {@link Creator} that allows you to receive the
+     * ClassLoader the object is being created in.
+     */
+    public interface ClassLoaderCreator<T> extends Creator<T> {
+        /**
+         * Create a new instance of the Parcelable class, instantiating it
+         * from the given Parcel whose data had previously been written by
+         * {@link Parcelable#writeToParcel Parcelable.writeToParcel()} and
+         * using the given ClassLoader.
+         *
+         * @param source The Parcel to read the object's data from.
+         * @param loader The ClassLoader that this object is being created in.
+         * @return Returns a new instance of the Parcelable class.
+         */
+        public T createFromParcel(Parcel source, ClassLoader loader);
+    }
+}
diff --git a/test-suite/handwritten-src/java/com/dropbox/djinni/test/AllTests.java b/test-suite/handwritten-src/java/com/dropbox/djinni/test/AllTests.java
index b9239f958..1c8210679 100644
--- a/test-suite/handwritten-src/java/com/dropbox/djinni/test/AllTests.java
+++ b/test-suite/handwritten-src/java/com/dropbox/djinni/test/AllTests.java
@@ -23,6 +23,7 @@ public static Test suite() {
         mySuite.addTestSuite(DurationTest.class);
         mySuite.addTestSuite(MockRecordTest.class);
         mySuite.addTestSuite(WcharTest.class);
+        mySuite.addTestSuite(AndroidParcelableTest.class);
         return mySuite;
     }
 
diff --git a/test-suite/handwritten-src/java/com/dropbox/djinni/test/AndroidParcelableTest.java b/test-suite/handwritten-src/java/com/dropbox/djinni/test/AndroidParcelableTest.java
new file mode 100644
index 000000000..fa3505b76
--- /dev/null
+++ b/test-suite/handwritten-src/java/com/dropbox/djinni/test/AndroidParcelableTest.java
@@ -0,0 +1,85 @@
+package com.dropbox.djinni.test;
+
+import junit.framework.TestCase;
+import android.os.Parcel;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.HashMap;
+
+public class AndroidParcelableTest extends TestCase {
+
+    public void testAssortedPrimitives() {
+        AssortedPrimitives p1 = new AssortedPrimitives(true, (byte)123, (short)20000, 1000000000, 1234567890123456789L, 1.23f, 1.23d,
+                                                      true, (byte)123, (short)20000, 1000000000, 1234567890123456789L, 1.23f, 1.23d);
+        Parcel parcel = new Parcel();
+        p1.writeToParcel(parcel, 0);
+        parcel.flush();
+        AssortedPrimitives p2 = new AssortedPrimitives(parcel);
+        assertEquals(p1, p2);
+    }
+
+    public void testNativeCollection() {
+        HashSet<String> jSet1 = new HashSet<String>();
+        jSet1.add("String1");
+        jSet1.add("String2");
+        HashSet<String> jSet2 = new HashSet<String>();
+        jSet2.add("StringA");
+        jSet2.add("StringB");
+        ArrayList<HashSet<String>> jList = new ArrayList<HashSet<String>>();
+        jList.add(jSet1);
+        jList.add(jSet2);
+        NestedCollection c1 = new NestedCollection(jList);
+
+        Parcel parcel = new Parcel();
+        c1.writeToParcel(parcel, 0);
+        parcel.flush();
+        NestedCollection c2 = new NestedCollection(parcel);
+
+        assertEquals(c1.getSetList(), c2.getSetList());
+    }
+
+    private void performEnumTest(Color color) {
+        ArrayList<Color> list = new ArrayList<Color>();
+        list.add(null);
+        list.add(Color.RED);
+        list.add(color);
+        list.add(Color.ORANGE);
+
+        HashSet<Color> set = new HashSet<Color>();
+        set.add(color);
+        set.add(Color.BLUE);
+
+        HashMap<Color, Color> map = new HashMap<Color, Color>();
+        map.put(null, color);
+        map.put(Color.ORANGE, Color.RED);
+
+        Parcel parcel = new Parcel();
+        EnumUsageRecord r1 = new EnumUsageRecord(Color.RED, color, list, set, map);
+        r1.writeToParcel(parcel, 0);
+        parcel.flush();
+        EnumUsageRecord r2 = new EnumUsageRecord(parcel);
+
+        assertEquals(r1.getE(), r2.getE());
+        assertEquals(r1.getO(), r2.getO());
+        assertEquals(r1.getL(), r2.getL());
+        assertEquals(r1.getS(), r2.getS());
+        assertEquals(r1.getM(), r2.getM());
+    }
+
+    public void testEnum() {
+        performEnumTest(null);
+        performEnumTest(Color.ORANGE);
+        performEnumTest(Color.VIOLET);
+    }
+
+    public void testExternType() {
+        DateRecord dr = new DateRecord(new java.util.Date());
+
+        Parcel parcel = new Parcel();
+        dr.writeToParcel(parcel, 0);
+        parcel.flush();
+        DateRecord dr2 = new DateRecord(parcel);
+
+        assertEquals(dr, dr2);
+    }
+}
diff --git a/test-suite/run_djinni.sh b/test-suite/run_djinni.sh
index 8f419e97d..022db0be2 100755
--- a/test-suite/run_djinni.sh
+++ b/test-suite/run_djinni.sh
@@ -98,6 +98,7 @@ fi
     --java-nullable-annotation "javax.annotation.CheckForNull" \
     --java-nonnull-annotation "javax.annotation.Nonnull" \
     --java-use-final-for-record false \
+    --java-implement-android-os-parcelable true \
     --ident-java-field mFooBar \
     \
     --cpp-out "$temp_out_relative/cpp" \

From e675e31975a1d2246eb1a25e93017d241c4976b7 Mon Sep 17 00:00:00 2001
From: Sebastian Schuberth <sschuberth@users.noreply.github.com>
Date: Wed, 11 Oct 2017 17:10:10 +0200
Subject: [PATCH 51/56] Upgrade the example to Gradle 4.2 and Android plugin
 2.3.3 (#329)

* Upgrade the example to Gradle 4.2 and Android plugin 2.3.3

Along with the necessary build system adjustments.

* Move the NDK checks to Gradle execution phase

Do not check for the NDK during Gradle configurion phase, otherwise a
simple "gradle tasks" would fail if no NDK is configured. Do the checks
later when the ndkBuild task is actually executed.
---
 example/android/app/build.gradle              |  27 +++---
 example/android/build.gradle                  |   2 +-
 .../android/gradle/wrapper/gradle-wrapper.jar | Bin 49896 -> 54708 bytes
 .../gradle/wrapper/gradle-wrapper.properties  |   3 +-
 example/android/gradlew                       |  78 ++++++++++--------
 example/android/gradlew.bat                   |  14 +---
 6 files changed, 65 insertions(+), 59 deletions(-)

diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
index 638cd1543..906d1cff6 100644
--- a/example/android/app/build.gradle
+++ b/example/android/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    buildToolsVersion "26.0.0"
 
     defaultConfig {
         applicationId "com.dropbox.textsort"
@@ -13,7 +13,7 @@ android {
     }
     buildTypes {
         release {
-            runProguard false
+            minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
@@ -32,17 +32,22 @@ dependencies {
 }
 
 task ndkBuild(type: Exec) {
-    String MainDirectory = System.getProperty("user.dir") + '/app/'
-    File ndkDir = project.getPlugins().getPlugin('android').ndkFolder
-    if (ndkDir == null) {
-        def gradle_project_root = project.rootProject.rootDir
-        throw new GradleException("NDK is not configured. Make sure there is a local.properties " +
-                "file with an ndk.dir entry in the directory ${gradle_project_root}.")
-    }
+    File ndkDir = project.android.ndkDirectory
     def ndkBuildExecutable = new File(ndkDir, 'ndk-build')
-    if (!ndkBuildExecutable.exists()) {
-        throw new GradleException("Could not find ndk-build. The configured NDK directory ${ndkDir} may not be correct.")
+
+    doFirst {
+        if (ndkDir == null) {
+            def gradle_project_root = project.rootProject.rootDir
+            throw new GradleException("NDK is not configured. Make sure there is a local.properties " +
+                    "file with an ndk.dir entry in the directory ${gradle_project_root}.")
+        }
+
+        if (!ndkBuildExecutable.exists()) {
+            throw new GradleException("Could not find ndk-build. The configured NDK directory ${ndkDir} may not be correct.")
+        }
     }
+
+    String MainDirectory = System.getProperty("user.dir") + '/app/'
     environment("NDK_PROJECT_PATH", MainDirectory)
     environment("GYP_CONFIGURATION", "Release")
     commandLine ndkBuildExecutable
diff --git a/example/android/build.gradle b/example/android/build.gradle
index a75fc8180..596601301 100644
--- a/example/android/build.gradle
+++ b/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.+'
+        classpath 'com.android.tools.build:gradle:2.3.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/example/android/gradle/wrapper/gradle-wrapper.jar b/example/android/gradle/wrapper/gradle-wrapper.jar
index 8c0fb64a8698b08ecc4158d828ca593c4928e9dd..736fb7d3f94c051b359fc7ae7212d351bc094bdd 100644
GIT binary patch
delta 48649
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%0Dvt{3Utufn-3g}BHi_9X_*?KrYy
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
KnP~5?Z~q4y7xsVv

delta 44012
zcmZ5{bC732lWkAiwr$(CZQHhf-92sFwr$(CIX!LLZ+72{*!OKk+^Sn~tFr#dxOp<q
zspcw>(-07NMHvuKXdoa+NFX?#VBrLK0+j!mEw%3>$pZlaStbZ7$P!zzEwM2(va&P&
z5>_E0Q9-c-A>2PcJO&2(9}_VDO#E991pHs!zXtm6ad5U^0Qp~Q5~hiu|L-yXwIkt$
z>i?T1nSyU({Le?|?%4qJfA$>z*%D210w(~dc)7Tm*(o|ZIGQ=TTA8{0d-L=Xa&xsb
zvv;*JF>-ZqrZ=%Qa&ak90XQHFA^O224;@+Fsn)Mb+u86{I*%AE7-B<>4hN@`uaK8U
zOaS9>y7Z9vL?t_v{H%+k2m}yJa>A%WB^n=oHL&nF>`rfO^biR2`9mm<nxI&r$^tYg
zF*RilN+aBCi|aE68{Hi;)(7oSoH)T-;kJz=`5%B4u9$~&4u6RhqPKz$Deu4xU+gN0
zjB|7!s0`PJ$z2mTo}GPhrYqtx7;Ekkh)UyLP1MsA-;0Xw-sNwq;2}}gO{h^~Rci<l
zn$Dakk%m8X<4?A3rFI{~v@v+4l>@G$>Iq(n9PDNpG>tUvVOk`P-wSNz4D~S?Z8=BY
zA-)s30u`?>iz5TOU<u!5JG3X!_|n(!;6;q&iGOzxJe#U?KR$XgTPRA&G{g@OucVVi
z88sBCwk@wn_~SrX?dOId>vsMY=*Q9^;Q^mSzdj1QzMbzU3Ela@p%=Msn*>l9K5auW
znudwyLD+dLhY{7>SS{Q2*B>uaC?`J#xtF|pgda>q4+DzL%S=dxLt5a|)Tp>3BsoWh
zutogEqlPkjuTxxNBiP=jXiphp(|gstMP-^@CKjUx2cMyg^ClvQWNe%<edD5<wTnR4
z+lAQ!aqmr>Qwp)C03x3`If|SkK{?GaD#g9~gHY27D#zF;$M;3fpyrNty4O@2>zXiG
zHDnypm^KT$(6tCwRYRXR?Xs)n3^By?1H)>K<E8$;{?lQTXz2F;pVR-BH*QIaQG<a4
z0VyWkV)6oH98uL!`4}>$8SsFA0fYPs4Pb@}jvxk33J*;XG(;W`69j_Fk)p6#Jj3_#
zMn3!r1Kf2rO!CQ;NFy_%Cs51COoh->aoATo7aRvUo1`3i?IguBpl7Y!?05*A?E38H
zynXL6)Pi^d5ris5s6yf_(59sV#ReY?EdXf`-I4&v5bT`S@I}Ku@skqeJ8%(>Ks$js
zv4$%crAz8j%Z5CGEe2gz@J6-De?5XGq=xngSuR#HL_0rXm;iZWo-kqt5Rr+DFdBiy
zL+wiimQ;{T4DH0oRebGSjbY<t$wMZW%vKCpZ!6Axdv=*zm;-VIr52f+Vy(GzDifAK
zg<}Ey#aditTr`B4psA*`Lzc{VGx+LoRF7*HrPr5el#y&~YHrZ4iRuh+GAf-FEq_A2
zS-V88m{_sqq^rcstS|1fG2XL(<>(($O<l*mY+2V8j7ZqBB`sXOem_`|q^*Rti0{l}
zFIv%M*{RF57&JjG*L4C1hNh>5*^iXy=Xd}nxjK;)bj-OewldF#lPZnI!`;+a8u=Gp
z<YjnV(G4eCm-ZRQM21Z@&x8V@6_$#R9s{g1GZWlM7-NJsAqx$-hOic_u_W4LwZ!bm
zUDfT_MKfA6&BEb+K-38-8$9JxH!C-6;JiX^MQuvIT4y?vq>hyo!ZOmN7I_rgeBA*K
z;w&m(8@?XFPk4B4K2`+QYaene6C12nwKtN}4EMV})=4LAkyZVTL~hLzGT7?sHZy0L
zCeg?@cn;SgYub%-3b?7FNYV-uV5toGw21a?&hFfM1#nSGc3rIMieNeeU+aa0p>)8L
z)3&IlLig2~ANkM6u0<L}dhkQg;*NmaoIU$u2()NvA+%iOTh?5teJ!xL1Fyi9s3(>D
zete}{V13wqGBAcCG_a2a%ziMix<fYQ1NqC=Y$}5*RwA%So^B1?miI#Bu?t@(B^{L|
z5N!un(G@)7m}f0_*UUDh8!s_Dn$59WsLY-NA%B*DHq`DI58(FleZBSS8(=`4U}Y~x
z{|7XGJT=?PW3SY62PiUS^aOa?qs^?6S|ZsGwXvEDfkpr|-8mwI#&9J%wzEIh-X&S(
z`sc+P`WyY^+Nox)q~TJKZ|<?=qLXF4Mq3m8Yf@9AHNgz`CgMg;S?{G{lRai<*)$WX
zIrc;aMYj`mQWx)`n}?dA9xlL#^*FZmDav~ap$$ur2V4?$wUW}tQacnh7B4YFZ8-B<
zy+S$2;dDY<e0CwWau&$qSh(dnTexSP(2y6N+{B)yjN&D8WXW)_)!foLRbG7#b~d^?
z;Vh!TcGuRh_WE|;;adDV9V8^&5QSZ2pFbBGQ9L6XbUSUrXx|$0z6X$bp`P1Wt}^am
z^~5Rqv`Ir*UfUitI8}SczBWDPMzSUyeCiFAv!;mrG+mG9)W0*qIJh$*2)4a;uOJ=>
ztKygn07ey5mF-_^af1~@x%G%4>9=!)Eofv+V?vD+v8p(@!jz7U3RWPEtTmpX?~?>2
z8E{w_7wPDGcR|%v6ac(~c9AP?s;RWP;!Yv=hC9HTMHE8HrFCt#0ix$U#fHa1$U`t{
zjgL#VP!<(tKqtHIfhN_N8eO?USIm&EBP?f7(_50ZY72x3ks=X~xz~u8I{2Y(<O3v6
zn?ya0a&Aor3GVg;-^L)tJ`D<dmBr&;#~O^7m3W85?nrGOsQ{x+No?H_c{>ht{{3{-
zC*P?b$6CqbK1%2QFgy5qrUw0)8jbfWw)Svq+O<3zIXl}W>tQIKh&$_n{L&D2jLhpJ
zN_|--o%k5HkR%+8?#Kqt>U)ADy`#T;!+uBaMdr<mgGzl4b{TlR;M{!g@6h268gNDf
z;*movi3-&lf&iU~1Z5McIqkFMJn3upvin52zn2YWPP-^ca7x#QcI+<`E)VDfxf@H7
z0Vo^z=9<3+A{-d7G^6(JDDg#*8iIT?7xyH-il^4cq&&Y@|4jHr?g6K5@8uW2V;2Ia
z?aSzuu1ky{qc4+qap?h%QC$^&vO35oo?2{+PF6Gp?@@q&UM+kOW|EqdGl<}SBm8IN
zFsTddH2jB65W$o339ypJC$RxBiCgwdf{39ONu2U{9J2*<bSHuZu{!7A?LbOu$?Ukr
zf=a?V5m}Q`(HGR~30DEbDuJTG!(a&gB1GnE@>#Sv5ioPpv$FyZUYC0S|8L*`ZeB&f
zKyCPFuJqqexVDObxJ)@~S?gBQ@+rr>fK8VnN=Kfd@h3jukiQvE6U+cU9%clcx?Ds`
z`CWk~;VeO}+B2P8lh(Ugm)FiVbysP@??ZTFu$V(#_pPUG%P>LhIy|KD%QwF6wai+J
zJ}m#s^#Pu$B@33%+7*FD;I!N%Q*v%M5#W|m0?twt&7NL6fB5Qwe)#F5^_#a{h&3#5
z^btYYnTDdT3J%(Hwr>DlOFRSh*%DiF%V0~Sft}H|y*FNpqH1^fj}DDB-c95Uk_B3|
zpMZWfvONA_RxxchZ}XSYd`n)JYZOhPnw>H|+N9zDT#x0|H3tqw*p>LjpW}gxQ0NCm
zLPmjIwy)&^XlztfN@bNoas=wYmY+{n&SPT~h#ZzK93iwH88E<)A(V16mN*r6x)<Hu
z$Z%Tv97w^qCC065v{%q~<{e15l6(xIT`~(vyk@pp!)MF{#sd8Tp`Z~s2^hW6g;})v
z?JwL}Y$JCpzH3-|3K7}IM|tL6k?RYuCR!Q&97LIuLz?us5gyH)!j;i?NM{U6=&4;%
zxfD0e$f`tm)=5B9Eoee5jNl^gcqQT=@L0rvVlPBIwiYbH$KUe<YDD3~zilCf>?4Fo
z@l9dap0EhDft__A6OV=Pp@q~(2(|G4AX($j0a1|?dIS?PBQ(;1cF=$)c*U2MZ{++^
zmKI!17yp6zPbUNrl~(`#2ad7+VP?i8BULuQg$s%r>W^KP>C)9bb#h{)Vx-`EbO4&I
zw3;+cN-wD*ZBVD2LsEz-hb?<E8d~0~_}3t8?9iIOb1A$Dw7YokheSnR7nGeo;mqT<
z&)h}s1J6nBM&Hld0|QXlT~nxgbh)R92%b1=_Goz|2iq&zLo_&=$vq>z2MRU0nrsEY
zQ)Y-f8q`U>mPu+>%31$+>=_}wr6&%{;-xXk?m&sS?r2wHHw6O^L&=Q|BO{HJ?htOU
zYOaGQuoPNpBn>n$NU2%pZ|L(Oyd`K~k>_m1db8=~VNrTMnrxR*+sN!vCLa6ZQn<0?
z6XK;4@|o(OYo;wJQRG;rG~@)Zv2jyCFiHfSnO;J!vn{@^im3t)`iQ*hz;m!8O$qdK
z=vXc0T1>c=g!puFxI1br*P5)@XbkLCP$`-Vo>4Jc@T99mjqEI4czG#f{a?4Y(?7Sy
zx~95It&~-L)TyTQxvXZI5s)*oG(riP?AxBooENh_S$GMEQQdne6PU0R2{JH%DY_SC
zE+4UBy~&Gd4Ae_XC&qK=F-JSAF0Q8B+UU&a`)D*)bhgy=dRk#JVC_=S`W&)DI6^aW
ztfAu?^%~hy=)!VV2AWglzfMXYlXZCI;8mF{l3{R6EJj%NvjuSnWf%_`e%4GpC&OaD
zYIhVYEA*`@O#~pnT4Q|VaW+T+H_A?G6417pcrCZe^Y_8(iTHGQ?9AM?QhQrAkI6x+
zG5vFYY1d?<kd0)_)G1udt>xJ_zKzBja#}-*>o=8KnIyEf#ND?3VogEe!8azhb33=w
zgJ>((vvt7_mFzk?ScFB2;mN!Tj=}ksAClk^9F;~YxcWky-(m5uIe{7g%3qbo=qBEv
z4XR$n$J$=y$6j8AM(pqe4k^HL=Dy>xB+Y(k=4BfGI5I`$%pN!=j8t4gb2*ycL%Z9B
zOB*yT-;Sxct8*tEXf9ttX>iC$pjCytHVgN?D(96FxLyHA(V^6;7mHiOKuU9-B*yj-
z5+q>&rcibX39Pr}EqHwaxrxd%V>tV`QBWGf+LhwyAz71{&i3dQhy;Ea-V?Ugm4BIg
zixYAXqg)S~x=V0lp9(yhS>Fqa4~B<Zvg;2E#o=*^nxWI~#z59N945IxP-1hAaBbn^
zR;veBrSYAlplA-rdqQ!@<i<Y{z7@XK9w>j!;`Be+ih_;VqzfbgL@tl&@b2s2BeNBX
zAv_};)!N^AGzvbiBM=h7dH>?$60g8OLl*tE0pVT{qr;|oIS`5O7Fbo}Xo`GqnC12D
z>)&f>1Q);xykje8dBn{=y`Crv{MlrF^v~N4_KizjU~d5TGl$D6@9D6T!Phx6*1?zK
zt6Kjqw;BUsRd784G&~S#qdtBJ_lB*P?9<Cn=!Me)6vp!;Z1CrvAcO;X-S<WU75mf1
z9=@z4XH4e!SUp0P?JHW+A`uqU<6x$K_)oQk_>j1Q^~vX>FnZX6O-?09$dH4rSd*?z
zBCpnkr(2oM5a~9dhKYjaL+rKP7RZIG@I}2k`w^<AaGf{+j>#a`WZU8d*ZXGMMXS&)
z*D5kW+z4+*%d!Z3-E@&V%`uK15H-=qi~>FONT(!^$oX~r-sdJziJT$^V~{*TV@}<J
zY~g#S9FxQ$w>036K_ea0H#I`t(ttWN7|nU_oUSDOgs^s=<EzjgkpKJ{(#YFEfnh@c
z0XZcx$uR<aa5T{POk}Xlc%^Vhv@W@Y8j{3QZL6$MDCP0$>B!U@Y}a(oLC<4rB6urU
zk7g6s6)E+A&C1N+Kq)`q>6?|qtw27<3Ba~_SW->hWVaOZcG+Kce0Dodb}|4zC%ZgA
zv-<|fv4!mr77f%wLv9h`bB-#9rL@8)X1^(Hh;socgazX?<Z;!Mw%2%2#P+xMa`vlY
zwvwFT3No*-0z6SCg|F4&b5fr8d2xqePz;A;x!u!6I>f#GUl?S#V>H{oQp0ItzGRVg
z(x)S9g|FN=fZtgTjdL1akJ_kvhu>RDz7&x+(y#cvbDZ`PcfTq9$9Wv0+DZ2NgBuEy
znKJ=qS(}X}Hlg%_vuB;wu_>ri%5=XZ=x3r$$s1)Jnl>^@?karUt=#R&IlQC<Z4W!0
zMWoVDd(v~sAiVFo1A0tC?KdLr87Rpl(CQt$&Cl;H*LCgIdJ8L1rO&%dGLOVF=y*9Y
z6MD;2RGpE$WS7`Jf&x}W_ksfE)0GIDzEA*}wesA@W-Hk$sWQ}K7Pl~w6?fYPup3p_
z1=ksj)5e=HDZN(IHa3+Rx$2iINZe`}v~tj{gbggL5?cnUS2@14WI?`q&)(cuY&ECp
z&|A4TK6B+1dt#g}t&68(g85nf0l<Y*ktOofvZl>~_B}>fR+z4^OIZ=00p{PQk*xr7
zL+ZQhOTPdYa8rHP>BV;A8tC}&A>V^+4lhPR#r^Ldvz5l=!pw!pN;4SFzgSx5ktWv9
z;@o?$>6b%OIP5UZ$LHlhfw5lY12*n{VtNl$k(&09lQk8oF*w%lJL+yzX57VHpirXW
z@g$p{e|(ysUdP>5<mcx8xO1_wa614}t+{tw$xm#Oz2ah&q!Y6Oa(6b$4FV8PlG$gm
zV>=4(i6i{NqQSkwqK$Opo$%u#UK65e{b`R>Jf%m8bK~!zWEb`9A8C&$JoQGI)lbzq
ziZI=pm4(>MK9lYIL-SBbtg!m_HyHh?jx>1R+4M1PZy_+aK3-$O_a@UvQIY|jD(dg3
zCAB@V#@270oyJkGInjGZ2(B*=87{=%lt&7$P0@1QL`Mv-RRQoGG8uy<5-rB^Z7ak@
z{z-75cjzRwkerzLpuhB<R{o{XEsdME^*+;%(jo2k>vw9%_PR@JxIEWV7V&->5lGnE
zBYURXL#feyEF>?Sx;`#3$#($uT_UH~k+|zpkth55{0!pjsaFUJOUxfqyGG{FL(-mh
z^AWr+teti#!^0b~hJdA;heqU1QG+H{1a`F!B@IWs2*C&r9EGmNSVzhpLc@JOJx2or
z-3D8e)xP*1IWW%tg&>c>a&s@tuZS=s(t6e#+6N&dY?$6{$r*Sl`yxQJE{iO3c0e3>
z_T#x|Q|RxDVUVA)bgvMKlU@#u(`XBK3)eMk%wy^!v|+`<I2q$%EgDMp4j78s*n24w
zFad4Sga>taGUq_UBq4^d_sQ)_tL;B)H8O@cepHCBL7n_=F?!&J6#6fkv-j?J{MqAR
zV`yiHy`9SzcqOK6Z(9KJ*U4F4JIz+@XUS}KxWs^-2AFuT?0kjVqDQZ_NO@n-xS&Sq
zCiG%U{$)mjd;v9eYzeCvXu1}Hq79N|nB}k}HAsi{Qi3w|Li}(N(O=@0q(0)9BbZN@
zghxE>lBu>d4Zls#>6({&E=e@=<C+lVjS=KKa^ZbednxdlXu$yqWCpo&Kgy&D?>ZBz
zU^QyN_Y>dLgGm#Cs%QxX^XS83{-`y^bLhn*)SH&%8uc8lahbD-Y-pEtg?^OXc0Pt-
zcD7+PJm+-|k+ui>#*Hl7SQUjPP43zBqUCZ6O79JMn0!G(+@jbQp5uI*?GT;r%{uL(
zHpOVXVYtVIA?|>k{v%fFk{<4!MSL>r(Q*GEO30+Vp7AA0;nc^@hlzH11>t1^1?0h1
zXm~XzPiA-0Pxe^))>3l}5s)U2g^rEn&Zgu>7y8QLwyx0g_9#I|iRiizT9b5VrIy=|
z={TRT=eyYf%{4vVc#6eNiVp~C&eo8lD5Amp0_wx7J7|Es?ccWfE=(RNE^fEICtqN`
zM;lYS@XZIyqNSE3Pj5*;531R)7<Q?}PWk}tl_iP!Uq%H@Z>#QrscS26n^TCp;;7z`
zK4{-!g#<R38WJ?0`k<wu9S=l#yHf2g8p&m^h>o%e#n{F_Z^TY~*Q0ShJ~l|)jw3OI
zi6d&hizxsOztGnP*+z2#y<rK1-n<l-_dzD;^}Y=N?V~H$g!k}}E3=~gP_kOa{f0d4
z7^E8?jb2N+p61{ZDoM16qHfK&s~;!7MM$sH=WE?Ozd31ABvR1#Ryg^d=#)7%`~K{v
z)^)=`m!!tsJbBs3n(rm-1kZ>zz*FZWZreeaTR~7-FTXsE3PNEqrDxI6h=r{f3-uGW
z{QBGGwZ4kmyFr<LPUw~3KO^XV8zsX%JP=S0ArKJZzj`}*k}MlMKoiOr^~4RJ;4^K_
z2I)#f_gAwXw3E!9ma&yS8d+*Qd<f<j?_%um{!Y%*C9ULeEXo*EZ(=j6UC<JH#f7Td
z1^WO~qTR^4oHmEt7OUMNiPc53)8f%u=}Qj#<Bz$zk7N{+xIphs){W=MPtS|r#|lA@
zZ%R1(!&ne%i9o_%fX<??PNo2z*n<W0`vc+10uHp_n8@eMS`cb}Uwlhn^4~5Y@1$Og
z;+rJ{urr}|8>?^ef<8E9u&*53FP{*9Me!fOpYnMDu+u!W_cTJb#XfK=vahV^AD@74
zk@p|f)4rhQ)Llqrwy!qUACegavnzmD<PXezoax`p!D2=TKs#wazHB{*WY#)GjKDZF
zgmg#pZ|F3zilkl0`pDe0iBV@PI)r=ZTE%wd1L_TZykb3Fl;WIj<%3PaD<mj)XT1QC
z*L}4`T8-CK!lzs7kTuYXI1LC-yMQ$?PF&Esr;_eKhY)pLf_?Ba4(K+yMONx<)M6z2
z)Y6h@oesH7fO`l}kZZbscqotAk$FfPWjCATn5jc>+eF~ie3l2O7sXBDoSsl`OxGWm
zwrF>%?l7w5wZ6KK+x-F+Kaip@c=$(LepW}r*Ja6<f-l*W-xkeH+7hxdvhLBFsR`-Z
zGtJd&vc<M^Mg$ASR($<!EMSFyJ4C0K3uSE}<ZK#E0E>%-Og%^0C1gpRD@^lgT4_g8
zGyFR_(r0%K>Gn)^l<tP400j7&#j;V8vt%drJ&WPT>pLgD6zoOh&0@t<O7Vi9P6)x-
zzA;J6XZ_OM(Khs#(MC2rqx<Jfr5vlb{Dk?ir8}k_?qVaQON&^W29iv(aS!uFn>==9
z*{UdK0Q%IZF(MPE{aI$s3l>$@S!<y&zMD_G$zZyyPNrRY#Ex9;6l{|SDuz$oNgWGY
zkDc;7CG>MDQ)=qXka~2*Hd)^MRqPN1M12V{Ira1Ll?rBP4W=&dOfftu@;=g%Aup!k
z7F>)@Uoa#lHL*&bk(t><MJ0D5E=%G)911W9z*{-C1hw~fg|%|qLj)eH+<I$ML;SSz
zI0KWFU9Z;r<8r$hsUBL7(om2!%{Gc=oExk$!)!He@Sv;nFZcs7pBGf;t*EBJ^eSe`
zFbt`!=Hw)g!G+x_Ep<L!Pv3^e-SpgkU<Ae#Ow8n1>?Eied7XD<6IyZu(e}<{`xk{X
zz>$^CBi2GqdxCVt%&(x4<yc4=+GVp7pG6du&JqcPbM0lgnPfb+rCS*}{0qNQv^CqU
zjr|y+NkIy((B}A)YNV-T!W$`^e<?D>!F>sisn}d%7$gWpBj-krTbPS6;jdJ6ZmWxh
zPdXutrjHrUQ(6}R?-@^B8N#0mP9tp*fMKvM$Pso$kvQ-flC}?aR;-W^3tRQX#9}%A
z64_u4aq6HrS&I82`kxUDoc@7VD@uzqAnlbq<BAOwG~-^^!|q?lYiMHby)3@ogRP}a
z-;TC1MR<?}{#ps?K`e<@IJB;G^o;t1&V&y7nmn{UN_zJx#IA5q_nW+vUlFdlfVscu
z$DhL4tMtdYf#>&5EL?o?<41eBOH>a29!?dy-DJ?&Ih2T-LYaW+UqsLNHv_t|mpIF~
zTWcQf?#yuLb;udIeoJRXrj;t0GmEwp4V$#p&)sBIg&jP7?ez1T&L-L%(<Cs>t<W{C
zSp{yi9-djayM9a0QxIps6;~W|fG}Kqwx!kfYhbyVOPe%1YQG@<ibaf5uoVA{T$MAD
zN2L^4?xMx8vmj~mJt%h$x2AZJ9qJLPf<-@6m3E0^{cDwWgLgmby^#;KKYH8M>IMc;
z-ax;Dm%CK`IS_;|eQQwhmA%q)#qOtwt_-=2aGdzEiqo%qrV8+8>r@Zq0B{v@2jvxI
zgHTKGNBV{~;>6Wtr42KSV|FUWt$f=8DZ^p-a9ie{z!Nmp3RXw%w%pxZT@IaiV)SD_
z{p(n=RlWfdqPJaY{NqKk6ty&>p&rn*(~h4xQu+5p{L!-MAogu$R!c$pDRJ{n)C9*q
zs<Gpzm;@SU7$epLOe6_RfbQ^jeA2#)m3UyZ9YgU+Tmd|egcClVHV2J2&^%P?GS%KR
zwvaJZ{1c^+B5FUaNZG5y2d&8irJYc97&Dga>6Mw=U@Nx}wcLHF6oucvlz*f`=E{8u
z_F`alyIl{74M@j2Y^cXL>7B`onP6;F>1wFYkEKj+LsdnDdA)uH0j-0`6^&$DtG#Y1
zrq<VNOAX~9&C77ABVX>Mr8ZPRBd}A)nurPFq_SZ#5x315@OeWvBK7g3_#e&qv-{__
zK!)Y%70;m1m6KGhX!2FQsdE*)Bjq-eTy4*lzPWo<_aLA7lQ$@+%cwP+^|8glUjC8?
zFIAtvgl3062f(rz090|*0>syE@rt@V>vRy%=jM9;uqO-=68yCA!joPp`YNwVDFjD6
zX#Tp#6t7Y#0)qr%)dm83`_PSyBu=53UB`cKR$zMFaWhZEbhZ9u&T}#newDVpISU@>
zyRL{+va!?oa|b(+QY=+udA)WQoroS2OXXZ>s;}!Vz#AJp1I(CiV_~!l;D*cn>0G8R
z=)Lt^1jAgpa$6nmns~eiga$1Oj8BdYB(?N4N05GrR|@1dBf)$_Q7q<+{Ym7Ryek>b
zjMQVaiOhD>@25KIzU~LBgGP`g(}9SLJY6f(O;4Sy5@&VOhnADsr7{z*bRgRJU5*|@
zf7nMzS&P%Q3wT9>pwbYm*QYZghus&<A5h)VRGmwS5xZWKr|cg|Ez<k$*j_3$o+vgY
znyF8)fVr4(om@S7(^x`coY0f|3Zn8-Y(`^wORU&#k`S)*p*0&_Y`s3mte*)vS5phd
z0+pTAfK}3t9Rho~+U%C3?B-cR>x+m=sC1Ue@W`142h`)^x#Bzc*h2@&<OU!|ZD6Ql
z@f%u$=I8q!Z8ff5gK4xU5L*f5CWlEh33wgTL898Z%=3mt|0Yg3O6V)2L;zcn$m3>o
z%4x@P#BZX)kQ3W;@qdX3-`q`ih#Cx2m0JJ<I%rPCW~S>AC>=}S0vc`%<~Ot8#}E;~
z$%DQ;1Mn+;-F<B5u?TYk=)DZw{@@htUwQKFt6~(9VN|74t=3RGLx&>YN|JH!lDI$Q
zG{H7R1vym6HRl$pN{H%1C&;4=vqsb*bIYYTmyNY6*Zz@@``~&%UN=!jzWRENOp4<@
zU1OU|Smad*lr*yf^D~PL(kQR)IEH@9)TxX225b;n7wAQRh_(eCcvqHs*W2Z{G$$yh
z!*vypm$D|XAS10~MIe%4=9RddhCEqN3i>~8X`5SZC_cax8!Pf}v&&3%bz5q<zA<W{
z-_NLs6?6T8@zOadcTTO;FFK!NNGyZ0gGo`LF|{sITRs?XS}Vy*vA~gAU^Trp`r_@u
z0H971y@5RXkL$sm2?!#H)TzCG5Q_7A4>Qp&h1H`t6h%+;N<y1Qgl6gd9p~A8MqXjm
zE9~^r#;T}(>J@fFQn)ycLd`5vt22H=_q<!mI9`cL<6~IJM4q(#<HV|cEa``MMVaje
z$<8l)<(lkGb!fSA={#r6b~!#Xd#WUu4*;cjSu%O#JmnL*FFu@}PD-arc+npP>5J1B
z+T&BOA#rK8hlGbTD6BbMMQGF8Ie5CfU3s<cR#0iL8Eq?>BDkMh43#Nv4gF+Ts3CKG
zL?W2e{gAhje{F#uKykd1f&@fjpXr~I#@G+N!V{{ZuE+7ks0tDMUiZiB4e^im2jHGu
zSfc0^=LLAT37*B7kk($!Qg7xcu>x5a>PxBfdHj`{{wxNG&Km@DJL`qrwe^>vJ~#j$
zJ*AENc;!}-(51k+G&_Zdomi<1|3I^e^QOoZAvu^mSPrjo%g`0MEN>ped0AA{Okv#5
zD1WFlA9$Uom&vbNyBw!#ZASWS0p@2GpS3obL_YpnS(xU!i<y4dxh%6ubaj0`G($kx
z-zX1z`;h1bu2rxXtL`2M6QN?}l<>sO>VD`;W|UkXU}>K@UyamH<2@s^^~h)4d*0|w
z<JhEl6!gK4*qmZz7T}iwa^IPqoD;1Vuo=Iw(rLuiAiuClgK8wf^cYnT0Pa?dPg<BC
zM8l^?;VF4y$-KW$(}kjWWe^rm82xj1B^V6HrW{Ar+K;xvQ*MZbha04*hu+*lhg2Bf
zM8;wB3iH6nV46ey!N*|(w!ZS;t=ijRoP9(6;pzR+eez24#<pQ*Pq85O9L#sV$^BNH
ze9-)I{C|-w+}gxj4GOW~1KKj$c|+@vBl0G{7#8~<9&5F{UkqiA_i5o$ct!YcTyjqu
zwTc!G?kM{oFqy}X0(O&P!D;lMv39BNhZwk|T15S+CvM+pi%|`)ZJmM&@OEzFEp9Sb
zs}z>r%^`GZY+8YIUH)tw)ZFol@z1%$d6FvDKMBf*!!bhs`hcFV0|39R2>OCJ?!ltA
z9s0mbr#UaCB0NBUL4Q#X(@WU;!t?NPHYM;Yq~Rran9sDJ(0i{Vy}>Y+qn!F8a7uyd
zW|t*EHm>f_*TPHRW2gKvGjt432!rp^6mX8P7E4lp<Al~TKf^bC#Cbsd)gLDYz54g`
z6}P8sY7h5*aycR%0Em@`URRizXU2Fg6P~PMS>vady-Aq}V1WkH?}3ex2ZA<6fZ>)T
z0ClC$?*lr~9oM!YU=Br%A<S<CmWTWW`{W3q0dnNocBQy<0Z!!tiAt{z4Eg@GzE9K{
zB+3sXtzmf5VGCYa=EKMWvz068m05(5)9k}!GZyuzOkSf83Rnkor<tE6`SKwgDtd(8
zznMu5$FDxZ%95&9Fq9`;R6HnQ01wqsoM|41zbPy4ZkbU5Ss630{Q@$?lt9dzTv6wE
z=!<?vqx4BpU#csh_Jb<)=Yj!6oQYfycw*opW;Yy*lK*QU(I?;c3uy}JrjBQVmF6%K
z=!@Ks?DwJnB_P4NhP5rf`rQR=<pxnVNn;-Ey#`h!q&Kr6Lb#8v1e_EQ=FcJ02+~t6
zwegHbQQnE88^rm^_TDpnP%HcRo>Qs)*^HC(UCrsQfjj@kZLNjG?S=I7eERvzkK|}j
z_#;`DUi!4=iX?r4<D26QAqr|@#L7TIa{4===_fAGmO{#uOmccpLfM>x|MuqRe+h^r
zwy}o?|1oeWQ2$K>%l*Ow=xnJY@(nhcsgea~AtwoD1C5wBEF~|3Q_2Z%z)3O6;4O-+
zV~`NbsHQ@>%A_@a!TDXu7-V4#Y4n!fd|~*V_gV62G!EdroriTzPv>x1{M}9X`8;V$
z1KRD6V+L-gIKnO^?Pf627RNC+oi>&q<wbw3ryTm-9!*C3aL`KtKxqF{KtO|xj0|qd
zYNR%p8SQ2(`Pv^x>hTbckmc)nITpsuKRAZWe<yN0MTeykpBRt6pEVCVlZ(0!C9w(?
zu40}EWf^G$t}|=Vmfline?|&5Jd<2mSCu;YB358|W6AX^q20>N7)wU(g7$e?`Q<qs
zt;-_QeYSKau@VakpwnV&9s_gx_f=WY!IP!8>bi<akBzw@*v?Aad^^R`+*W*Pqy4u;
z3o~j#OKbzs1{{}#In>n1<Pb2n-c^t_(tEPi`elFa;)*W4eWjK7V7||wp}VaenSSYE
zSX1yO5|kxX)K$2rWvzknbF38CB`r(+dh4vR`}9hJnS|LP0RBaK!lufdhlz25Pl2F#
zJ+~%9TppNVq}9Cm$a+`uigAi)39oiih0VoD$EC7JTb+Sxy?WtdnlOZsAz!E{B%AR;
zJ#vP#Ea(Xu;}{<`*imnQr=4zpk*fkFKiLM=mW0GeA}~}BN&)qBoSN|!F^I}YVW6xY
z^^c%OVOFgYV7W$Hm4P{SmfI&*ObGuYIJYd<Qq4?ZKm`}lk{@MnZ?i;Nl2i2-i=Tmr
zrZkYgyVlML)qwI9*?`J3v@RkI$G;ubpOgDGeOw2*SLv3nx5zjTOmhOKHPx&P426-;
z?C+E7IOA2kyjh#p_^uIAnsE6amS#r}vSKVUC+#9zfQ^pVHPP~3+C?0-XY37EGXd!1
z&s>?9!yi~pEaE!5+8V`ztf7Sa3w{B8t%|oov+hx5`P3`54*Hc&x}nQqqgnHf$uPBh
zMZZC>lxhEb?dg1P32DB3)U#}rZlvTDH@7ikYQ8R*itZ7-lxI6MBRwjJJd<bDoRd8)
zf3bFPK+fvO%N|Cp9X}gr)Uq_)fqV{27Mlfeoi%RS+>+ALYP8=2)Xu@yvC;O2K2j-V
z<Z>kFqiRb6H))RO{L>%rUC5z?OnqXcGqV(q{mI8X_Orj%SUD4w?0lg2>-r2WapC)|
zRtZXI1KeKKBDbv0dM6j{@_SoAuX7-QZLHW1fO&fHCc!3;eaJx=ZPxrS@jQ}CQHGdE
zn*jc9c@{qT;E70r@2pGGOb+nS*!g;2U<Kt*JmW<c-GDYAgF{T^U*9CGu@PhOzm0#@
zfsF(x_lGb!%;U66uF6R%&}5>3HAlY%@duIy7F)zW*WfVVHsi{-q5P!|xhVAG0FRh~
z1T>_R;a`A;3}w3%pc>t)fr7w4!Zi{QkMr{mGuE`vA&EwGNxC4|FZLlbyjhRZbxWy}
zh%MG$(=Em%ijq!j{R!y>9ofcH5+#_4qOg>K2j7gFSL!b*DM(AoRcg??e8*Y~-5k-$
zw*Hj{G62jC2x2(>dg`G3yuUG^XitRIHK9Y|7hgl_{Nbz-ga`pkfI`YKntYSfjzcDr
zcS{@$g}la0xH}|XF~LP~tqrl=C94Vh2HNTOX-4MiUP`9rj@Sq5I~wlz_+Pa_bDga_
zp?@-i7IYvW$|NBzyd-X2M1Ykct{Ij;`GzaUmX$Pz6oay+w9KL$`$1`Q$vp1-vaV^;
zC~AwWd)Y+t%q%m{7Kj*X3pHgp8rm&zoVQLgxgaQN3+3*MU(}1=ehlx;w5f-CSIzO5
z{{!C5Tld(@)sX_<D`S95vLIp`sFMw39aIr?8`#|@qqQR=ELdGq4q)rIryryP<YA1_
zb|BAC`G}qo?eGBMF6yW;ZZ+9)mYHW1tV7Cy-Jo9^><i??mWXGV?;aJ;P2xrY;x66Z
z%lPds;x5JB%hYWkB0uFG!h|DdxR1zd{pn};?JkBmL~OVk3v*V=#upJUA-VwOaP~Ye
zC56YtWswjs>ZlhdCSY*r-j6gmF68zO5g+aVg~*pVSYhIMfe;_Yq$%D{yEiZ4;8d75
zb}lk`4(#rY(fbxm>3)Q<H<%&H$^h!9>Qx)lV2nffwKNEArzaxeV0U&QVRs-fr)bEJ
zCoB{q%sW(K6ixKq-NvUmwmCK9QgS^tA!EDTP$?~AVncg$7f@UB&>56M2F%??>g|i1
zdUcAonSqIgdrc)kWrnlK+}OgbvmwQ4lcBZK2*+1uSYczZ%f5&w65_Y1sZrdyEx9z#
zowmrxV@jugxl#>_hy73R+^vUr+}=r+wZcMWH%O!#&&tvjEd_S*F8i+*xVWfn)nigu
zk}!Ub>C&eM50Kkkv>lp`ukcT^TFBq=Uc6?fjV*047-&sZrlGFlO~}pl^JZ2sQbjst
zR&lj;%1c;)xL-o)WFx*rW@V`;X|qWsvT;x`e5h8c&tCNc4x4n;uAdmkd^QJ5Q*Ca+
zJv;KO*9#Ojis?Pd^^@YeC_t$%gB5p}nc(VVwK>z80W5aK;Ho$hGYE^*i40KDUFd>g
z?ObExU8fixPj{!#j&^w>(__ZN9O^{(mDo^86mwaZWW<tP*yl(mW!999vVzy92FTg8
z*64th;gZtl?Ue>?sw!#fZ7wT|^orW?Q?Y`z#U~h*oNc-ap?G<-Oe=Z#m>}+%FH^W}
z#X$`01LUR9sV(ii$f<Ca@x~)|)aW$ubY4<OpQH&S%V=`lGE3z?nr-{Y@vTzxN#Vg+
zZ4$$mHRgp#U^R+^N>Qj(=NXlRzMZU_3#q0d(`>7_<nl0(`5BO-U$p4Pu-j@Adn(r~
zo)IjG&HTW6lTwlwJ*?gyeN}2Uj{I>lK1$7A05~1EXOZZkDDs6}Vq1#ptXISa1Lr>m
z`pXw{GGKIOkJrrCbX!q&YGTNH1?SQcv=)0QL?wqlul!L}r?-y$COAvp1=wiKUhHB~
zgGF7Ivdvz0wOpCZ9n<OVs(WL;4i<$NW^nS7GBAe_)c)ZF5rYIx%ks>}YM1?L)Z&bl
z0Arp}RbHGUYTG|*nCmr%6t7e%CB9;-700e<0z)X&`k@--uN~zy1(=JMRA_yOkp`0m
z-Z=?!h~_(HUn#hsoqzg|Ut@4T)#1-+TxErq&HgS?L4cppF7%)wHceYWG`J5Ocu>na
z9lj91BD@ww3QSzit<UTxP+JvS-Tm$N1rU3}sfejdrln9=TkJ}f70(BG(eO=oD&Jvz
zrtI_<!9um+Cv)=MJ2<S>WFIXk|JZA2n|R+ai#q1#%$L97<fcOuH7`+nJ_f%HZf%-p
zoD^0F!^E9qRT8T;S-86BG<R&T-}B8a{w+_HO36j7v9phhl|AF)>s*s8D?;&J1}v7%
z@TsP=%*gt<Qr56sF8I!}$a&*1WIVTEO{`J;e(lPCK|tex`JVa=IkkC3o&{9CVtnHb
z15`gXsBHw?A?}hRf0z&>3#rwlTY~67%$LuwS;ulC^^0yiR{l16D^JTU1Vm=A#NkC<
zr~;5lpHU|LdReO(wk3Y|?y$uD04g&aJZ(Q#=$PppD>+YSJ(8CjWu&2BD%BjFLiEr3
zShf%Awq<c>o*XI-vT6F*)0&g{QG+XcFP&2k&B|;l$}9ObBHDF>liwPeukF*Dd7`VQ
zFlXN|t|KH;ALxuJdM(9EX<Zx+sMKYcBK{=PqjgALbMcolw{G3QIFuhw0ooe`a~)YI
zq`<+8N7*9~Ns74`_`vRxI>~xcg$9VWvg7VcEl{^jcD3PBa&w?(pJlEx7psH)?eynJ
zpOBlR^<QKr6W6>7B;$^0I!X>drY7Q{AwVfJ*vV{Z;(nZsFq24IbH=KZjwn6^dB|l`
zt~;a|@HSJLa)4?pUTbMw00b7dbw|SA1GOX2k0t?CLba8MC*I?2`m;|dy-#Pl2p_9*
zx)i<_E8*j2Q(mIiIww;!Yj5}De?5@g_#x)V#va<S`+=Q*(VXN*&lOnnqF3aK8N#z2
zHEGUsN9`L)T+7G8jDrk2vW=C{W3WnuO^d=*0il3xfCs^=@v{G(2jpn-hi%?Ta^51M
z$7+lrzlh|F6iSFXR2Oz~tGd{h#lv@c#VXisyU3Z>YLBywt5sD~NWghqN6Zw)7GkJ8
zQc2X4uDXLJXkH*Kj~z<P&r26w_rulLy%aII6U13GxPnh*TbXwFn%5hn(^xoGcCG!n
zu5o^rcX^TbcqyFS1z=t8T6^5cS~$!QvD!g$=H?xH?^5U1K~5LGCHPp~X?q<zy82xY
zQ{m1@0L^Gd!^{W3VC_daVy`BdgADAA@5r5wkOh0O)Q*(=xhW2wazts}w|C{?%uxWf
zA7nmV7t<OBPD*!1>>3-8cQQ|;RGXDmtp1zrz#NO*jr#V-769jDbw;9jfj<OIA#^SB
z1#7%*)DFyI$+N8;tu?&h4%Xrj5@{zp#&58_>Z!iW7*i*dsV?h+w$Cx-(v<%pZGnL3
zN|NvjyBTLZfy<qqeW#Vp7v%!KROvFMax7hmYfc`^O|7O8T(($8siXKv>Y~kwK<Veg
z8RzBfPwV`P4KTewI4*{3oba@JZfwy~VA`^vV|U2-TZYn@MND^d551#$RL)sA1rtH^
zFapaK>!`B84m<}TzY5wUtiFEFsmw=~*9NW3(g2P256qb(`UMoM92!kq7|+)u?MP-5
z<~lEp9fHOh%diHI8`l1tc4@HKJ0C4DRByk3|4=?O13+x{3{8x6@E-kTzCBP=@>PAN
zz#<#SV0Ta2r*7Zjf+!f`501sG`a(H3YhrzZlN~Ln5!nD}L5-Q|1ts@jIQ#vUX#Yrm
zImlC`@Kvqzy@Iwl$jpum)r0xfQCu8DT}<{=T`=>XRW%1Mk<B9*k8u~Z0XNUyvAu)4
zHAn#01K^4OZzk{qO#6*-V(G%7EU{hfvmFlb-71>whsBOgsviS+Du*$YzA~jCRoGi&
z)PBgYhLbr1v0VyFSHkkj9~dTP6IVZcpa_8<dQW&;S7{W;QEfE#6lV<hS87^KMa<!;
z97PSTuMsp-Oqqa^0x`}0E0DXQ@(2R^qjh)AQG47=dT5U!FO(q{mYZme2E3gh@9oL>
zUG;H}NNP&n6&1=R4QFyIWTKw{ldl;thtO`Ff(ffgKQ?_8Tm;UQ!yRZd`rT`nhKl@#
ziKX&+?gGHm(tlFYJ|2etWdC3%{6E-9{oj<dAu%T4AAO2*jOG8Mc{g#=bTlq+YoQfP
zntD7;Tphm<P>*+rWilo&XSo#R+5na)pDmB2H!rm1+UB~LdcC*<R8xH@d>WKW-}$oZ
zdL#Go?a@d(g>k!dlJNcZwfExx@N+XDasBV&gZo0MF@${8>F|Tu1Mo(-;z-o3F_(8l
z<kTHNnaf)XZcV@T5WQP?fCjC5GEQUaX{~(zRvWBsa^gajb^nRl`VJhdt->-f+hG6)
zty@ZrMV`j9DN?;-J-TgtLC5TYoy)H)$b+(dC(ff1@=%X@H|Ax0!N=@@f1`UZ4&l{F
zd<3suWtQrZ9*tl)O!W^_QDFc=RXa`-G=CvrA0KVYsV=gqeJ(C;l7-;m=m?shC@e2I
z>t$*Ng0$%4>owW*(MkaSUzS;MZ?)mO8kc4I!zI99cL?JtIe_u?n#lWUCeTY9Gh9<Q
z`EA3t{Cxr4TVRY?_VrqN*>^nFX7+;@n3}umw{SP`TcQ>_<{9=GAB*4ukFW8kU$G7#
zXn4#0)s8Q9epWG_Zb!DL(gn7vv51F-#mBhF<L!7qE_hQcsMnS;yXn1|JD<e$`x9f~
z1zw@Oc*O_#EVxG_pL&^zX#ax!h_~LDF@ZhQrJ^X*O;I3|l@y+(l!C&QhUjEOERQc|
z9NHF(wWeY`xnwL!{7-O+1#>7`$7BWo-`PUMn^<nU7u6?lrC=zk#ku%m74?nH+ZLu=
zZ1$^@Oz}pUbb7p3baCI_Z<M*iiXysN7fF$Jso4j)*ls*`a#P&8SX2=7`Yt<1QvC1Q
zgt?fK<c$<bYLi^<?w^wFf)G_?y_<>jga#B=-mj#EnrbF>BKJJA(!$uFEM7Q(VyKnm
zT)c(cv@F4i)^A37sxTxOa^jTjt{GKng|U*O&Xd@LvB~w%_i#}$eH<DuH;qNf1Cxk~
zX8RM`%|-x}=L>DAW_M#+G|rP}H!`nND7v?5=uqfni*#8X?R!zSl87ZzMn3e#&PcP7
z#Hhr_sC<dtm+6FA@f`)$p0h3>vWB=Kx~4E4YG{%hRnCPOUEFfVDXm`)SGXa%I-|*0
zoK*%}L;<Rr+UP>Y!nw6;x@dDjml%tH%~+h+ByAk``Iz!TuPkOs>|+LX<^HDNXB$*~
z3|Gtku}(kPUoWvJR7$sqC{_hq{xCR{DqHbZ4{mShg{?S#^%mq)Q3M_^#`Xy*pni)2
zConPxy6R~vlt;@vQQWT`H-rBm%58P-WM0@MVx=$^gFG+?7KBeB?&`yxIfG5LiY_xW
zgZ!r$lsUoxve_rQJ&`K6g)0F%cB3=e3$AZ?2pHpw;H(ib)xy~F70tiqfaA3$bnoB=
z`#V5j@eYPLaF-TAFth?N)nL;rDwXqHyg!Hi9n@$2nx*=5v&i|=A5%TCwy3pA9=O>^
z0{vZaVDQROHKtry6ZB*03HqZJE)Llsi=>u$8*v<2z8XyY>AG1&3i`!I5Kz?7oFj=<
zA{T_g7OBXlM6>W7t0X07StxJl(3UHo<<4k7pG~DrhbeQuVH*m_g~Mm5F+{SDXXEw!
zr)9-Fa&u9g!yb5^*?6Weo$g)-k*H%aZY4h-fu?E@LZK;XUky*9-lFBun2ezYE==IZ
zW&aH?RWFI0Eh8d4UUHPY_($!FZGlwX%DBZ6y*-&XaspSDX9IWIJX-Tmb1)nN<;>;w
zMp-n9T-ymQDq8~Zz38%I9(#hWZ8=LW=B1~+!PYFwWa%8;S!+eHfkR#ABv*|#gAH%2
zo8Qq$s7J*#nO{rQFh9)QkSj*Ac+9*u3~sf^T-0SX7@o^~d0)ASe9pO+qBX;fo}xyG
zSlK>c3RlPM;_kJ9L)84%*ml=&qdsZ=2e*>;(cb(?V;d1*X2v4@?yB3X;^{zp2JL`A
zcMP2*?H1O}`8<=-y`$d+Q<*g+#)P|}dQ`vmbxt){)1K?2KQf;{l7}>gtTHRt%k{YK
z(Z{<aN%c44?(xa$+|}?}uZe28A-QbG`Q(kHe&}OEabSQ8o#99XUi$8MNLClrlgaPR
z>{1=Bk@E+zU7+-LqCSj>rY`a;IVm|}dAwNj)7k35za;seQpI$Uj>N9(--Wl#si}qf
zFgJ=WnqQ61I^yINQ#?D9iO-ECVC8E|rX!!)ZPnwo%&J4BEvMV~OMaOS*;5a+B1_Wi
zWyC40rmY7HRJtL@VZk57NSbZo7oYTRE!j449E4l|xKw@flC~Tl8@TJ-F6$_l&|JHF
zb{$bF11GxURUS^e42tbT#)f#Qyo<bs^=6_TWxMV8rKIMy%K1ae3&WB+b2sU;$60xV
z8{B8kqvKpPe2X091JOvnt4<r&1((L5i*2slbp98%Rpk5av_<QasBbF&m7J^>;oBJe
z&(jEi=3=rK;peGP*F4gSs9|xOOFqxBj^S3KBI*tITWp)02h_=3mJdV#b@L=nVv)LR
zJqG9S9rL5p_iN)DkZSB3zqwC34bpSa*ZnQ*FdqCwi)~fT2w`r&x(n2;D6WygZweub
z6y8t7&tgz`^m^O+rhrN!_TB^F)SLU3_dzg#>PdkuO@H5${4#3(wf1f&FK^W5gqCGe
zU?=do#XqbHmjqUwEo2BD(`1>MJy6N3K4-EaoYDAHkW++sjwDX9q90}_iYWv^-;YV}
zUVrU&w@+z&>4$ls5g_!*ruvB~G3Dt^&<6pFU5%t9OCnSW@7x8yrZQISA{{TDLI4dA
z<8vvlHQwWoG9R?T$`+&fU=zvFdC;8t>HIeic~#Gu4Eb5|s08(9(hB{&I$>egqg2(y
z*wk+YV!LXg7rZZkqhLka3$oY;h{0=x#mP~ADpS2*Fmg$IxXzC^K}t`7&1MaZ0?(G!
zL`5AmmU!{3@&GeXgwt4#SY|lz-~yrof?i8hQC+2&7_BST$X__>(s1zk%xJCgL}bt@
zWM~V;I?W+e@U!0bkS!5{@Bi^-?TI_z%<eN}?w^q~ja_iiXMz6Q0tniEI{12CqTu!t
z|01hjqYF4jZb@_$Fvf|~M2%%aRG^ICi{Y55nrC&ulzIJwEz)!?)+PVZIKbMFR98{7
zF_1aHs8(-g1;o-Av}TNwj&*b$+XJzd+zy50e8MyGs8-LDI`?mTyn(-1H3Cay@dZUV
zTRlbG7+f%cV9sxgI+#Oe@OiY~Iiko{u(}x%FY~Khk@!*#Zs|HbTeFw<6TK@Q?)@8G
zkzSoYv>k0s(S@-IT{-&Rt$;iy95WgpjXW4D1;!1V@XA=4ndw7z^IP)2juavcgZo=j
zGB>3s9~m$p(;yWl>B!s_XL8G4SPBw%u)IkZcDjD(XP{IzR)H2g{GA<tNRpVy?K=79
zH3WYIU;Qm(drBHWK)_(-;gcCA268Z+b(t_=ZL(3>H_XT1!8->EVH6u_fjX1}R8dA}
z<Xaw&xJtC$6HxH`H??4wIw62bhU3Rp0+rakqIW`wGT;hn|IV6x{2#8~F*uWOiyF-&
z6V4mknAo;$+qUg@V%xTDCllMYZ98*wzWY_(bMCLM>K|Rz-TQg=diGvxZEdlK`!C4<
z#g=lLtUuAd)!ws!1bkWwpz5jHf3#CwrgMd-1bNnI8s*9oU^ajJC4WIR5(LRhs_`oq
zkN(C@oeCT+ENZ=O-M4knLtOSpfXUpy#p!+xiupqQ`gPWoRw#wF*PEHpvf*}p{dsk_
zmBIJb{f7OArB&UJ)7fdhUxtp&=SN`Ob_m#y#Qj`&c<`NJ-)x*c;B3Dyci(3LHOEBM
zkPIJN9SA4lv(VjvI5-l<jgZ-8!4I5(-tmAWdV@N__>y5NgWoF9kQTPV9~h>$(0rmF
z?4$j|pzfJ&=L5*rkH&x4c@O*NdAaxd8$f#rCreo>Q%!Le61bd&U^dWr%3&=KH^Xl_
zHFD!!_B_Wd7H$06fUjv)&n38<j9%78eItpog(VG9kz-jucvLzx^&J-Kk>diZ24OKV
zo12Uk*Wy^24$XsmJ+WPs+`g&uL6Q`*$I8~p+wIkA{1$b42cs9Iwqs8Z`aO*uO}<Z6
zlw;LTmd#W5neqnZpa}Bo(n@PI!O4;m@zgZErLM4XYEY4xK=|M@7$Y=$hy-NB#{mv|
z6VIx@+-h;4X2NSY7FN+F4R5)o_zBGwyyJ<C*_KVgGW~OVpnC)iPL;;Wa1sHI{1g64
z`uT~!jtsSuf7j}_hx{JxOkn{h#V%3WnxJmZ2^}RqW<Kn95@x+l$x90x+4?GA9O6=O
zK803tnq$qg1!k4eo8+Yahn+$rLpCQEXGk>Id|5x|D&0O+(e}bxi&bRbfyq>vXiNGe
zZuU3){iZV<{U%@X*sdyErBrS9uguR173Mt>!PIuYaHSRETKjktbkyp!mE@(U)<%`i
zNHyio@MUr-*d+$kn)^;fyHa=L5|z%u$#rTk$ZHsPAa;EEWvM%SiI2P9AmmFd>qJSo
zy%mP_LI@M(cfXF3x3`4XyLivZJ8w_QyJ*kKd%wSha%ztYf2!;y+wJ9t0;fjRTr6CG
ze3v{ijaT4~?|>XiKHhy{w)7pAN&8Tp`L5Z=UVm!%eQWNXn&|3CH7%`5gEB|ZE0Ve*
zqrrd`aLzcN|0mj}H~t=WL($QQYB`f1tcaXz&U%ab5h71qaR7hmB-2zJ*}$=fsvsvW
z*1TiHfY`mOjXYX%X@*v}3dVY2gA#sv8}~es8m#e&8?_p7Ew}PTdK!fA0_CH!6|a^?
zyR-WEW8%0I>+Qx`PJLwKZ!TuDKcEGJhKwTUz<tYhtb!KrLsSPNM%6=yYJ3iwVV&O;
zVsJ<dR5EF)d<Js@2yj0nY--yGB-@O%DJ7jE{>rPyb2F8)9-&8gUKc)Ft-ME(bk$I`
zr}9}$vX$MBO3mZvV9@@O`PNAeM|r%KHI`<!)A(_KYaDwYS=4;mt$`0Q)ts&uOPSm8
z0G|Ofo4DmvU);)*iHfa|jmjO|0tn%0mv_wAX{Mi5Gnsq)oUFEA+jb0MN?BN!5(keh
z(h+jqUU7}%255P~yn1~P@-=}-fV)e0`R&;AQ`nKG2j&^b^pLM8b+NT`i-mAT_cA>c
zT@PrY&NHO3zQ>duXf>*o+(5d1uWZ$EpgmpFp)r_XM~o&5mu}$uEZ|Exmn*pus?M5i
zHz~pV0Ba0BkS?DZY@6i;URyMX>zA>-Mv-DdZ{_$ykg%d0M1xqJu?a-40yTl3eqIN?
z8IFokwaE>@drX5oTP8xxp^*4%1N!6X4RG|R^Y<fDaS>FLNQNXJs4%YgvU8gqSgxT8
z1dre@b@RJA8E3*A-gDK|B$_Eyrc$d_)<?m1Z<O9~OJwsX*;z*LZAuC4Kyk!Y_8N9D
z+g=4$%guI<n<yTgsnWQWWD6>(I%q7&Lc`wnWC+d|8qX#<YzXaY&8k&Jnj}m>pAUXq
zpnHTO_4vi(k(?4rt{S9g2_o|V&nDT$$~q)RJECb?{i<GmtqX(D7~*LT3R<JD*9kcr
zm0<8^ut)0{hRU~saGrvFpsd;z6Wzxy!f^Bdru!n!qzNprhdvnlP5fklT?K=KBsCLH
z(~kYnhs??y$PEcUSMHzH*5|mq2IYn>ff9cKXG@Z;&@xc^Q>6K$a~B}UZA5Z5pYfai
zhtOqqr7zc$={wxTc(qG@1SsfF@d~)r?VkV59$2A&KI(sffT)6jfUy6c%0%rbNrI^q
zJkYAia?#x*bbYOAFGB=D1i_z%ocD!bf>a2n<0^Qx_*0998RcyTe+Hi<8#92J@+ZFQ
z(MI<;&eQf}P7erc9cM7&MAELomayGq-Hy?ySkexgN(sA~O`rRxq&ITi*uGHGSeEZO
zzlFb=cKOtrSf3=%a#d@Q2vgFn8_k+c8E~I2zjfo>`M@P!a+3WzVNAJBYNY}eA0GvG
zVrd%c%6BU<Fsyy-z~PxQ?oF9K7Gdc=SbREAmGl~2$0(8B!VA(`ucA<^l>7HjF%8m3
zUrP0KvE~p>Eid6dyI)%MFFnS~N@Z1i8#-yn?iHl_2gKKB!JSflKjPpa&~qcve*i(L
zAu;;RLGTNBRiU(|pGRyfla!6CUYs0Bu)*_`nJOybjQSb>VdDK`A_*J<6U$@xsZ2SP
ze|bZC8$azZMZ5F&(2LS@8BC;SSNPhCTm+k^m9Onezt1r>Eier$(sB=#m{Plp5!;Ai
z6yMso5eFO7rQi{3-lr<nZqJMOEl6N4#>;UUtw*zO$2M0^Jk<l~g7@b+*<ZM=6{qA)
z|83a~jf0dKn*aTq5<Vlp*}t`ep0FSwgx`M?5BUEY2?eQIcp)#N`idnp7u*u8*E=A<
z4LX2~dlA|YI0}YGL4yv<Q@K)_OAXI8(Zrf2rXfnP&5_7t6iclYYDgwrInxyqC|wZy
zy!pX@(tZB2+2%?nSv|>1&f$8_cA93q_PR=Yulcv}iSXC=LueR8_@|J1Vt@RUfrb!J
zci2N)USTFLzqH@Ksvr>kU}uD<8V=qB6<tMpZZ>$FGru)|KjI}`8K}{(=Io8Cc6gH?
zU9)>m_yT0=LTvvE4z@dUhu)sMW$dmpP^Rtv{oF-FQe*y79jwOUE%$w#|KRV3XXz~7
z6XW!aTvqAK+asggQU(DR9jgyy(x3<GsI|hp&8cb2p~!K$O0etdwr1*dI~HEh{2CuO
zlbLo!5tf_I_B3^+%;IJ9@U}fF1SKibUoW(2%eL^iH_fBgG%knHBs+@6%}D1-k<CiW
zFYVD0$k3ofEiCD@nM@VQBVhH}>NJl=mA0~=zU1(*vdHWUwz=<fc$G)+WwZkxcJ;%&
zAwREg&|#*kA!If>Mb5HjwG2qNwGw0=PXzhnFHWTgdCZTFyQpA1B;N}gEH_?KN6~PY
zRuc@-a!8A?8;M;?srIruNnh<&+Rz-Oj76`&#N?Pt35qT`s(^uaRGez|VP|B>s3=XY
z8x7xq@0OIMw`Km;9*VZzk^}&q`X2987u}p2sz80t990tw=TvT!{hy+0DaMhbP0&*1
zRw=9<xMjx8S5c?pNEC`9Z)g+I(ZQkNGPCq0RomF9jNfcXhIQjtW!6ki69aQ{)jBRH
zPO1-`$}f_}@bb`2<F*0@LSL^|P?A^-!z!hdxj;S6T9z-AR0}*J4~&81;Pc2%*cy~4
zk^trk)U2P2mcl96M?pymNo(!hrRAJw<(?9&SDvV%)-4L|1EaL_8f&y%8iaYKL3YZ2
zOCO8~!l1z*9Y+2lJF<iNqv<?#&Y4T722E%Uu0w3~%Aw-;@{3%){tJ;6?I_+egV-AM
zqV%=hL4PUo)7xE!klh28hHqoM&{Q`tv+ZQww4t<#YKn^)Ju;UY|JfeheWv`<--&ri
z@MB_^f;#YueEC`W(%{#lzwuYkL1<70?0Vl0BD<ePb)YnS9fDF_!D0CCw!`vYN>xCm
zgt|ALD4nVXLwN<|n$7vRp-%qVRq0_vzEiV=^;_q|h0E|$dsi5+>#Fr1-wgdBV(Ico
zS<rnY8!A4=3j+S^%@1aTPSQ1Hovw2MoGY~%jTkMi#Eg24<1~9}=$f&oZ!?^9=7wUI
ztrT~8y|sqzYvRqO`{p96^Xi-EaFGV>9f>oG6Y-3vSKi1WN`u{TXPFSMrR7WP;o7aB
zzQJE@o%?TH*Av0O084l!gga}zFNl6m<TLS&ZNPrmkxWsx=3@476oKYrb-w;_GC~HY
zteX>T2W(v$DqZ5L#d)Xj>l&<#M6VF+byu5~3oBv+IH&JBfMiM*P>7|qX@Rsh&?+EZ
z5wAU4uHk|ZT5XCjdl8@TJQ6pSTbB6G;uaV6B{|Q!*L4th6#jr4-y^b4kq&qkPOvvC
zX~8QseGC(Gcf#CBGQ<$LI5<23IgYuVLi$VA`eoez<}hHqf51)ZMV3Q&7LRfKLaavm
zeAE7Csuz_!K&S-~1E)I*t=gZ>2U5=ABDfRz(zI4r7=t^Ux7`aRgyK?%ZFv4A5omMv
z&`<Ft4FLe&4EyT9x<z&rRa2q02i))otL2#{qMExQlnqC`@jeR(@pS=S93ovhEOEdS
z*vB^Kj&a<^KW+L^Pf#0q`Pi8|L5(Up4BD}Gy&DNHn>E*LQVku$`Me;8Ez<V5#Yds1
z<ZOQ`eMyivD>M{OkdMyDgRjT$st7Yxn2*z2zQX`HP4{+T3`YqVE~LwE^((2WRcm?h
zDs#Co&ra<0=HoRFa`E5?n_%$9xbdJnL%=rQo<^jO1iG}Y`=SjG9^GbNd0mG*Dcx7l
z!vfyKwXIh1%Ji2X|7|6-$EehD;k853;FagP9pFKTQo0{-zQv0wHBl})>=$Hsryx}C
zVQmBVv3eYrEyXoXcHRHh6d+iYBpE-&4)7|b=`UWGZQ>BY$szYcN0)?cnTgvaSNtj*
zAPH9s+Zq?XRv~)ED!zrtHVNGSFfD$m;_|~z+|0L5T8a-tDrmfm=9SS%RmdI&7?tue
zm9&Z#95HyOYlvVRQcMuR>M+Xh+g1&2Y9;|YK(6kzD1H^hxcPg$0q%TMQ>}uhMNMCK
ztCEj;%4QG3Fgk;hPu20y?^jm}aLf$7*hvHGy6zCeFB4+yEA@C6)bn-TLBP_`G{NW6
zcH}vc!$aoM?71_iN*!3TW`pO`o^GHZmjvJ7AnX=)uI|B#G2NpPCJF+=uJq$O(vFOH
zi&^^)h=m)@!&LOx1E=rErc)bVGl4^#Pz%Q#R(U=!$Lzo6#(#GI)d=k#vhWGLiH=<X
z$KL{xNboqIKVl03aS`J05Zy%Jh5H2lZ?08=7MEA}b_bM8AT^<6Qkt5SqnMOX5ton|
zpBSeeotWNNgc~JSv8N_iq^DP)r*C0otYc(UwReSuQ=tDgAv~f?P%y#9{vY$fN6tXO
zP-1tKvG2#?{z&-h#{=5Pb=daP12!J1{J=FFjlI6nAb)I;$g+PthL`{`rYFYd2c<+q
zQs&i2$8Q%GxA#--BT!$J%twFNs^`q>5L_z}>4&YP0u}Pt5n|-;`XgXX+OydeZGMG#
z-rJ%uSmDWE+lclDH|3}Ow6lc%wYZUH=s5n5CGRMaB;~jbeT@J*>D9qpPfo?BN%pYU
z5BVJJQa;$u<4j4);_4Kgp+*BDt8g}Ek**I3#^W;<QV~lncRYCjH3kgX`uIKwrdG7~
zKA(V5J5cu@`2Y9${_~y*-X<g%-z~9k+s6O%+E;h_$KOUovES&00VF|T0yE*)1Qsw!
z#YPTU0Kqp|SC4%>LOm~E@JHO!nj*hQVG}eVmINh|h4_biSN3t-lVr78BHylEFCEG3
z0RB!4<J47F(}OHIemfHv8`CsXL&LgWPtU)fwbAte%nAh*<4Ap#A@Zfx=BXywZtmUj
zdGc(LI?O?*VDZsL>5>TqNwa8-!cCy6j#+AHYI66s#gcPJ`4X0KT6rULlSAPe>9&{X
z=&Nxv=3P><4GKW3itWLFiT)Q?Q?pS;dc(RUt4hUG!ew)%(x$6(#|XU-$MWjvwl_AL
zgmSrRgvl7%qV_K#P8|+axkW*trpP|Lwwua9>6}}gOZ8<On0V!Nf}^lp5KG`#m}QGg
zhJiz@JboP5uF#f1X%X*wo>4|JVe42;xA|L`QFEm$iWZ<Cq}ZTLcDQ)&Ug&sK{t%FH
zD&Xj^&=q57f7zY?;Q*lOH%8}f2J5(jggZcTI3aKjnO6I|91Eh3-Og}u<=Ad=n)6)Q
zT%d{N!WsuR09T@O{9JU_{1520YS(Uv;jKi0-^|%u+{5~+O{dK=T!BLt%|3*oxE!U0
zLsyF{hFHXYMT9Dbg<0KYJhHWOMK2AfI$X;v?BScrTZ6lP!t64B3d;e@t}_)=ObFq<
z%BJ|WKCqoz+v)?*`qwrkBz>JhSnO5`orHGMl_-ELa&47LjEh{g-w0eM9Box;19=yf
zghFl<4RnA>XdKdk+$iR;KaM96h@TymQNodP6J->3Jc1PE)h2jQ9d#k3XtPG&r6oG%
z`Qxyg%pd7LOr8l=v>^{4YQ-e3_=X{}(NFyeZhvDDU#*sZ?2^-o7fT!G9m+8$N>3MB
z#BB&k?2%b%oJ5<iGXR`|49`Nv*|>0w36NezKY8z|H-Yy+uv6Hf@o?9ZkR(pf{r!~0
zZ6}<~M&t&)c{zZi!XcL>4viL$y>1luz}ed*rcT<3@p_vb_>-x{X;fD(URO^0-|zw7
zh^t8aOV#g)4z-hGOO1oTiT|c#|7Srk>Y2n8Csev@{$D52|J;M|?<mjvUL?=o<v#8N
zh9u$y`5A0rR+5$6ygthCziHO?s&nI90^PKqCg{chM1&dPW0IjTQl`|M3bV>3%jd+#
ztlPUJZ^E$X0d!vwzQkK@o3sELOlp}mr|fT!q~%87*Vh|tZlnw<G>S5@f^<AH-C_o%
zqI#?u2?fni9m+5b#NgJwwAMh~1pQNAik{=}VpckEm?ulXi!$&^nfj`|eY{q?3AezQ
zz0=^dNN1c{<-#-}LUa+ubBApmY&DlWqnN(S3sBK!0P<=RtUhQf&s#8OU$IzuK1HS5
za$?+RdF^PG!BxD_-=F$CRp?BXol$KC^P7LmEwZ+}saNCSu~3mw=Buqb;mEz0D?GlU
z`xqbSF}l}BzQ`T2!FtC9P`JWi?8#06SZLu0Ts#Oo_`xlICek!pJ77?{7<a?J9rChI
z%zp1n&S~68u;n}{+tK^1U>I8fmWN(m6CeXo4%%VW1icp$Iz*FcOQz0e9R<2c{jjOP
zlTbf7<6U#Uz#t}UMe1B_Fc%i>Zhf$e^e|AMGHLfI)ZmMm##Eit2Mp5`q9wrK>SsSR
zRu=tcKd$1Z-?c_Npdpp(v9HvZN>fJ19k41eH8KZD4c#WW?}$ZA5jp}rJBnc;Cmu1w
zq@oWQiW1I;xJkw$ctmhd?s0};V3)@TW_D`LNI%RGzaxb-e!>}3hR}{Dm?T&iwE}E`
zlk?L)gV(_+>Q}J;f$jrmBQfG3dP@OT_=^w0#;A~eJNWJs!*+Vu1gsy97I&|(Fdl{Q
z6{c9|W|O|R@TXGr?f#6aTJ$I!^Xe!=gcYIX;<6CR;maHFUHNpXo1nM*jh%)bV2?S2
zVk$HuR38Ze%LTH|mn_{?(RUTB^UQ-ySA?B<Pc`<M?NN^Tt*HrC3Pwxdt79Z302-KR
zllTN@j}U+Tm*C((k&O4PJx}<K<bVX&bWxzd_a2Y(Wy)n@V3S9rEJ8(&3R6X01Qm}&
zWML?1J@8W~za>w4EZ!vL!Zr*DF1y9O5`iwx%#i&lAv(*p-UL%sc01!?xAlJ1W!K{|
zPj`&Z`-6Nh&hN(r2K_?5k*ZiP$Z)2nH10j6OmnG`fLK_b-J)ZqeiUJH#;WNKsvA&^
z5uidN#%qOhA$}dSQb)n4?PArpg_d3Pq!0_~l{_80#SNfdUWMTvFH_qH5ZVp<`-p*r
z9sRp2oW@%Z$+qas)1~1mOh+r7Wt|b)iy%{H@uKa<`_!aEjgsl4$zDvR#A(sTfmm9L
z-K8Oj+D+7y^&}Eom5TBS_m8WmpD^&|S(}ak$LrCm!M<$vXsWvs{BSDNval<=XXW=;
z8Gxc|<WH^k^fX=aB8l-o@Dci2lSN!a=0x%eV8I#`_4-HEfn^DTmGan%Bet##Z{0#w
zG1uB;nGiH_?6=)uvNJUk_tj_}k$2nf%iL|%U(WcfeTFTtJWg3s`fz5UGe)3Y@ZrDA
z;$MTBh76I;N)fxd*BQBCbwx_>Pkn5{^YpXlfTL4HEM_FNlTk-=N%b|@xhZ0)dH<IS
z%*N*fbBz2ZIq+4r!V$Sfkk)X-(l#QG{Qhf%0`}T$K9R^Czo~8i;UyU0RkHgL#t=E5
zfVP#XY@$~ryPfY(;OG>>G%~QgX4Td^<V)ypw?V9rSa6n6_$R-t5xFInBo;h0O>??v
zV4@o?n_&ETt3<Zwfh0yhO@4|1TFdBunF~>NSSVkSbfmQ->px6SKi`rQJJ-**FtplD
zY6+C#ep89DC?P3|Aku<9D&r<`*(IGR=U+3l7$yE1W5f1*19AqOjT{u(zqv$je;hDK
zZ|T&FKhDD*-GUhL{r@61C1Ye<G-1bD`rEwM&~2?e;9OEbSO7zNWzL5ac78;fC=K(m
zNgGxB1%x*-wXi50t(V%?QSR#V3fkkJyAPOsa8`n`O*W9Z=V;r6=#W86J3pxN3%tRR
zz|=pwddib?`gGI6t(buB$ya1JUd7GD1i9jEAyvh~XHpR-v9203SS78&_93!!Yt!}E
zJ$yrMCEIqbr8Yog74&Gz;7EBexT)2m!z$;0L6)^9OLO2iqIyRH0pa-um39d%NdyV>
zfp|bIZxl7me>uhp8l+${=%BFXT+M#O8RNkqRZyZrk|Z|bGyI0(J<SQ5r>6Q$4O0_H
zr7a6mT20S}>y0a(c_K8F3#LNi6y_|JU3@PW6@2*KryXxTObr<_uKlDw4~G+OQ?Iti
z9oOB@IpfzLE73ipjgeJ(gR!$=Mo7`)P=vrivi;7~PW8@0k5}&fb)-ysZD>r)mfb)A
zI5Hp$u&)e@*N2XA8o~HYGQWSKLc&X~gVy`Cf6nN-hs}uBTi|`48fo{<hkm)F$2(3S
zv%DeB-aE8_p1yf(@czt<l*mlJ!NrUc54z<B>g^m3(igwH$490(1UvLl?eDvb^Z_f7
zy2*0YEtYF11eRGR3Ip+HM)`Z8ZM<ZZTD%m~_fMkvE2rxd>I$n!6g{c484Y=sURq5_
z-vCN{g{#rFY$$Wrh^0>?P#d1OiaEixR(rofNW{4j!$1Xz${e*P7fC*1OMOrwUiovo
zI;+87D$k&4l6KXWo^a=7&Fdnq3W0_`!TWQY=>oqkENzEKhhU|upWogSO-YS<J33Oc
zxJ=n$ahHK@H9w55S)}_fky7m_W4a~j5?j1IgleWzCxt-s@Tdfq+Wi#XnDz_Webm3D
zt`ddQ;Z|jYldSIeIKeBLpxD<8RnYUxmT_!uDQdaQ6sxMu6SiDwn9DM1`anIUx{h=;
zY)S)~X*$ITS$*7f-G)uy&qAquaL#m98Y3M=H+b_Y|Dz<C$!E_P!ZBw_vkGMoLMnL!
zW+-d&&~aV07MA6`5yiP|CP;s7YM2@#JxB(^-Aa(3UyuI~Vh`(Dyacoy>H|_PJDu;o
zFIk-zdlPy;upMV}lj`>0fI1M6PeVkRuC59G9XAx<Ziak9HPDrM_PQ-LRwb?VH;d;m
zykWNBT=pUUF@`PvF$OXIT`z(D{p>_D^_{Y9E2}`pYRIc?MD3QM6Wzy%hPBp33uWZw
ztJ31b@@iLYH5R4GL3b{dfglWg44&d)i3X<^#ENGlaK2t_P_GUdpbEZRN6DS>S>REr
z#X6?}@k8KSu1UqMiExV)d(BSCOPW6+K=P%{{}+4y4pFqYyVA~6y(*tMI~;g2KKH{}
zuK7X|w^<WVK>NK4KEJ}hg`S46LLVXpWnvE&It6uN*9Kf|1z!h}iDEhT=cJR{0`%sR
z+QdIx?Ie4dUb<BXU{7C1#Kg5(tiN8vAuzxLyl3$GCo9e1N(zG_^k#9Nr@OQo>IdHS
z?H#0FhT|SUOy<NwD<(k($r79J6Y(DDKb)b754wqu8VrQieXwL*zbVwEAQ54<WOgep
z6+c9C9T}HgG#%a=aIA6kzT9y6qT;6X5AJG(-7TH`L!3*XR=VOskfd{byW(YdT8T5$
zX|zYZXPE{yp2Uf|6mhcr@qj$C!Z@n_nbm@CyAp*J(Y9YHk5q6&PQph!j<*sNj*eef
z`1+%yjdsD{e)~SN_4cX&Nr%~B{T)qDU|kAtdFlBKfw=2r+DSK3H^uf^IE3FJ7X4wh
z5w|d7OI0NBPvY+!Sa2ch!m>8^$jwYQ%W82{b~fvuLSQUaA_L(4!i6u1`G(R??sJ4e
zGS>}xWo_(ND<)wBee6nN?Hia2_;bGM4Kj2t=*Y)D3D3{8PtRAV0Focr{o%MocvrQP
z*ZT@uQY9`4^#xT2<gL;qn+-pKtA#p$;X72T@v7*6c`%r?lN~4?wltVV^h{XJ;GR_`
zPg(*ZL6UqJT&Iv0EJWN82q?P}f8XcmcYG}HZn~MNW+s|rc3>VBmhS%SDyZIc3a~+%
zKXX%_{xpwjmM$QoG?mB95;8Z2P?;}{Zk81aZ<hIuQw1+$^ev*7J&eE`*44BN7B<>d
ziXB7-mLkg;HMm2xgqqc<aEG8dV7Vbr$tp7dHv$6wK-O)c;tiy$c_N(S-4QHxhc})N
z^XrO@_Fu=CD%>MAPY7U!Rl@4@w#SW~XvIR%?FM5m=-Q0#4Q;p-zNGJ*C2LgH{H14D
zvnTu)K56~qmWY@^WUVLCW)ILlKy`vz<4LyyJdv92$;A)3v6z$DVZs17<B(oj2oI^o
zBTePo!aP#jp<#m;*Sf-Gh_1A<>8MkC;_~Tbl2k6|hC5}m51OHbB6F{T3v%-05!k&5
zP9480-?y>r@#9a;!yhK143EZIA3U$dDw$Ky%(Q6wNK{nqev()}71^HNkMaudo1)<Z
zpZ-7!nmN(+a2)$-NqXrgZ-oU^HM~GYRQ=vj^|NZN>M5d$2zL7SSu$;U&dmv3-Wq7*
zWL{`*9nNfqXkx3;D6Hv|iU>XCZ@&KNV~vOCf1sZtG7P>&oBH8eNus1Z;CV|rc*5+#
z8Sy^Kf^3LZGH4<l#*v9=x9{Qr4n$W2-oiV;{zJR=ERKqQl~r<vOZZ21OW(ZHfN`6@
z|M_=ACv~Wc9Y*2TSp7Tb@ah3Um=3ayg-r$gqS|CFL`2qeD%tLzn3Nb6@MonZ7<f;D
z5o~bHST-2ZfKCO3=eyv%pU!mS_z%Ryr-L}0i-}<gE8t)AW=J}OU*{G`K7qF!<Zt<`
zkundTlrP&=65f2o|NhID`9JvhU#vI6{5L*cPr#4o|1JW}%cJ;SEzK%$V%RC&fD2Es
zZjFHmkQ1>FQq$@)3hfOurfbYK6<&t&_2c)U_xy<)xLMURT-es<Zm~JiPuL52%J!Oa
z%67W;u;}^xx<lpvv5usenlv-6$CHZ8Kqv6mKTw1^%$?d$Looh2!JWu3sef6xlxRtW
z+vG%(4M^R;t{-}Q=LHa)<(<KN8w)PFW<GmwzgJynlVFl>u1Iey;egl<k?i%dYXzKc
z{+_O_%GcqW!<lTrg=jO@XjfupSzd&$Q*X{nS9EFwQ&KB0&O>Of)_~-mz@Bt)F}tG-
z86!~r#0B?E>If#dQ7%AyMRHi{*49rAbv5rp2cA^B1bD$F!Z#VoFtAh<D{~LmT3YJ=
z7H3^H+}Pw>sK{Qc-Yp6BN$rtFU282O@E`k;L(6Cdo}^}TN6H_36|T_0T+_>>`L(Qo
zoozq~9IwU8DuT^VrgZHuJ6ngai;&iO;gF^I9p#HTT}xpYVQ?5sgJ|5=)W(<vo5@GD
z2W*QZ(v?@!r9tU8H6F=7IwKihq*=a+H0t7cQvWG91f|OuDP|J2FNz8Cj|V-47EL+Y
zpj7F!bg*FEUs7$pivSAN5=gr}2Z5T^a=_vSt&S0_wVy$nMUfjZuP?vmbSV2Y1zU2&
z6*X8i3v*nplR#&X-EG&!%<c2wf`YJ50~G7{u}0B2r%lM<61+l&WQbAdhOSnBjX|UV
z2ZAwVa|2z76f}h&MlEoD_dv0CjIdS5M9f=o4!Sobona}%E*5{?VI~%+Bu+MI-W7^`
z3lFHz8L8LvT`2m)5jj@G)q0*|jQK3SmksZLZ*-7R6cLp`T-b8r4Bt23Mf&TO2*|?X
z<Cl%;DNC5++_~otVhtf>;6IW^Clik%6%eB!-YIECJ%M?i*&q#Kjzk(tFZRTK$Lk9-
z|HT=g)hH{Er=%PXFnL0(5+{==n2E7Y^p%HErGNV`8q<Fwe)mtd$M$!`+kV4UzW+eg
z@1ZMZjt0ioCUgn%Ijle_Ib;QtudBxS<WrC${y}u2{6?X?#E@`;aNz=I0pvvR4k<27
zu@WX@PL(hJe}h59+(_uQGT&x<*le~BZWz;9vXVjZ&9obtPS<V6?^kWx99h0EpWi1i
zZd<BQ18o6FQcm+EWK+e|PWDtq`lvMWYEg$M0a~w(`GQoVP(I+Et%lpO@E-vm{q^<^
z>sv<+Iwt8#_Ubq$ZQaHP?OsNwaoMtg%e`=mbCnHoT<>hc0i6KCw!6rl9gc`~QQJu;
znf2TP_g#c>dhf*5V~V9)Wa4`Lwc?hM+>#h3Rx<ONmkCZG_f-l-hfN}rCdIXd&0+8P
zxxt7`(3Yh(t8kzX0>Dd72FYS4>~q6acMZOUd%o^pd_xeDEa?1w2Vk>fdR(enf#S4T
z?5vmx8^zUn%)U#-XI%@)QLdQj@=3zsLTHT(cEKitVaUo`Saww_nO5`y0t`d<GX#Ql
zdg@&!xtT0z^cNG!1arSQmA>a{x{|}MHy))%J{M{;!A_up2;Ey?n%ZnsU^pJJ3i*j5
zLu4;Gn)1egAxaCz(U%7&Msd0!_8(8If%?l(X}*mkL59d;Et?_v215OlgTcK`o9V;z
zjq;i9p4nE`TuxV#;1i)00sL`<_<X`f$#AsS>~>*ZP>IGE(&ijjlC_}GXR8a4c-H2S
z*yK$ib!^~vK&KESlA^Ivti=$YplMES?evMM-pp|K9!i#l3MgO)uv0S-G@%zpMFJ!V
zhgNu?o&r}h8;zi*_-J>P6Bb@!%TcS!hUf$wGhh%n{ZL$bLiBL@`OyVOz5EwlJndU#
z-sz0=5&|!)f^10_?=TBQMBc}pp;nA;CCa;u*93MzUH+Do<uz9R`RhH5{ar;(F@H=F
z_jK^^k5vE)u@B<>Q2jonK9^Xz=k>l>IY(2uVJp%JPQQ7s6Tm{xtZwWjD~|rC!DLp#
zH<id?LJ&3rIH8eQOi33fCKx$MT^*9d_rFIsiI0fEw{J^^gkK;aq~8~&B<zI9NdPcP
zRZ9(74Pz6G0XhDMq4HlTRAqW%L+h#(m_^F)eC^6S`6AVj1LjCv##7_Hq7?kS2)ime
zpHdxgbeF1X-q)F?H?lXOwJRpfK4K;dAMq)U?bj(@FW@#W)$9JX9uVw?wmZUz&s1e%
zaMo{?_M+b#-FDZAqa%wS?-#VUzX<TPsc>)p=haSixJlb*TDX_P!-AX-t=aS8g<t0B
zofS#2AV35Yg~6Lphy=BQ5&&MV;sB`7R+-_tmj@OeTSglk-SuIr%_Ol&nrxP>3iiew
zZHB$gEsPgwZ`DOPT6}=YnYZhdSB2F#+%)zHartN@6zf(onz&h66aAJW4F~3H*21Pl
z`YR*o3Uq2}QK(y4dA5y2=9jMI=Z=4nY|=6XVT!iNYZ*w>CU(H&Ba5!u(~_Uay(5(1
z8k|!VW8mv3BcwHk3zoBu8CEwp6J3C}k#VSlZ)z{t2vv9KFWh0cVu)dDZsfP-Mw=v<
z4`{Hc&-61T>x?B?cbSK4_X3$66I|}@iapSai*R6dVcyc|%vg9p4LH}Bf4?ua)x+J!
z+aI-b)-v&6+4tL9RZcdAsdRacHu(7$a6h7%%y@^m1KCCod^WebT-+Ld$6I+8wd=n!
zO&11)*$wjB@ITz#QTeio+9*_|p)|1l@o6(n6(P*n5(1YgQ4DM|P6sX-_0&#1klVD?
z)Uilu7Z}3mNqUd3`fES6Y71s&w^+IgNMp_+`~2V`BbI|La39gNWxH(G)iK#;#`()d
z*}b4|DBe#HtXye9-mj=IdxKhSQ7b?>s@g{B-Wn{H*b&8Pq>PCRfiDcqcr$1BFTldv
z4+}=*@CvUvyu${iu>+pt;$R<ibd~I4%smX;Jvo_PXx-q#f9a8Bh)>sWqks=rz3riy
zxEakds&9<+WofCcmhMm~ATV`4Pu#I$Za+^c^^*Gt<4=T<b+RbBhL~P2QQX?Q&1(^f
zb&<bk!5v8s3qMMVh&x3Gy>)ca6cm%EWU914%)`JHlKrFNIs&RcA_Tt})#da^D-;%L
z<?axu;j$0F!_KSYABA+e9QSXr??qh@4ci_?6ZN|!SEQT>2ks9}P?4uCpS0e?WSxf^
z`wm6B2sdQNqfX#$3rqJhT^tum^<IZgoA?SCTO)_TQFpx@*Q5lV3^@4W2cG$g&BW*e
za$`{B;`i7kbb$n23|FSDUP#cH1a-3En1a#g-?UA>uInFH7a+26XYZL-IOlQmuz6<e
zToF#$kvM9MW+8=-2^sbqRmlLjj+7+<S9kOU0bczJ?lKD65e-peSv6DiJ(QePi13aJ
z(K4ESu=BgWDAIxc<^}|0Q1QROUt_@)K^@z*4l`lm3V^ko_#Pp2j9R*druFA1a2vqn
zkf}BVpT|bgQ59`Np@Yd3Z0WCuzXMheGgw_r#);lwG*rW|7utKNo&nCTU>(`Nvt{6H
z^`8}4o5Ze03lq5{9zEJVr|D<Xxps=J^{-hM??2>zs<I5_Kg3UfEaDP%Au3|`qqgr+
zx)rl`L<2KYhio=>_-Zk^|7Oai-xLno!zWB6%~c04Q(%_P+bmIR7t4xua?0$cL%MER
zdBtNDcynzFMRoEQ-VY}q(Y&UoSTkRHvcus%2w`U)%4eS1JCyxteMfoDjcP@d+o%gJ
zk@G5CkT%Bs{83BP8yFL_w&V1BVYW<F3_CBn`xM=D^5eh8NBjplye-Y}7AH_7*#qT1
z<$Nd~dcQeoDxD3`q3Yrd_x4vCJkQ!!ZTH95*JdCgFMGcOWbkQOc@nv;nT+L%;*TN;
zl{T%ITBBOYFz#f^1}1a25#O@ih{mW{_i1C+w57c8$#m{zNCCfE<V1(gqR)j-l6QlB
z537@q+7WMw5rsKyhd2R(lU{L9?Z7wymP609%JdWFqRLj-0_KsCNFFPjq4|`{N!|qg
zbFo}iJDbK^RVhBz9M(e+BLIEz==Z;=fY1thb4(f)^&CwHUX-J7vYK+^BcZiW${Zqt
zzz|#r`U_PuEBvKP(oBP>ygNQ?%Y|^rb}HH;9m!kV<G-@0{eXHrN`TmW4bVUD=4{U9
zSi#w1q-MT#Kt7urM#utblx7y$)u4wOhYPvwY?g+AID(<!->)e-7@Ub>;`4WS?_72^
zqQAppe~X$72nR*HB^{v0DbQ@X_0y<~ZjlAesHeVYba4<x_beL2n;NZo4(;T<<Y|S>
zemPaga2xpDFcHEu(ETTQ{Z~6TAThY<;k!$PhVY;4l>oOulpxy#1+;SeW}$5sERXE>
z4)sAD{478SFd?+ZYb0qlGK5<AW1}eT0FasM#X88V7sZT%lFcyNo@|hKBk(y8&}z}~
z7Ow|QtY16OYPiF`qtUygl6>l7iYKwc$vkX2%J#ZyJI?O9<~Sb9`TDp058R&ZtBf$r
zKimVB5M_-XL~4)&7N}r%2ZkyF>tI(u6ODA?nt0p#!cIv^sSTS&ZhpewgnMjI;hv9+
zUW+lDK<QiRupYx~{a1-Hdns0sFxqV3#TsWi?AF8J)~N2D?DB=en&C6e{>BNlCv-mr
z>+Pn(wet^p(4-WluIh|Miq1H#$`hSzN3;s1Jd?u|yB$DP2Ux+*Zjl&*+9;zH6u+yA
ztJFJtw1{Y@$t)QpFx`6-c!>h>D>{xYJ-|uC>V~ktEcF%asn1_wOirETK9$?SJu#bW
zELwv>s=B0{8K2jtow=<+1KB>;*;v;e*Jy%58T}+WdWp?Cqn5HyY5N-wR2%+Q9d#5#
zwH{-}z;Trs2C^$Lhd|0whT_!T7eghR7nlDslRgeqSBg!oJ&xRy=&u{tP;2%;xrZ{C
zaV++aT`bA%AmsE&wc^sAACKpaAplQns+YoP?lD^*;}KXwblWQbxzhYnQf0YZUBMMf
z2tI0xg*MJY`2?{Nv%$&jK+`YKQdiuyH?&u+Gk$$F0py<{If+rTS;nC{j9E!0;C#6Y
za2=xTHd{od^nWkcs&0o-q``htt1{d|QLE5Q5=vIeOLCOlutw<o3&7QAu+i_dxfd-;
zmcwSMLIaBwEtyoes54C-V>Uki(V@<KOx)Jj*kF!MI&p7Wr#mpJZv?*jH%LYP3Wk>n
z<G2j961b3C*`?hMQ|x6gf-JG1SX38vVXjaOs-G1%Efqr+Ww@vvWOZcv(Alyj`i`|5
z1F^Ejx!ePxZL?O*>2yRWm1t5wXxqZBGmO_MXqr45jh*D->VvCsVXdL>wp5250K-a6
z7s(M_M=n11%D+{xr-IuvWJRgFd<)@Qu;22M1@wQYij8}0BAmbV(pJ7D#s8D^QT7rL
z&9^59)BN^nMc&mFFU8h_Be>l7x{~H3&5bK&uRNS{i?$u4BAFh=ow9Vxx@92pe2y_}
zfct*KgL}OfAKr7q?st9mLiIJoyDtBC;=*5{QpEnIFZ0xB>%u_t*{<fHM5;MsD#I*{
z8Q7zx9hqk+F}&>{G0aClKW6Yt0HzN!&NggmtM|+NRSqs8kD>=VJ72gWStc^dFdRkl
zy0TAPLN-04ayV~<6HTK_#+e28pzG;8{adhkgbN?1<6>95=utsR@4uq4u0emY-~9)M
z>vK^ynX6lYHlygnF~;(WqoU>GB~!-{7ATdwjqyhSVFh>L0jiVWWCgL20?Jg(DP+%=
z6&=x?mrs>?5AKUm`i{*C16pBBK6alvP$#p&|NOp#-E4K~_&GmnAJ04Bj_pTL3ZAlM
z_LOcwe3#$M1xsKJfgpn<gDW`YAp2l5)r_mIScm`UhRX>I?H+lM3k<L5@B*y!9MJSr
z-gsHXSw~E;SDqR5@p4WuJ{UXLa1|a=Vo)*eJDnPto*tP=vGKX<5xt`Ibj(iK!5~^6
z(47){)<UnpZicL@N4NC%p>g}^a)(v9!&qDtJ+dRJe~kLz2P5<|zcEB2ewpHvUA;3%
z>b;k)hCsTD!fnS@5c**nt-y<)0zvSI#ULrpad;;4IIXse2TcFcaTxs$lgMy3G<x6@
zp9*dmDAesQK3xq(U?Keam9d@R1x`8LEhl>ZD)(*{BCK_H1*&Hs>A>v^MiIZtgo*hG
zg&z*pPMqWwc%X#2c}Lo)z1LjP>O-2cLKLFhXn=;N)BY-PMd`V%)oU004>$neH##y-
z<>L6-98V%Vn#5o-&BSyH+>lYEBEmCK#<cGLNs~WOVlb*NEUamE!(Ig*;Bb}M$3QfD
za!go{YpbuKj$6~fDH8^}X!c0YvZvZ!&sAf19+{hXGEb;oJzpvj@QyiE3ZOo<DTSOJ
zl)}sB0w-hGPk7@LLp%e?0&dR6cJMT9Y|<y0OxbpXnjhTFO-}cxoNJSWsT!-n8?B3K
z`xxiuKn=`la9$el@9`@LoO-IlF7#vm?N7BCqs-$_83v{!>7nBTgLM1)L{Xpux|jxb
zILVy;^&erMWXM>@jA*Y@FrH(%dM9eh)&vT(_anKd-cbi|(*#I+0pYMg?_N&z8N&LY
z6nuZiyh+1K9{nj5-%V<JR~Nbx^$EcXAAb4d1>g?`e9@fseV-yj=<mP6e`OlM9bwbT
z*Fcu;M*`$m4t!!r{(*XBxThh##wB!-_WyRJ8D1w8KxdyC_f_bi@hr`mr}7FSBAG=O
zY}BQrfL5}S)HCb(`Cp@I{{vhaK6=J}{1?500Z>*U|6Kz42@V1x`hVyh@qUy*0TiAF
zZ|jH%k+nTDR4UExi{!HiKZK-#z{FB$nQcgnC5z-uQ#XqbsxL@g@3JuXAv0i<!hXT+
zRDExwK0QNVo7+{U*VTrTS<lDY3p77$jMB_4K@e&aacx0zesnxcii@%f_d?xxthKlp
zgiNq{o$~;KT^m?$?NVH{I|m-{G0<(qi&dl^w`KbB_mxCbjQ{OU)C1;KV=LWSG#!o}
z#GSG;m>j3-IBu4G3}p4Nej~1!J59!WcW&S@?s9|l_&%6cs*hHBAg+U1Zh7}nHeF{Q
z(imsJ7QCBtRF>g!YL4UlQM8F{+~ccwnGDC31c6RT@mm_$MD%l6gC7nM4paRd^u1!M
z?gaAjHPmo<>ne*ZdTK#JCS>$atgXd;Q+v9|uHGL&g^mRWHwG067O>-tJ+}E(tb54&
zStei7WwUM>ovske*0y@1T9Prgj|9xC6mtcVBCSo_L?0KM6OV!WbDJT@D2H{RwyyMd
z@a3T;L#0^E(Tt5&^f@$8CC9+27fcaMCo2#0Zu~?7>6<A&mJd%4Cvz&y72ry$fyIk-
z2tTuxP(UbSrTE<l*CyRg1+5LHUSJ}GE;t~}+c$1VI>R)ata1~#mPy3VnMkdN>Fp*Q
z?fyOJ`&XY&Xz7lb$xvmB)X|`bx;nmO78ju1?=rwRU3wH%di2B6@BwV@aLkOj{DDu%
zvHoW7mBL<?C@P~BHCfy!f|~|Rkq94=kFY{SvUX7Np!g4_fj`vsoCjc?@Cy$nuPcVi
z03T~qS0MPxH-nmys^|aL)y`K<B})0mXdB-p2GZ}4`~80f16i70`pS!G|9nO#HqtVF
z1@gxV_>t!k6B7PGA`BFRDkX=u6b9_<lR6<okTN-3{S19vEmvt=<ShhWe+zD|=vb6A
zjGV4kX|Y<~T&&u>vc*4ts;g+WYU$W)?x^o^`u0e}Lq~p&$#lB<u0QA=zxy6@fo*^8
zoE`%~sJ}m?@U7J1M}_5=49m5-J6quM4Hd5MhvxA_&-qI5H|1Y6r26gOj6vz>_8#Bj
z9nj(>EBGI6|Me{-?)<G7?%@kQ?7xZvB>cqPz+7ozNoA$-ux}Cn9=s&~FwQJ9^jRud
zUhc_RhcruYermo^jx_8TGmBDn`l)3x5jl{lv}gh#Sw!04ys+;hnXJT|R#kv_4M{Sg
zdsKR)+_cZUIH3YKqUgR?Q7Rfe<y0NTOsAeH)D(-LUZ~ULRV9rm6iv{?Js(ZMpDC10
z802K73}-D{E)*DUvvde!hA^SvAsAm6yCX1^Okh%RN~WbMl!%&IGB&}aO;!=GSOOY1
zVKtM_TKU(jp0?7GpD(&qkYYPuC`PUa`fib6pSqg#(Q>FH$Ov$Vt=d;d+j7W7u|ght
zj}?_1g6cGjcaY+OLPbvAwkBCeq&3^D`fF%GD$WXbG9^V0y{{pCf|<@qlf<W6qfXc{
z*;qMkH1D}Gqi&j^B0-OBZnnMCq5vnh(6+JVE@C<&(9<Q>C0&ar5{pJf65V?xmT1wW
zpHr_;l$*tDGV(VUmyB~7gtauilvL-knpoO|>F3ip$kH2?vH~_2Dz+oVM)U&~GsHE)
z@6)ZvIdffl(i-m$bjSWqWUR>gwQV6uOSR^+0Zh!AFBqQFq5{gyE9*9K)PXcmE~4*y
zrk3;)K5U0I&8;~MOk2w*jOtw^aTit>Qt5H2iz~<xti>#wNKsnVCyQ32PVJZxBu_13
z@al1mx1g(psk;-$9ywH~h*ks^kEzjS6hUzLV%n>-!UarCJeY^f8q=k!esRvtwvlV5
zZWH<cKxt;(nVVGQHI<}#UVv*zh*FqRO`H(#9aRS;;j#J6#GVr?MW&49-SY|E3s>Ze
z?E6C2PM?(n%f^qA6@>>$=&~>$V3rX(7wK7px|K92hc__?P{bki*|%~qPx}4B>(05u
zV}Z*i{z)tx${A&0_4fa1=<YsvKu@L5U@wZa@zegG!ZY}|Z)Ia@1R|xGD`!8;>*WiR
zr<h|tlg`yk$qeQZYfgHPhKUd39o?K=ICrN-cK8YQb4M?ZyKk<hPOXt3XJp$wRDP6V
zVT}kUFI%`1CrPH!Bot>YSWMwh^Y2M;#$PPGxbvzmqcGgTxcl%IZL_Xl6!7e7e;cSn
zxUbm$VStPj#(S8M1`_{PWki;{s?3Vv%Tf&oEoON3!sTINKICB5%5Ns3+_ZvaD0xb&
z6R7!3BT9&*b*rpsvv%;5^tz&YDNVH$)|<#FDA$kCKXB;FloTNW7vaP>UznC|Mn!Wo
zTnha@=X?K0U!Z%E4EoO*XoZ|$^V&FoF867}$25;J!T%l=8L0Owd(PVnNuk(DN@nV-
zS(w`Nk-f6Zein@QBhU<0p$)3O$qPP>ywd^g^5O^D*v^kN)n*(hXZWY5@`OwsV)KB8
z{DH@Esnoiw(b^(e%;u?eq9%5U0#Y{`_ra!VX;SFO?o`y8seCfr+zcL`WE-^_^>*dj
zTGPFa>cb#yN1*=c%T$u(aazKvhO)4+dZi-u*c|>ij*6;Gw!y3kzBOT&SKWD5Sg$cW
z6>(5SL%2G%0s!!B+X#y@a0y{ML<3>lf9cPGxupfE1QtN?w#N9bgP87&>8{|4@e+Aq
z9N?wwg#KM$2AgKO++>bts||@xzhFFYZ0q}rev2xw2oxUC9!QfY9Zd?>CMj0T*J9!E
zFNU@wnD$q=G+i{uoTKtdzhHImy<#w~83-*8+BFsLq34pq!U9M@!CI%vo7-|!80$=e
zSevhS45p8xW5*}95;hkCFcW=(FVF>ZvUPPD3a4TT+e8t)H)5?0Iq|9+3RQ0`Tx79&
zuxa%afx{OQy?fGiEfi_e#IS9;6rPd}ccMm!Ny~y-wz1f-Z4$f&BV<XpY~w$KY~!?G
zUlX;>Mr_X9&D?idIbZiZj-4dt>fL$$O%kYshH@~!=Mz*M<&wH#IF@*G7Pw$-?|W5=
zv)04(7n5Ixp(iNk-9Q_Um=SO9EE&(?D56J_0^P9hG!CcZ-zdSh`}HvII1Zbq$I$_8
zVpnqqv3_a?5y9SNf5e{l7!GQ~X|@Hu47lkAwEwUkgbo1O)Vie!e`PfoB%8acB(3R>
zs4W^y+yxuTTq!*~-?vXwL_#(Bm`0)=>GNGbTR)Eb4>$E#&I)=ds4P@78cE-e$g2bn
z0!22$sTDN2b7c<%gzyv{wl_?N_QRBuFvFBd9G}uRu%{;;TA5wPq>Ia+#FRQJ&{(K7
z@AAlw@Ipx8vF}1J@}7{haiq2%k&$Fx7Iat$BNDni$&hun><oMFV!k9(0qt1_JY9y4
zP%00d+15`ey!GIZ_=gnqm{60zTsmG3V3%0rvEWN=R{dK<_UP4NvuCFwUF*}vvgHqq
zT6d__X8)fm>=)Fu4VDqV?kGI;`5|O2WMvzyEag<gg5(q-DYIm6eOnz(u8Ge=!t{iZ
z`A(BL<|xCPc4SaxdbpugJ&q1L#i_#0!kjx~I{G<d9eq>u+YTeR@R_VEyDV4lfWA(p
zT0DXYWq=E{C3od8t_7y|GXW-3bOht*h@Tk|olpOs!-js<o3(Im#PY1zlnAxdn>Lu4
zaEXYxMMHCOOTU;GU59*Z(6i7;bF99u8k`dAHi6f;(O|`>LpDF%xtq_Kx(sD>$;{(Y
zJJu`K_MV&bmS5Co3v-)@?mvN_0e!IPvr@<m1`?hn%JEdlN|09F+@ea(l-?^*&Z8V2
zU0SrmG+>%Ry`>+DT)7M+ArndVaKqe>K*n*$A~7=(eIrPxMx8HE4!n=r9hV&G2Phgq
zJHxe%>fnFCKzx%j>aQ<OJyuV?vgujyD;8=b;zG~=L?v$~M4I{<W658C0h91vofJW+
z-94|Gg1-&Sqv@J6#v*)C`5%mCUZMN)pcOxgu4>SKz-{ik0yQy!1jl%*Kj|~y@B1xu
z)7bHFzW$%az5*($?R^_WLK-E8?(S~sX6WuAq>&DZk(92XyOB<5>FyE`1W7@pOAx{T
z$nRdS==#?B4$J};&$Him$2n)$`|Op49AL$>7gq_qAE?ZjZ-k7_<6Oru#Fe?s$aa)`
zEuP0PYy$~too=ySUIA+Mtfs@wKR#gaMzGI_rfYyb$_Gmde<f>5G^W19{&9KY(vO(g
zE-sAffAW5}u<Nj-U`sG&fBCx}9H~raeGB_#YnG_V!$qWk7(vvhBU+Xi^^QvfKGBpt
z)C1ec@SPwx<+OJ!wQBXn@1n>g-CxWj4M*oENaWidBNY+7iaf0#<F1ajf6`nrP-5kF
zIpOS8a8(ALBIc8P#Cx20MP1n}pUkI`+tQ~D+GQ*9<s9Kzeced?N|SDcA*hG1``nvf
zOADL|_G!t}U}qMVG){_(dXBnfXqK{~`ISmuMwJ}U6^S)!M=D{VZTL3QL~CGOHKUth
z5$__(v|+Wntw<Wwg_1I}_Z;c^mD4WBi)pWl&mI7F!N~VPJ#CqtyCNRgWXz}}=>PnR
z{Z#@;By0lEAMi<(k1f*Xv4KKBFnU*fb%)Ow+tWF0M|wuN8rdlu5c4SON6qmS0tbQQ
zbel|Iv0(jEa9V<0&#h>Z!|jvTf&ubstTg9X2~oLOi0_Vs8e?Dc=ZvBwO4k$w9i$a{
z!cRX26Yn2AOY^Avq+(+|oKDa`DJ!kOn1p85Okwmil2fxIhaZ5BzER%u8VQl}lNt_@
z#tfstcVO;tth4S+ppIPGW#OLQZ25NG><rU6(+CbR@2ky)u;geEu^au6ChuE6R2152
z1+35Gahc0bdx3>$JvzEo>m{>c#k49D7aXI~U_4wC#6VZtam&}n0VAMw<h{N`K(}U-
zzcEynduTFH2D1xNeMIr%cz&lx#FW=>)aQoyV)fz0Fm~@I_SuL*Zz1xdlD>D&Jn_?y
z^xY|_y{nZGs*NjqVEIGI`NM5DRsBc@&QDMs5|W)DZPEIh#2*+AH*&t?dJL0ZwOqq^
zfRkS{snm#!J|r~d@xl38^A_>cNrYr|2a6^>ZRU0ATBRCZvQmCM=Mfo601J=$Dd+%6
zwameiTedm(>@{vx{EWnhW2G0*W0P(WWccw!%Y>rLh^}gMRyya8+!A-G+Z9QiT>&3W
z4#tu^j%hs;bX!FI!Uv9u&#tm9$og}?Jp&sxv><)u8&F==x1QAP!cRQb%RJ=saoZ4G
zU7r)ySXV)Ju-5$`urrod5ZZ@T+cXd9gYX^H(k;uEg%O{;WiMA#nOCgV0b*KzHXX0R
z?^=uwVM>cMHGI?%0}>9bee-^vEgUWA@w0LiYENJk5uLRydXpUw15f&3|B!e8SAH-)
z&362dSESk4)??&X(*`V>`CMe587$I#zHUT1PBP|8*QAa{gKjTRtouf2qeB95wnc(b
z=z<ySRPBtVQ+uwF>cicYF1vH9pN2=PNp;lM4^^2smDTE6<Ed1yTk$GKO)pv}`XxpI
zmDjpye$+e>QPXE(SmB6WcCI<;rV{{X?nfV~e_>=f7LKqtL?=2{+b8OGC#WxdYBpiP
zRTxjdqFK|!J)AAGvZdhS%A3_x=LZlZoe1dUP8qlWh5VpI;vBTaUm3w)z~iU~hB#+{
z+Oqw9LdASYdoKAA4lwWwe)M8q@ds`S7j2MwM)|xfmKp%SuHw@V)H&m3LC(RRMvF%Q
zXKPaLW1f!~ddjs2CU0rBQB<*yaSZt&5x(c-cB0Icq1Fto?NF*zW~chfNhfp6HFLE6
zx*za)_6J;Qgk=UXp7R!6mPIU24^URbf>5c{mIDJNvl+&%DWIjJvpHgLDpg%9Q_djT
zsJ9XSgxu>9I666n1mp!(_eB5~>acuWx4@-%YJqP=?s}PN{xsrk*>;((@Q(n@_2F+U
z+Xf`y)U9KJ8AEN6p~C0a+114)d|=d8&y?iG>p2!bc>nMVX1Dw%X!v4(_Zjzxy=?D?
zxi3~6wH>OoC;bu$5-Ww>*O{}*`Oyy*G#1s|W7XW`Gs5TDiNOk!U^oTvF^w(cu#U$I
zh42W@uKS~4aZS?VY+aLQCg!fC(5xj{G+xg~N7jrf!ZT(C;{%^3U>THIu)@_-lxm_-
zmz|HMhYyx8bT)_zQ4!S&g0ob$NOeCL{rIprO=Dd6{2*|ryy}ek`Gp{Fm5A?Y$iU>X
z<`hH;2E45v8riw-TN&R5=B-=NZt|;((cU&Qv-+YYHH+llI4{`QUH`>uaMN0X2k0BE
zXzWYV3N{cyPpHKE*su5<g*7%CMC~Wm3LdgOwa+>cY`a*oQ2j<Sb*Wvx=C|+Zgh%O0
zWA^Q}i)zBr^{b%8$I-1v7?D|O-wxDXT)@7#;8AokefJ7GU*D^B77Y7I5#$l1UCyv~
zaWtxtk(_{->MbI_;Z5niWxvJ!F&{p0J)Fq=>uC~=gv0G4zulVV`s&fMmG2W-@d`Aw
zSN1K{o^^`i95?56cDlyf<<-Mk{yS_JnAyGqtBg0eyCfc!l?F=Gy{LURcsm}|4g?Wt
zuk%NxFPuij0&ZZgaaAw0>y&F7@u%o70zWjz-1ucj!|lD|6N$Ou-V+(W)vMI5?TEfP
z-+O+Ph}o6b6n2(v@<VRg5PB%=mFUh7nEQJuVokpG6+&2Eh=Re&GopZjj`=7z*FZGv
z-j65&q9_Tud7<p8-?2tvAfNN7(unjk-yPVr<Xt}YVZ9{}lg|rd?ZmV2sVvK{jSFB0
zzL+@u;F7)Vb&zEXzWsIqCyJ#&prL3ZYgU>}W!P6ALiLP0B}H9TgMA{lq$LUg?@c^2
zQ^-{Omv>_=1GeC33oYU$pTW09n))lJx~8(r)xrB8%>mhw9@(XARLRQ(T`tqr4eu7}
z+hlxZ$VW_uDx8bEh4puH**|yGr=z~tXZ0D;2X8D@#_on=CN=IIJ)5C;_kooEF{f-d
zVMJwd`6=41-wea`hf{s&kldkZ#@nQHbUe4ZJ@1CstU!A(8&#8b@{pS%$5}H)fQnNX
zD2KW+Z@NI4+s>8TBMiq_5>fx4gYZ+fQ(qe6tp?<ZF>q<wCL#tes$iW14xokZG<v*g
zI*B}dk>P`b-;Z7wB*xgPZ}hIka%2v0aFm)T^(;<ItG&{E3I*8rpvRQyrpA-`gGb)T
z=O`jBYBK|{rW137l!0XmzZwRIBB{kS{->A~V%NY8k3>-3h9rhSm3Rhe&nt(wx1<C#
zi{U@g9Apeyy4ti_Tlc-&x-*%-yo?crhyP|;M7{)8xxkhaRx!_xD~zeXE}-Xn=GuTF
z#oJC+BT*XQ_u?z17^C)7&s<K8+vXt82WJ_QftRB3U>)fRC)D6cc!I*@_{)W7g=DNC
z{%(~;)L<ss2mMG&uOc<|#HQk|qc_zhenbY1R&UQdU4_8tST#5JH)GNja#GP#W%pfS
z`U;loLNqoQ)xMEvLOA#Er}w<5G%J8}dYf%bK3tp2<fQl_g@mmpg4Y~Am_uyuJ{35U
zFYwSuNq~d~cTB6D1C)>_KWAtF0Ay7Vt}OXs(j0#mE?g_gr@$YgaGaBVznumCbAnj4
z-!w8AIw70^oe<`PV5PA^jFPdyOpJyj$#iJ}nv2X9^y{>t{RB@aVV|HP{6O2+OS1Dw
zU+&w<zkGO`C`mTei+JR8xh7*8=~2WezVz_YWqU=?<v@6Qe6&#{yW;`f28eY$Hz%H5
z<1C-98+s--LlKA}MKw2vPEj}IJ+?z=oeQ!9ebX4`wqGWBU47q2$C)(;@Uj7#?^4AC
z=b7i&<b{DVuH8I39zM-!=C%N5Fn5S#UzslIXX>RlNsWYrNk0Of^Cj(UYBtyP`|9_q
za$q?u!Ui@_5H<{}T+X^NcdQ?gRa?y)oP2N5{pvMVGg@kvj#D+Y>Hw_w9KY#2agjNu
z%IR<jj@i%oeB?3GCgzK93J!J<SI?b4!TA7!>8VryER?FOJ5F)oE}c@#R)^X=vkLg;
z`NjrbtWt<q;z<5Ba<>&(Q~RxbhmCMe-{dPn21S(6kkd(Sb2hS3Lp1B1-Zl+2N97(N
zT!8eVg2*Cti|UqbQ;ZZ^GJAigJOK+xu?sF_I`uW@&W|ruc6Pe&V!@#G&D1IV@d&3c
z`+Kq;n9d@oMvH4SJu1l~%x!tv<LSVW3an)ZL;<z9XK6MUR1SmFF<**566A+X^9_xJ
z($AzNG{e4d3B;~Y$1di!-=lQE_K0IEa_@4da+U3VY~BI6@i+Qjkk`Scm}-X-f@Scq
zfOe7XbC@*y$!DHCo+_{fG`u=Hc981p<SB`naZdRmC3UyaFsI%{j$h|aM^w8RAt?s`
z`Ji40HAaOd?|N6SdgzO^`tY{}HHZ~xqYGG$weWMn3w95U$i2jyOtFhEu$HX9_>!$j
ze;Hgu#g3HWRAD2xBx@@hB(E%XM4J~(iEDD#MI1<p8kuHSluxH0c-<BcSUvz6ybNco
z7gxUdBe46XS&Fg-x^ayh6(VXS0bbT7l*0Z2tOfPdZc*}(F&8F0K#-NwhquYKLe?<t
zc~ulpkJCz}phMukaS(#gu{+Run6=Sb^({V}MA-M@@aRzG&@PE<sGnymC4<xB(|D#}
z$8{^G$Hhbk_y(>M$A@tZ^)bat;$*~9o1DB(e|V5)`SF@}+t>Ecgdi;{D)5Ic#K&_r
zQy~~N??YOf2GXy^e5kr!RggV(kiZ~0^6yT!KcHf!=qY3{m61%!wa}X3_Kxl%#W%FX
z`~($_n~a-vbt|mys7Uij*e9|Um!quMoWoJyFw>@AXie*5%j6ohW3pvP%^*<NuGjHd
zss&QpSEWiDaoYpme2Tj9l>$#VHlBv~iORpr0PPHy4oJT$^U~*Z4Vj6X+RSp!>2(gz
ziYl~IpQ$rn{K9UiVlOpPf*;b3;G(rSYY<amE%9-x79K)|A+y`1C8n>g7~$wdp?9K`
z4La((Ft=~g7oKQ|j4WSrJy#WPw3AYPl2^ImiPDf1!OZAYYX!8{H3ZiX_s*Q3))~EM
zOXEMGC>qh={BS0@FFK)-n_dF92ER2ym|&Nb({rREY@qE7?^ct-t2yE<j=?>grc9U@
zsnsm6vW~N~S`cP2U5-%hHN`G_HEg|(SWjZ;u@5UeN=iCC^rV)S8F$78KR47c<j^Rs
zho(`$`h_j)@a{!cS_4?_?JU>$t{a-+Rd}+OOCe8l;^$HD^0joM?}enQK$t8(JZHtq
zv?tF%dKvSR56O{rJ7zoOUm49X@hni+@{oZ2fD1{Xgt(seNYK;#o*eHh)Wdkw{m0L+
zyc}-Akkmuq^(DpnVM)U1hWUDnIi5;nI1HlUXK$b&3|>BtvG4&0S9zUAMbfdbXOxnQ
z_gg@RPqYlVy#opbowkM+IJ|YizM74U#aW<Lsl*t(V(*puC?55P*&E+4sbf8Gz5sBS
zuX1J8qnE5Tfmhk#-<2_izlMSu@IPj`B@#=g)fFK68}SvdKgP&SLnJTJ{m#+=J&ipe
zP2akNYmVu4X(u_jDruPGxG@jcejBpNB7D-qiODUTkE`tg=#DZ~I{KO`>ON1gqBdpT
zZ2boL`&qn5G=H4cB{60+*E9;=PW~s<%PO46kKQ&DQ*_et4ipc}lso;3qA_k}8~BDD
zG7vioqhS#oVKE;X5fSlk4ue>Ro;|E;RysA`r{(7$xg>4}1Api|x}7Z&6_-uK)QL`-
ztR*VU)e(2xcwb45G<z{+`JUhAdg#;(u}k#5KED4<gh|51t{CFGbSFLLqiM1DL%&2S
z8KUoK73s=kHyU{FOf)sb=C^~)dWLdrBwC$Bz^d5HRE_=ow~rU)V`Ch{L0i*Ui}>vW
z6m9~5tZolO@D7f6CbcUNzT2O45~mQfgH&}{b4)otJxGe4;Mk&#gcyWK9kg5m_6u`%
z^+Plik)&+^tvdx!_+*+!s=KCRzxSPXoOKDZ3UJl7<`GSLJ_(M`JM6Ys1TC&vmvztJ
zR;~eQ$C(WVP^I|v!!m3gVxL8Sdtkld%<tLi;@=c0?Hw)iX!%@{hmR!FiQ=dzJ(N12
z2UgB(W2$(Ee(ha9$?)eyhHC23)@o`dlNyAAiC{03Lq6xv#`k-Ybr)^lAN;md%R3Za
zl?r_`mqPbA2}9S-7$BXKxZny+L+CDbOyNeumVNgcoZOe8ru5<?GPwwG7&ug>vIJZu
z)&b8O_x11^TR$Dl#bmFu9`zvtC8MZrVZaGa4!SmSwzy%enVG4a+lq&y%Qsih-B~aS
z3z6i}a%ch^C)V=$*@Of|?D^yo8R5EU44*WatU^JmeevNBB-(bl2*4jIaezxEvUtR*
z6Z7y@y3*}7saFFAP15$)7|$}v*M)hPM@=zY5i2$6s9yBc0}okxdQwe1t9=?qbL<4U
zZFtDxyvL;bFqJ*~@&-kxN}S6^gXw)mUJttCtHl_-C^CEg_EWbuqt}Q0wsza4kcEb(
zF9bpQXnPzp>0!6FwO!zkTBs*M9+4nG8a>I8w$O8@)+|;p=*Z>E`(jiO%WmyjB~?^!
z%~zu9ATqzw_t$TC0tBBf7il@C<=O0|oOr4k?!cGiQ2G}{N9fE=#h?f{fE4?}qnC6v
zYl_T>2~kJ<hxI3fB=%Ce&*jI$v!4O>aFT310G}rMy?mZ>vAqS)BofuzGHz#(_k8Hc
zC=B;THAz7?+8<T3b;~dE=2!^JF|^#-ezO?Jo3(1;z#Y}Wq~4rfs*w3?yiBvljdLWz
z)v0*g5oasD{gPGtqTI4>snFf8(v?jqHHWuA>2MqqVJjSNsKDSwcu?*n3EHGNYn(Qf
zWQrXJuQyVXnK2f4c#N3h`%o49JGCq{2{TIBYE@KKCMo_>azW(!tODs!K320)OCw6-
zJc{P`tSV3IuP9<|xmUWLSf5Hd!fzy4HibXR-iGmI)*%0i56au69BC&%K`)_veLW4q
z-xc~s5=Pm3;j4YUFgHsDr$9MOBj}1^zZ_6S*nO@AB%n0scPSt$J{+ljoL4uxo<`BZ
zp*xC2A<d)Q#ydoTe}i_vMN>7YeHVfX|LH=7|LCDDm>BYX76Tj=Z>Z42h8?2(tg+>a
zyW?1|S8HlF3hxVGPz4(qnR&(19u?o7L090rz0oDycU99Qae9`(i=rW~({^QaT9FRp
zk1&oX13W|vj-j2=E>CI2DI7CQ!nYR`*o#-{sGx_Gt+&2eA2F9V{Y<$d?9;y~QJXPg
z$0t6ChQFnQ8$bqb;^;%QeWQZhUm|j{OsA#`N9mqw(>4e+OEFDs6Qmu4KY!gRC*Q_r
zvBHSU86SDd)Fbo=U_5o^^(0?fh@0<ybyoy}s-~?W_lSq|Ibb{~k~?A?v;DfL=xHRv
z$Z8yPp3x{YMW|L|D|>dmf9naw`inJj$Cfk$VyVd=F`|yT&5NF_R&iJ?Wy$kmFLU4{
zs_e;i;1u>3Z7fS(AlkjL>1xqxK`1OvL<_7fNn{SJtw<o=`QoPgK3MqX<Bvaj@1kP`
z?4O~f>jT}v|39@3C0}Cj7v~vi?Atl5S~0CoCnx#EkhIm<OWZzkYCQEtsx5*iGX&ED
zXEcJ{I17&{M}oC?D9@O86a{m~u)kGt-pqX6kzmV6jNCAxbp|~9291#E5Z+!=wv4&R
z#sdq%#r6r~)7E%KrcvXoGC6OW%Qn%O;gh~{e3b3z!$8AGRQBKkoQjH{%wLJR#xTH*
zKkp>b&o;+@!a=dHO6T~&6yWN|MsTbf64qv+{jRjae%|$s8s{u`nbG{{ej8}Fk*hU#
ziC^59OR=Z9*U@c}^j4so`?<%ea~Kf8dTenHUkRy4y3S~Be@U-dI!Sh=)angzjHkEF
zBH^K7$WE!>MC~~vIAqx|e9U=-Hqd#Q%gwu@h?_v53)fe!-&-IL62jm;NwV&m9SmCF
zh=_hB82l<4luBgG7U^lmipwmpX=^J0HojI>w@uU4jEJ^Rd1uf_y{7zjgx3kl#$8i(
zek-Oub8B6W>iH`3WPSDX(hI_-ea`}kQgOz9(ECl0Gm#Vmm`%u&v1D^X;7gJI>T$VM
zZC<Kb=-0X!F%~^wtGG3VvtvC9C*`J=BeEH?^fAkTeaL8>Id=LX-9m3Nkug0TD1!VG
zZEis8Wg2LRcbfRr-&&Z%n`)yZFbO-OE6C)WSYme-hSB|v?mTe&WFvg#+nJ>vi&;he
z;4Bi}sWS@?nEQQ78VKod%QDx;xQdVHBjcnBE*2vyO1q4n$f{`mTf89SQVhJ6a*{KN
zL6qhb*}C(aAauPH!Ef-z-dov~uV|tXO?3{-kj}kJ%q!HU2%|37nG7pWeLrjm;gx*`
zaGw`ls9;a{A~2Y1E`#{y<z_|_w7ms^-l$0r1Bd(oU^}PStX$vS+gXLgMwJ%=wyqs%
zA;y;CI2menm2pf8!k#O_1|{xqqAwO0*KfWeSS)PMul~Te?C1rO_A#2C<%CZQMh5rf
zwaw6lzI=Ug1`Q5>Hg82zU?f-MCqb4fe@J$TG6v_Fy|`f-1vGm}jcF?9Bif*<M=8`l
z#QOnD6Rcm$p3&EwG!JGEg55nglr7Xq+cz<xykdNy%${;fEcCL2t)3}L4ovwaHRdLA
zkY!UXyeOAyEs?erz#<i`0A81*PoaM*<%vi+;ekaTMx4t28RsOE*1n~<E9?MORg-=E
z8GBc)Y#smR0`%BtJcDniBsDy~#Of(Di>3)Vs$dv$JMu6tV&9C-Ark~O0F`coThoII
z*;yBD=7!?A9LJub4{UN6)95|yGP|4}t}E{pB0n9+T??}`J;gmDKQAj-mV1GoO{0+U
zO-@cIIXNy*yGCBPTLN=pi#v4Sh{NGAi~P;D8q7zP9~D#`5AQ#7Auxh<GhO|^@A=B8
zlLNy+I}(l15fjJVo-d5dC*UrJ8Bt8%jRmLO0<K5(qGFhflT<)LbqBgoI4oIN)rf@B
zS1UYWThJA*cl}aF$_7m@d;Kw1^D*n(^`>dmLaDu<xm&KZHP+qUY;Uu|AUYE3EV#$^
zxua_$PSlv?JLHQEwxgS4c95IzMm-659~MFasvwj-JaV4>I$N{zstv4mAPt9=g@m)?
zS!>mA*_9IegKl;~{jE-Ko6aR!VX;6iAVzq_&W&=bwf%9=qzfWw)je-Yb};uKc22W+
zcqwRI*5|V~QOV^F1v-VCPL;<*AMIL*_%{buE&sEnD0OibfN`OD&<XcQs!+ELRq>?V
z-edU^aNyU^88j}7EJ<L_z%ineIHAZ*ocE2VXH33IaT)Snw6A#59%9;@_o*P-3)^p;
zqKKb^Yac1GwrIc|`sN^ZutR311CXoZHgxwI(|9hB7i5N{BdQxCxwI}09izW(uaMES
z8Qji3(vJvUwn|b8Fo}^A;+sistVQZ7Kgv!F_Ok=%J;g8yrc4GiE5pqlU;sWYu&*BR
zmf;PFXWfXWb-JUmr9P5>q>^fnJpGA5LV|ZB^^mP&B|ulsgl9Sdo96gnog@@?{+JBb
zFBG^FalDge$QgF^cC4JMFH&tVFT{s~-luOaWiXAtq3BX)-iJv@ikjX#Y4iCS`V!FG
zvp7U^W-XlHpw5?g6u0lgA3e|*o(x_g=-XuY5p-CM19|EH7$Q7Q0PfQ|RDuem{jk^P
zYa&r$AiI?*f4JEFhU@|Eq#6@hu&K)9@9y>!FH{Z&&oPa=5RZh}rgGu|9jTXePlKE;
zDn)A&aK+b?GvBAa|2RH6Ho9LW^06H*biFxLYjCVyQnFqQSB__|4~YZ`fO8aU+b@Nb
zf_Ws{S%Ab^Bo*q(v<eP;$tRJ2F3pHQf%=xdXLQ6%eF#T`Uw?8lsOC-KPIE$08DqGv
z#uz|X*{0<gkaP5Wp6ADWH}3ZEo++FyYF1F3I{spliI*i~ej00nqCeGbLYyYDZFtGC
zuiVbs0f%d^v3_al>}cMb76`o<hb&4<Wm;H(8dIq`x7N%+r!|-lyO`J8&P(2gff8iJ
zex|9wUUAk?h~M(^p+swspmy9eMY;A(3EEZ#1s=9AYn5J6(Y9G)y#HdBwh08op>OoG
zS95hLnbXeOxs<8iRnC2`(ZkO4!882MYA<@yc6U$JRz8D63ZJkOixhH|34R2pcMI%w
zHfkF<GnydI-Wf1uR}AB0A1k~g4e`e=4?a;dt>Q~4SJ<&B&bn?EwwDmLexs+JGz3zw
zAvib>B)xXGHLBKuZ!b$TtsYNvwh3t|@flgx`=pQtIup0oR8}01IyUUnQ0~_NvisaV
z&2_Fal(NM2H<NTLGOx3#0RUoD5~F9Q0B}l{2ReFUMrz=Ot64ts9Q5%rTnXc=SXoP+
z*>X3}1_LUSVCi>ZlPlRgMl89+Bio8^$69sfUzg$Se}zYwc#q?k<Ym2kQ#Bhr5g1PL
zZKQF^`{k97PY%|0NW=th+B|W6dhy%z*Vw4OA&daz!=9VC3l`Vu#bGzQ$7puQMm$k0
z@osU^drmmudD!&)AxVx9eb@BBZ?M24%qT>Wu5<XTBW<pxBe<xMK#?_(m(?T`K=s)D
ze6K^8b%92~mmb2{G;v&>ukGFoI`>V$zDHfueUNE~3!7BG{73+gxcSL|;aNOkMypIl
zL_jpz%WKDLK6&s^A6Ia{GP3*V9^WTvzm&e=&R|MMU0Aq>19mJ{GGon{-R@e5_L1ZU
zlmZg?R)u)lymAgt-fmz`$zZqB2w?RAF4Y;s0iWMW7I%_btB!ga=uoAdgo6Lr5P1<4
z-7NzRKbC@&_t0qn|EM}PaIpWb>PR;{ArEAsZ`fjB7-Jk71-`jcc!Yg`4fj8>Lo`9C
z_Mvhwt{^7Nz8KUH3{Xl#j9E@e8X7`#A2rjoilqbvSV2G7Kau}j1^$qnUSjY+>7hW=
z`}q&(JLK+yzDNGKei|r&{{AzP`uDW|WI(&8zcI%CVf+(&{r@CF6@_4){7Z!SY3uT*
zd^qNx1js}m;9-G3BP;}V7$?3ThxRwWk=w>!;zAvFggPzxD=iq90)LDL|ARlmRQGam
zwXj!le(q@D>}qY{0@3Ry{ymNDJsp=)D0d0^p}3dEtA{_+fG9CzF#YM&lB^U1Jap);
z0?j+;J(3gr9SIqq>@Sj8m4Ax~)LTp_k@+5J0OgJ}I86GxXHdER@=ws5;X^B)?H=A4
z{SI$4Oz}IOQOW)h0W|vE3H>hO_ZOqUzvu}R&-^=fwULhX1d7WfgMop5|GEnN9}?cB
zt;mh`R|ft&<^9hLa53DGfUpFRjz0L`4c$91`IniWRV2oG$Dte{_#J=mq`Q0gLH;|u
z2?gF?j{SFp$)9z|EqO=cWBI!d?<v>cvlJl@B|!tu6aar&x+jo+j|5TtX(_%R3DVk+
z@_UYc>AXVWl=mpe8W2VcYVhxk>*uP?e+sTJFo1i63=J3<Q#Wfnb7p4?GYe}+R~E-#
z?fTDDeiHw^r!jt|^7B5+(7dOPz-DG=eeeFh^WmPH>MuI9+D0`05m)`yR)6B})Fz>@
z9q5PdKR6T*s|(3>r{rY+pOE~YUfxrryvN(W<3R-~$^I?OpLTxf{y|r?ehQNPdlmTa
z7(m!#=plk>xc4gUC+SXl4LVh!04)#pe;Lr91^#o!Q0IssbE8DR8~Ic9>|aWOzb)uz
zW}pISM1L9irMLpUyLta*+!>L#zVi$ikNFqrPtl5hc?JH?c6XMDW+;F6?2n-Sf8o%a
zR6f7UN#q#T@A$jWR%p(PpdCNHU+AAX-*dflDs~F@cl`aZ%l`<_;&uNg2ovGn6Z&WI
zLKJ6zKB39{Ajq9Ue`WDrP|ANPLR~lm-(@l0pZYJ-y|99Nq}Kru|2(?C2zM*>(CVd!
zKL74NkOLu5D|8U!7x$lMKOMifJbKTHSJGYS=p>{5W$C}=DHs^Rdn8aQ^v)3fy*MG6
zZ8&XEugIXSmFXVVHVayuoWEo5%?RJaI^{y05&6rJdlPW?2o?o*ZQ=VY_U{JnO()&M
z?-brugpx1eUq+xK&Qu?01Nsil1^+z~V<}{ER`hoR_lBbPu(xG*1~4+Q{xb02u;kC;
uRIP-Pg#RM^>R>@FklwTMsRmNhLyoJW@bk?K1H%gavVw-D*wp^~>;C`<VWfHh

diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties
index 1e61d1fd3..26b61d748 100644
--- a/example/android/gradle/wrapper/gradle-wrapper.properties
+++ b/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Wed Apr 10 15:27:10 PDT 2013
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.2-all.zip
diff --git a/example/android/gradlew b/example/android/gradlew
index 91a7e269e..cccdd3d51 100755
--- a/example/android/gradlew
+++ b/example/android/gradlew
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -6,20 +6,38 @@
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -30,6 +48,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -40,31 +59,11 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -90,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -114,6 +113,7 @@ fi
 if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
@@ -154,11 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"
diff --git a/example/android/gradlew.bat b/example/android/gradlew.bat
index aec99730b..e95643d6a 100644
--- a/example/android/gradlew.bat
+++ b/example/android/gradlew.bat
@@ -8,14 +8,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,10 +46,9 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line

From ddbe4d94ea183d801c8ebfca2dac5a0f2748b3ce Mon Sep 17 00:00:00 2001
From: Yannick Heinrich <yannick.heinrich@gmail.com>
Date: Thu, 4 Jan 2018 00:22:27 +0100
Subject: [PATCH 52/56] Add a script to build static fat binary lib. (#341)

* Add a script to build static fat  binary lib.

Based on the platform file provided by the
[ios-cmake](https://github.com/leetal/ios-cmake) repository,
the script generates a fat static library based on the architectures
specified by the `BUILD_ARCHITECTURES` variable.

* Update according to the discussion

- Rename the name of the script
- Clarify what does the script

* Move the build script.

* Move script to support lib directory
---
 README.md                            |  15 ++
 cmake/ios.toolchain.cmake            | 347 +++++++++++++++++++++++++++
 support-lib/.gitignore               |   0
 support-lib/ios-build-support-lib.sh |  67 ++++++
 4 files changed, 429 insertions(+)
 create mode 100644 cmake/ios.toolchain.cmake
 create mode 100644 support-lib/.gitignore
 create mode 100755 support-lib/ios-build-support-lib.sh

diff --git a/README.md b/README.md
index ba8942fe6..79aca3edb 100644
--- a/README.md
+++ b/README.md
@@ -492,6 +492,21 @@ java -jar $DJINNI_JAR_DIR/djinni-assembly-0.1-SNAPSHOT.jar \
 
 *Note*: The `all` target of the main `Makefile` includes the `djinni_jar` target.
 
+## Generate an iOS universal binary of the support library.
+
+The `ios-build-support-lib.sh` helps you to build an universal static library for iOS platforms.
+It uses the platform file of the [ios-cmake](https://github.com/leetal/ios-cmake) repository.
+
+It basically creates one universal static library per `IOS_PLATFORM` variable and uses `lipo` 
+to merge all the files in one.
+
+There is basically two variables you would like to modify:
+
+- `BUILD_APPLE_ARCHITECTURES`: Specifies which `IOS_PLATFORM` to build.
+For more informations, take a look at https://github.com/leetal/ios-cmake.
+
+- `ENABLE_BITCODE`: enable/disable the bitcode generation.
+
 ## Community Links
 
 * Join the discussion with other developers at the [Mobile C++ Slack Community](https://mobilecpp.herokuapp.com/)
diff --git a/cmake/ios.toolchain.cmake b/cmake/ios.toolchain.cmake
new file mode 100644
index 000000000..7a3a855f4
--- /dev/null
+++ b/cmake/ios.toolchain.cmake
@@ -0,0 +1,347 @@
+# This file is part of the ios-cmake project. It was retrieved from
+# https://github.com/cristeab/ios-cmake.git, which is a fork of
+# https://code.google.com/p/ios-cmake/. Which in turn is based off of
+# the Platform/Darwin.cmake and Platform/UnixPaths.cmake files which
+# are included with CMake 2.8.4
+#
+# The ios-cmake project is licensed under the new BSD license.
+#
+# Copyright (c) 2014, Bogdan Cristea and LTE Engineering Software,
+# Kitware, Inc., Insight Software Consortium.  All rights reserved.
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# 3. Neither the name of the copyright holder nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+# This file is based off of the Platform/Darwin.cmake and
+# Platform/UnixPaths.cmake files which are included with CMake 2.8.4
+# It has been altered for iOS development.
+#
+# Updated by Alex Stewart (alexs.mac@gmail.com).
+# The following variables control the behaviour of this toolchain:
+#
+# IOS_PLATFORM: OS (default) or SIMULATOR or SIMULATOR64 or TVOS or SIMULATOR_TVOS
+#    OS = Build for iPhoneOS.
+#    SIMULATOR = Build for x86 i386 iPhone Simulator.
+#    SIMULATOR64 = Build for x86 x86_64 iPhone Simulator.
+#    TVOS = Build for AppleTVOS.
+#    SIMULATOR_TVOS = Build for x86_64 AppleTV Simulator.
+# CMAKE_OSX_SYSROOT: Path to the iOS SDK to use.  By default this is
+#    automatically determined from IOS_PLATFORM and xcodebuild, but
+#    can also be manually specified (although this should not be required).
+# CMAKE_IOS_DEVELOPER_ROOT: Path to the Developer directory for the iOS platform
+#    being compiled for.  By default this is automatically determined from
+#    CMAKE_OSX_SYSROOT, but can also be manually specified (although this should
+#    not be required).
+# ENABLE_BITCODE: (true|false) Enables or disables bitcode support. Default true
+#
+# This toolchain defines the following variables for use externally:
+#
+# XCODE_VERSION: Version number (not including Build version) of Xcode detected.
+# IOS_SDK_VERSION: Version of iOS SDK being used.
+# CMAKE_OSX_ARCHITECTURES: Architectures being compiled for (generated from
+#    IOS_PLATFORM).
+#
+# This toolchain defines the following macros for use externally:
+#
+# set_xcode_property (TARGET XCODE_PROPERTY XCODE_VALUE XCODE_VARIANT)
+#   A convenience macro for setting xcode specific properties on targets.
+#   Available variants are: All, Release, RelWithDebInfo, Debug, MinSizeRel
+#   example: set_xcode_property (myioslib IPHONEOS_DEPLOYMENT_TARGET "3.1" "all").
+#
+# find_host_package (PROGRAM ARGS)
+#   A macro used to find executable programs on the host system, not within the
+#   iOS environment.  Thanks to the android-cmake project for providing the
+#   command.
+
+# Fix for PThread library not in path
+set(CMAKE_THREAD_LIBS_INIT "-lpthread")
+set(CMAKE_HAVE_THREADS_LIBRARY 1)
+set(CMAKE_USE_WIN32_THREADS_INIT 0)
+set(CMAKE_USE_PTHREADS_INIT 1)
+
+# Get the Xcode version being used.
+execute_process(COMMAND xcodebuild -version
+  OUTPUT_VARIABLE XCODE_VERSION
+  ERROR_QUIET
+  OUTPUT_STRIP_TRAILING_WHITESPACE)
+string(REGEX MATCH "Xcode [0-9\\.]+" XCODE_VERSION "${XCODE_VERSION}")
+string(REGEX REPLACE "Xcode ([0-9\\.]+)" "\\1" XCODE_VERSION "${XCODE_VERSION}")
+message(STATUS "Building with Xcode version: ${XCODE_VERSION}")
+# Default to building for iPhoneOS if not specified otherwise, and we cannot
+# determine the platform from the CMAKE_OSX_ARCHITECTURES variable.  The use
+# of CMAKE_OSX_ARCHITECTURES is such that try_compile() projects can correctly
+# determine the value of IOS_PLATFORM from the root project, as
+# CMAKE_OSX_ARCHITECTURES is propagated to them by CMake.
+if (NOT DEFINED IOS_PLATFORM)
+  if (CMAKE_OSX_ARCHITECTURES)
+    if (CMAKE_OSX_ARCHITECTURES MATCHES ".*arm.*")
+      set(IOS_PLATFORM "OS")
+    elseif (CMAKE_OSX_ARCHITECTURES MATCHES "i386")
+      set(IOS_PLATFORM "SIMULATOR")
+    elseif (CMAKE_OSX_ARCHITECTURES MATCHES "x86_64")
+      set(IOS_PLATFORM "SIMULATOR64")
+    endif()
+  endif()
+  if (NOT IOS_PLATFORM)
+    set(IOS_PLATFORM "OS")
+  endif()
+endif()
+set(IOS_PLATFORM ${IOS_PLATFORM} CACHE STRING
+  "Type of iOS platform for which to build.")
+# Determine the platform name and architectures for use in xcodebuild commands
+# from the specified IOS_PLATFORM name.
+if (IOS_PLATFORM STREQUAL "OS")
+  set(XCODE_IOS_PLATFORM iphoneos)
+  set(IOS_ARCH armv7 armv7s arm64)
+elseif (IOS_PLATFORM STREQUAL "SIMULATOR")
+  set(XCODE_IOS_PLATFORM iphonesimulator)
+  set(IOS_ARCH i386)
+elseif(IOS_PLATFORM STREQUAL "SIMULATOR64")
+  set(XCODE_IOS_PLATFORM iphonesimulator)
+  set(IOS_ARCH x86_64)
+elseif (IOS_PLATFORM STREQUAL "TVOS")
+  set(XCODE_IOS_PLATFORM appletvos)
+  set(IOS_ARCH arm64)
+elseif (IOS_PLATFORM STREQUAL "SIMULATOR_TVOS")
+  set(XCODE_IOS_PLATFORM appletvsimulator)
+  set(IOS_ARCH x86_64)
+else()
+  message(FATAL_ERROR "Invalid IOS_PLATFORM: ${IOS_PLATFORM}")
+endif()
+message(STATUS "Configuring iOS build for platform: ${IOS_PLATFORM}, "
+  "architecture(s): ${IOS_ARCH}")
+# If user did not specify the SDK root to use, then query xcodebuild for it.
+if (NOT CMAKE_OSX_SYSROOT)
+  execute_process(COMMAND xcodebuild -version -sdk ${XCODE_IOS_PLATFORM} Path
+    OUTPUT_VARIABLE CMAKE_OSX_SYSROOT
+    ERROR_QUIET
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+  message(STATUS "Using SDK: ${CMAKE_OSX_SYSROOT} for platform: ${IOS_PLATFORM}")
+endif()
+if (NOT EXISTS ${CMAKE_OSX_SYSROOT})
+  message(FATAL_ERROR "Invalid CMAKE_OSX_SYSROOT: ${CMAKE_OSX_SYSROOT} "
+    "does not exist.")
+endif()
+# Specify minimum version of deployment target.
+if (NOT DEFINED IOS_DEPLOYMENT_TARGET)
+  # Unless specified, SDK version 8.0 is used by default as minimum target version.
+  set(IOS_DEPLOYMENT_TARGET "8.0"
+      CACHE STRING "Minimum iOS version to build for." )
+  message(STATUS "Using the default min-version since IOS_DEPLOYMENT_TARGET not provided!")
+endif()
+# Use bitcode or not
+if (NOT DEFINED ENABLE_BITCODE)
+  # Unless specified, enable bitcode support by default
+  set(ENABLE_BITCODE TRUE CACHE BOOL "Wheter or not to enable bitcode")
+  message(STATUS "Enabling bitcode support by default. ENABLE_BITCODE not provided!")
+endif()
+# Get the SDK version information.
+execute_process(COMMAND xcodebuild -sdk ${CMAKE_OSX_SYSROOT} -version SDKVersion
+  OUTPUT_VARIABLE IOS_SDK_VERSION
+  ERROR_QUIET
+  OUTPUT_STRIP_TRAILING_WHITESPACE)
+# Find the Developer root for the specific iOS platform being compiled for
+# from CMAKE_OSX_SYSROOT.  Should be ../../ from SDK specified in
+# CMAKE_OSX_SYSROOT.  There does not appear to be a direct way to obtain
+# this information from xcrun or xcodebuild.
+if (NOT CMAKE_IOS_DEVELOPER_ROOT)
+  get_filename_component(IOS_PLATFORM_SDK_DIR ${CMAKE_OSX_SYSROOT} PATH)
+  get_filename_component(CMAKE_IOS_DEVELOPER_ROOT ${IOS_PLATFORM_SDK_DIR} PATH)
+endif()
+if (NOT EXISTS ${CMAKE_IOS_DEVELOPER_ROOT})
+  message(FATAL_ERROR "Invalid CMAKE_IOS_DEVELOPER_ROOT: "
+    "${CMAKE_IOS_DEVELOPER_ROOT} does not exist.")
+endif()
+# Find the C & C++ compilers for the specified SDK.
+if (NOT CMAKE_C_COMPILER)
+  execute_process(COMMAND xcrun -sdk ${CMAKE_OSX_SYSROOT} -find clang
+    OUTPUT_VARIABLE CMAKE_C_COMPILER
+    ERROR_QUIET
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+  message(STATUS "Using C compiler: ${CMAKE_C_COMPILER}")
+endif()
+if (NOT CMAKE_CXX_COMPILER)
+  execute_process(COMMAND xcrun -sdk ${CMAKE_OSX_SYSROOT} -find clang++
+    OUTPUT_VARIABLE CMAKE_CXX_COMPILER
+    ERROR_QUIET
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+  message(STATUS "Using CXX compiler: ${CMAKE_CXX_COMPILER}")
+endif()
+# Find (Apple's) libtool.
+execute_process(COMMAND xcrun -sdk ${CMAKE_OSX_SYSROOT} -find libtool
+  OUTPUT_VARIABLE IOS_LIBTOOL
+  ERROR_QUIET
+  OUTPUT_STRIP_TRAILING_WHITESPACE)
+message(STATUS "Using libtool: ${IOS_LIBTOOL}")
+# Configure libtool to be used instead of ar + ranlib to build static libraries.
+# This is required on Xcode 7+, but should also work on previous versions of
+# Xcode.
+set(CMAKE_C_CREATE_STATIC_LIBRARY
+  "${IOS_LIBTOOL} -static -o <TARGET> <LINK_FLAGS> <OBJECTS> ")
+set(CMAKE_CXX_CREATE_STATIC_LIBRARY
+  "${IOS_LIBTOOL} -static -o <TARGET> <LINK_FLAGS> <OBJECTS> ")
+# Get the version of Darwin (OS X) of the host.
+execute_process(COMMAND uname -r
+  OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_VERSION
+  ERROR_QUIET
+  OUTPUT_STRIP_TRAILING_WHITESPACE)
+# Standard settings.
+set(CMAKE_SYSTEM_NAME Darwin CACHE INTERNAL "")
+set(CMAKE_SYSTEM_VERSION ${IOS_SDK_VERSION} CACHE INTERNAL "")
+set(UNIX TRUE CACHE BOOL "")
+set(APPLE TRUE CACHE BOOL "")
+set(IOS TRUE CACHE BOOL "")
+set(CMAKE_AR ar CACHE FILEPATH "" FORCE)
+set(CMAKE_RANLIB ranlib CACHE FILEPATH "" FORCE)
+# Force unset of OS X-specific deployment target (otherwise autopopulated),
+# required as of cmake 2.8.10.
+set(CMAKE_OSX_DEPLOYMENT_TARGET "" CACHE STRING
+  "Must be empty for iOS builds." FORCE)
+# Set the architectures for which to build.
+set(CMAKE_OSX_ARCHITECTURES ${IOS_ARCH} CACHE STRING "Build architecture for iOS")
+# Skip the platform compiler checks for cross compiling.
+set(CMAKE_CXX_COMPILER_FORCED TRUE)
+set(CMAKE_CXX_COMPILER_WORKS TRUE)
+set(CMAKE_C_COMPILER_FORCED TRUE)
+set(CMAKE_C_COMPILER_WORKS TRUE)
+# All iOS/Darwin specific settings - some may be redundant.
+set(CMAKE_SHARED_LIBRARY_PREFIX "lib")
+set(CMAKE_SHARED_LIBRARY_SUFFIX ".dylib")
+set(CMAKE_SHARED_MODULE_PREFIX "lib")
+set(CMAKE_SHARED_MODULE_SUFFIX ".so")
+set(CMAKE_MODULE_EXISTS 1)
+set(CMAKE_DL_LIBS "")
+set(CMAKE_C_OSX_COMPATIBILITY_VERSION_FLAG "-compatibility_version ")
+set(CMAKE_C_OSX_CURRENT_VERSION_FLAG "-current_version ")
+set(CMAKE_CXX_OSX_COMPATIBILITY_VERSION_FLAG "${CMAKE_C_OSX_COMPATIBILITY_VERSION_FLAG}")
+set(CMAKE_CXX_OSX_CURRENT_VERSION_FLAG "${CMAKE_C_OSX_CURRENT_VERSION_FLAG}")
+message(STATUS "Building for minimum iOS version: ${IOS_DEPLOYMENT_TARGET}"
+               " (SDK version: ${IOS_SDK_VERSION})")
+# Note that only Xcode 7+ supports the newer more specific:
+# -m${XCODE_IOS_PLATFORM}-version-min flags, older versions of Xcode use:
+# -m(ios/ios-simulator)-version-min instead.
+if (IOS_PLATFORM STREQUAL "OS")
+  if (XCODE_VERSION VERSION_LESS 7.0)
+    set(XCODE_IOS_PLATFORM_VERSION_FLAGS
+      "-mios-version-min=${IOS_DEPLOYMENT_TARGET}")
+  else()
+    # Xcode 7.0+ uses flags we can build directly from XCODE_IOS_PLATFORM.
+    set(XCODE_IOS_PLATFORM_VERSION_FLAGS
+      "-m${XCODE_IOS_PLATFORM}-version-min=${IOS_DEPLOYMENT_TARGET}")
+  endif()
+elseif (IOS_PLATFORM STREQUAL "TVOS")
+  set(XCODE_IOS_PLATFORM_VERSION_FLAGS
+    "-mtvos-version-min=${IOS_DEPLOYMENT_TARGET}")
+elseif (IOS_PLATFORM STREQUAL "SIMULATOR_TVOS")
+  set(XCODE_IOS_PLATFORM_VERSION_FLAGS
+    "-mtvos-simulator-version-min=${IOS_DEPLOYMENT_TARGET}")
+else()
+  # SIMULATOR or SIMULATOR64 both use -mios-simulator-version-min.
+  set(XCODE_IOS_PLATFORM_VERSION_FLAGS
+    "-mios-simulator-version-min=${IOS_DEPLOYMENT_TARGET}")
+endif()
+message(STATUS "Version flags set to: ${XCODE_IOS_PLATFORM_VERSION_FLAGS}")
+
+if (ENABLE_BITCODE)
+  set(BITCODE "-fembed-bitcode")
+  message(STATUS "Enabling bitcode support.")
+else()
+  set(BITCODE "")
+  message(STATUS "Disabling bitcode support.")
+endif()
+
+set(CMAKE_C_FLAGS
+"${XCODE_IOS_PLATFORM_VERSION_FLAGS} ${BITCODE} -fobjc-abi-version=2 -fobjc-arc ${CMAKE_C_FLAGS}")
+# Hidden visibilty is required for C++ on iOS.
+set(CMAKE_CXX_FLAGS
+  "${XCODE_IOS_PLATFORM_VERSION_FLAGS} ${BITCODE} -fvisibility=hidden -fvisibility-inlines-hidden -fobjc-abi-version=2 -fobjc-arc ${CMAKE_CXX_FLAGS}")
+set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -O3 -fomit-frame-pointer -ffast-math ${BITCODE} ${CMAKE_CXX_FLAGS_RELEASE}")
+set(CMAKE_C_LINK_FLAGS "${XCODE_IOS_PLATFORM_VERSION_FLAGS} -Wl,-search_paths_first ${CMAKE_C_LINK_FLAGS}")
+set(CMAKE_CXX_LINK_FLAGS "${XCODE_IOS_PLATFORM_VERSION_FLAGS}  -Wl,-search_paths_first ${CMAKE_CXX_LINK_FLAGS}")
+# In order to ensure that the updated compiler flags are used in try_compile()
+# tests, we have to forcibly set them in the CMake cache, not merely set them
+# in the local scope.
+list(APPEND VARS_TO_FORCE_IN_CACHE
+  CMAKE_C_FLAGS
+  CMAKE_CXX_FLAGS
+  CMAKE_CXX_RELEASE
+  CMAKE_C_LINK_FLAGS
+  CMAKE_CXX_LINK_FLAGS)
+foreach(VAR_TO_FORCE ${VARS_TO_FORCE_IN_CACHE})
+  set(${VAR_TO_FORCE} "${${VAR_TO_FORCE}}" CACHE STRING "" FORCE)
+endforeach()
+set(CMAKE_PLATFORM_HAS_INSTALLNAME 1)
+set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-dynamiclib -headerpad_max_install_names")
+set(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -headerpad_max_install_names")
+set(CMAKE_SHARED_MODULE_LOADER_C_FLAG "-Wl,-bundle_loader,")
+set(CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,")
+set(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".so" ".a")
+# Hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old
+# build tree (where install_name_tool was hardcoded) and where
+# CMAKE_INSTALL_NAME_TOOL isn't in the cache and still cmake didn't fail in
+# CMakeFindBinUtils.cmake (because it isn't rerun) hardcode
+# CMAKE_INSTALL_NAME_TOOL here to install_name_tool, so it behaves as it did
+# before, Alex.
+if (NOT DEFINED CMAKE_INSTALL_NAME_TOOL)
+  find_program(CMAKE_INSTALL_NAME_TOOL install_name_tool)
+endif (NOT DEFINED CMAKE_INSTALL_NAME_TOOL)
+# Set the find root to the iOS developer roots and to user defined paths.
+set(CMAKE_FIND_ROOT_PATH ${CMAKE_IOS_DEVELOPER_ROOT} ${CMAKE_OSX_SYSROOT}
+  ${CMAKE_PREFIX_PATH} CACHE string  "iOS find search path root" FORCE)
+# Default to searching for frameworks first.
+set(CMAKE_FIND_FRAMEWORK FIRST)
+# Set up the default search directories for frameworks.
+set(CMAKE_SYSTEM_FRAMEWORK_PATH
+  ${CMAKE_OSX_SYSROOT}/System/Library/Frameworks
+  ${CMAKE_OSX_SYSROOT}/System/Library/PrivateFrameworks
+  ${CMAKE_OSX_SYSROOT}/Developer/Library/Frameworks)
+# Only search the specified iOS SDK, not the remainder of the host filesystem.
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+# This little macro lets you set any XCode specific property.
+macro(set_xcode_property TARGET XCODE_PROPERTY XCODE_VALUE XCODE_RELVERSION)
+  set(XCODE_RELVERSION_I "${XCODE_RELVERSION}")
+  if (XCODE_RELVERSION_I STREQUAL "All")
+    set_property(TARGET ${TARGET} PROPERTY
+    XCODE_ATTRIBUTE_${XCODE_PROPERTY} "${XCODE_VALUE}")
+  else()
+    set_property(TARGET ${TARGET} PROPERTY
+    XCODE_ATTRIBUTE_${XCODE_PROPERTY}[variant=${XCODE_RELVERSION_I}] "${XCODE_VALUE}")
+  endif()
+endmacro(set_xcode_property)
+# This macro lets you find executable programs on the host system.
+macro(find_host_package)
+  set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+  set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY NEVER)
+  set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE NEVER)
+  set(IOS FALSE)
+  find_package(${ARGN})
+  set(IOS TRUE)
+  set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY)
+  set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+  set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+endmacro(find_host_package)
diff --git a/support-lib/.gitignore b/support-lib/.gitignore
new file mode 100644
index 000000000..e69de29bb
diff --git a/support-lib/ios-build-support-lib.sh b/support-lib/ios-build-support-lib.sh
new file mode 100755
index 000000000..d47987bb6
--- /dev/null
+++ b/support-lib/ios-build-support-lib.sh
@@ -0,0 +1,67 @@
+#!/bin/sh
+# This script helps you to build apple fat binaries.
+# This uses the excellent https://github.com/leetal/ios-cmake cmake platform file.
+
+BASEDIR=$(cd "$(dirname "$0")"; pwd)
+
+# The directory used for building
+BUILD_DIR=${BASEDIR}/build
+
+# The directory where library will be generated
+OUTPUT_DIR=${BASEDIR}/out/apple
+
+# The architecture to build for apple
+# See https://github.com/leetal/ios-cmake for more informations
+BUILD_APPLE_ARCHITECTURES=(OS SIMULATOR64)
+
+# Enable disable bitcode
+ENABLE_BITCODE=true
+
+# Helper functions for building one arhcitecture
+function build_apple_native_static_arch {
+  echo "Building Native $1"
+
+  cd ${BUILD_DIR}
+  BUILD_PATH=build_$1
+  if [ -d ${BUILD_PATH} ]; then
+    rm -f ${BUILD_PATH}/*
+    rmdir ${BUILD_PATH}
+  fi
+
+  mkdir -p  ${BUILD_PATH}
+  cd ${BUILD_PATH}
+  
+  cmake ${BASEDIR}/.. -DDJINNI_WITH_OBJC=ON -DDJINNI_WITH_JNI=OFF -DDJINNI_STATIC_LIB=ON -DCMAKE_TOOLCHAIN_FILE=${BASEDIR}/../cmake/ios.toolchain.cmake -DIOS_PLATFORM=$1 -DENABLE_BITCODE=${ENABLE_BITCODE} -DCMAKE_INSTALL_PREFIX=${BUILD_PATH}
+  make -j 4
+  
+  cp ${BUILD_DIR}/${BUILD_PATH}/libdjinni_support_lib.a ${OUTPUT_DIR}/libdjinni_support_lib_$1.a
+  
+  cd ${BUILD_DIR}
+  rm -rf ${BUILD_PATH}
+}
+
+# Start of the script
+echo "Checking build directory..."
+if [ -d ${BUILD_DIR} ]; then
+    rm -rf ${BUILD_DIR}/*
+    rmdir ${BUILD_DIR}
+fi
+mkdir -p ${BUILD_DIR}
+
+echo "Checking output directory..."
+if [ -d ${OUTPUT_DIR} ]; then
+    rm -rf ${OUTPUT_DIR}/*
+    rmdir ${OUTPUT_DIR}
+fi
+
+mkdir -p ${OUTPUT_DIR}
+
+# Build elements
+
+for arch in ${BUILD_APPLE_ARCHITECTURES[@]}
+do
+  build_apple_native_static_arch ${arch}
+done
+
+# Lipo creates a fat binary
+lipo -create ${OUTPUT_DIR}/*.a -output ${OUTPUT_DIR}/libdjinni_support_lib_UNIVERSAL.a

From 86ba6b5d83a5234ea4100bd985edb28a07351bc9 Mon Sep 17 00:00:00 2001
From: Xianwen Chen <xianwen@dropbox.com>
Date: Thu, 4 Jan 2018 11:45:47 -0800
Subject: [PATCH 53/56] Separate `flags` to `enum_flags.djinni` (#346)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Separate `flags` to `enum_flags.djinni`, to exclude it from
`common.djinni`, so that it wouldn’t be picked up by Python  in
`python` branch.

Otherwise it causes failure in `python` branch since flags feature is
not implemented.
---
 test-suite/djinni/all.djinni                  |  2 +
 test-suite/djinni/enum.djinni                 | 30 -----------
 test-suite/djinni/enum_flags.djinni           | 29 +++++++++++
 test-suite/generated-src/cpp/access_flags.hpp |  2 +-
 test-suite/generated-src/cpp/empty_flags.hpp  |  2 +-
 .../generated-src/cpp/flag_roundtrip.hpp      |  2 +-
 .../generated-src/cpp/record_with_flags.hpp   |  2 +-
 test-suite/generated-src/inFileList.txt       |  1 +
 .../com/dropbox/djinni/test/AccessFlags.java  |  2 +-
 .../com/dropbox/djinni/test/EmptyFlags.java   |  2 +-
 .../dropbox/djinni/test/FlagRoundtrip.java    |  2 +-
 .../dropbox/djinni/test/RecordWithFlags.java  |  2 +-
 .../generated-src/jni/NativeAccessFlags.hpp   |  2 +-
 .../generated-src/jni/NativeEmptyFlags.hpp    |  2 +-
 .../generated-src/jni/NativeFlagRoundtrip.cpp |  2 +-
 .../generated-src/jni/NativeFlagRoundtrip.hpp |  2 +-
 .../jni/NativeRecordWithFlags.cpp             |  2 +-
 .../jni/NativeRecordWithFlags.hpp             |  2 +-
 .../objc/DBAccessFlags+Private.h              |  2 +-
 test-suite/generated-src/objc/DBAccessFlags.h |  2 +-
 .../generated-src/objc/DBEmptyFlags+Private.h |  2 +-
 test-suite/generated-src/objc/DBEmptyFlags.h  |  2 +-
 .../objc/DBFlagRoundtrip+Private.h            |  2 +-
 .../objc/DBFlagRoundtrip+Private.mm           |  2 +-
 .../generated-src/objc/DBFlagRoundtrip.h      |  2 +-
 .../objc/DBRecordWithFlags+Private.h          |  2 +-
 .../objc/DBRecordWithFlags+Private.mm         |  2 +-
 .../generated-src/objc/DBRecordWithFlags.h    |  2 +-
 .../generated-src/objc/DBRecordWithFlags.mm   |  2 +-
 test-suite/generated-src/outFileList.txt      | 50 +++++++++----------
 30 files changed, 82 insertions(+), 80 deletions(-)
 create mode 100644 test-suite/djinni/enum_flags.djinni

diff --git a/test-suite/djinni/all.djinni b/test-suite/djinni/all.djinni
index ed8e32e05..e520a6760 100644
--- a/test-suite/djinni/all.djinni
+++ b/test-suite/djinni/all.djinni
@@ -1,4 +1,6 @@
 @import "common.djinni"
 
+@import "enum_flags.djinni"
+
 @import "vendor/third-party/date.djinni"
 @import "third-party/duration.djinni"
diff --git a/test-suite/djinni/enum.djinni b/test-suite/djinni/enum.djinni
index 968b15d17..ce4061d88 100644
--- a/test-suite/djinni/enum.djinni
+++ b/test-suite/djinni/enum.djinni
@@ -26,33 +26,3 @@ enum_usage_interface = interface +c +j +o {
     s(s: set<color>): set<color>;
     m(m: map<color, color>): map<color, color>;
 }
-
-access_flags = flags {
-  nobody = none;
-  owner_read;
-  owner_write;
-  owner_execute;
-  group_read;
-  group_write;
-  group_execute;
-  system_read;
-  system_write;
-  system_execute;
-  everybody = all;
-}
-
-empty_flags = flags {
-  none = none;
-  all = all;
-}
-
-flag_roundtrip = interface +c {
-  static roundtrip_access(flag: access_flags): access_flags;
-  static roundtrip_empty(flag: empty_flags): empty_flags;
-  static roundtrip_access_boxed(flag: optional<access_flags>): optional<access_flags>;
-  static roundtrip_empty_boxed(flag: optional<empty_flags>): optional<empty_flags>;
-}
-
-record_with_flags = record {
-  access: access_flags;
-}
diff --git a/test-suite/djinni/enum_flags.djinni b/test-suite/djinni/enum_flags.djinni
new file mode 100644
index 000000000..cd3f1d716
--- /dev/null
+++ b/test-suite/djinni/enum_flags.djinni
@@ -0,0 +1,29 @@
+access_flags = flags {
+  nobody = none;
+  owner_read;
+  owner_write;
+  owner_execute;
+  group_read;
+  group_write;
+  group_execute;
+  system_read;
+  system_write;
+  system_execute;
+  everybody = all;
+}
+
+empty_flags = flags {
+  none = none;
+  all = all;
+}
+
+flag_roundtrip = interface +c {
+  static roundtrip_access(flag: access_flags): access_flags;
+  static roundtrip_empty(flag: empty_flags): empty_flags;
+  static roundtrip_access_boxed(flag: optional<access_flags>): optional<access_flags>;
+  static roundtrip_empty_boxed(flag: optional<empty_flags>): optional<empty_flags>;
+}
+
+record_with_flags = record {
+  access: access_flags;
+}
diff --git a/test-suite/generated-src/cpp/access_flags.hpp b/test-suite/generated-src/cpp/access_flags.hpp
index 00848a6e5..ccf4b83e5 100644
--- a/test-suite/generated-src/cpp/access_flags.hpp
+++ b/test-suite/generated-src/cpp/access_flags.hpp
@@ -1,5 +1,5 @@
 // AUTOGENERATED FILE - DO NOT MODIFY!
-// This file generated by Djinni from enum.djinni
+// This file generated by Djinni from enum_flags.djinni
 
 #pragma once
 
diff --git a/test-suite/generated-src/cpp/empty_flags.hpp b/test-suite/generated-src/cpp/empty_flags.hpp
index 25f08a39d..60bc916e8 100644
--- a/test-suite/generated-src/cpp/empty_flags.hpp
+++ b/test-suite/generated-src/cpp/empty_flags.hpp
@@ -1,5 +1,5 @@
 // AUTOGENERATED FILE - DO NOT MODIFY!
-// This file generated by Djinni from enum.djinni
+// This file generated by Djinni from enum_flags.djinni
 
 #pragma once
 
diff --git a/test-suite/generated-src/cpp/flag_roundtrip.hpp b/test-suite/generated-src/cpp/flag_roundtrip.hpp
index 96ae75232..3899ef69c 100644
--- a/test-suite/generated-src/cpp/flag_roundtrip.hpp
+++ b/test-suite/generated-src/cpp/flag_roundtrip.hpp
@@ -1,5 +1,5 @@
 // AUTOGENERATED FILE - DO NOT MODIFY!
-// This file generated by Djinni from enum.djinni
+// This file generated by Djinni from enum_flags.djinni
 
 #pragma once
 
diff --git a/test-suite/generated-src/cpp/record_with_flags.hpp b/test-suite/generated-src/cpp/record_with_flags.hpp
index 2a979c3fb..608cd3818 100644
--- a/test-suite/generated-src/cpp/record_with_flags.hpp
+++ b/test-suite/generated-src/cpp/record_with_flags.hpp
@@ -1,5 +1,5 @@
 // AUTOGENERATED FILE - DO NOT MODIFY!
-// This file generated by Djinni from enum.djinni
+// This file generated by Djinni from enum_flags.djinni
 
 #pragma once
 
diff --git a/test-suite/generated-src/inFileList.txt b/test-suite/generated-src/inFileList.txt
index 5b09e4011..3b2f259db 100644
--- a/test-suite/generated-src/inFileList.txt
+++ b/test-suite/generated-src/inFileList.txt
@@ -17,6 +17,7 @@ djinni/single_language_interfaces.djinni
 djinni/extended_record.djinni
 djinni/varnames.djinni
 djinni/relative_paths.djinni
+djinni/enum_flags.djinni
 djinni/vendor/third-party/date.djinni
 djinni/vendor/third-party/date.yaml
 djinni/vendor/third-party/duration.djinni
diff --git a/test-suite/generated-src/java/com/dropbox/djinni/test/AccessFlags.java b/test-suite/generated-src/java/com/dropbox/djinni/test/AccessFlags.java
index 6fc9fa6e9..683e4c888 100644
--- a/test-suite/generated-src/java/com/dropbox/djinni/test/AccessFlags.java
+++ b/test-suite/generated-src/java/com/dropbox/djinni/test/AccessFlags.java
@@ -1,5 +1,5 @@
 // AUTOGENERATED FILE - DO NOT MODIFY!
-// This file generated by Djinni from enum.djinni
+// This file generated by Djinni from enum_flags.djinni
 
 package com.dropbox.djinni.test;
 
diff --git a/test-suite/generated-src/java/com/dropbox/djinni/test/EmptyFlags.java b/test-suite/generated-src/java/com/dropbox/djinni/test/EmptyFlags.java
index 8828a9651..a3128e230 100644
--- a/test-suite/generated-src/java/com/dropbox/djinni/test/EmptyFlags.java
+++ b/test-suite/generated-src/java/com/dropbox/djinni/test/EmptyFlags.java
@@ -1,5 +1,5 @@
 // AUTOGENERATED FILE - DO NOT MODIFY!
-// This file generated by Djinni from enum.djinni
+// This file generated by Djinni from enum_flags.djinni
 
 package com.dropbox.djinni.test;
 
diff --git a/test-suite/generated-src/java/com/dropbox/djinni/test/FlagRoundtrip.java b/test-suite/generated-src/java/com/dropbox/djinni/test/FlagRoundtrip.java
index 70138bc1e..0f9ebbe37 100644
--- a/test-suite/generated-src/java/com/dropbox/djinni/test/FlagRoundtrip.java
+++ b/test-suite/generated-src/java/com/dropbox/djinni/test/FlagRoundtrip.java
@@ -1,5 +1,5 @@
 // AUTOGENERATED FILE - DO NOT MODIFY!
-// This file generated by Djinni from enum.djinni
+// This file generated by Djinni from enum_flags.djinni
 
 package com.dropbox.djinni.test;
 
diff --git a/test-suite/generated-src/java/com/dropbox/djinni/test/RecordWithFlags.java b/test-suite/generated-src/java/com/dropbox/djinni/test/RecordWithFlags.java
index 00f85d43c..5c9bd7065 100644
--- a/test-suite/generated-src/java/com/dropbox/djinni/test/RecordWithFlags.java
+++ b/test-suite/generated-src/java/com/dropbox/djinni/test/RecordWithFlags.java
@@ -1,5 +1,5 @@
 // AUTOGENERATED FILE - DO NOT MODIFY!
-// This file generated by Djinni from enum.djinni
+// This file generated by Djinni from enum_flags.djinni
 
 package com.dropbox.djinni.test;
 
diff --git a/test-suite/generated-src/jni/NativeAccessFlags.hpp b/test-suite/generated-src/jni/NativeAccessFlags.hpp
index cea29ea76..624d6bb61 100644
--- a/test-suite/generated-src/jni/NativeAccessFlags.hpp
+++ b/test-suite/generated-src/jni/NativeAccessFlags.hpp
@@ -1,5 +1,5 @@
 // AUTOGENERATED FILE - DO NOT MODIFY!
-// This file generated by Djinni from enum.djinni
+// This file generated by Djinni from enum_flags.djinni
 
 #pragma once
 
diff --git a/test-suite/generated-src/jni/NativeEmptyFlags.hpp b/test-suite/generated-src/jni/NativeEmptyFlags.hpp
index 3ee38c72a..8700c6ae6 100644
--- a/test-suite/generated-src/jni/NativeEmptyFlags.hpp
+++ b/test-suite/generated-src/jni/NativeEmptyFlags.hpp
@@ -1,5 +1,5 @@
 // AUTOGENERATED FILE - DO NOT MODIFY!
-// This file generated by Djinni from enum.djinni
+// This file generated by Djinni from enum_flags.djinni
 
 #pragma once
 
diff --git a/test-suite/generated-src/jni/NativeFlagRoundtrip.cpp b/test-suite/generated-src/jni/NativeFlagRoundtrip.cpp
index 917305901..225ba6d1b 100644
--- a/test-suite/generated-src/jni/NativeFlagRoundtrip.cpp
+++ b/test-suite/generated-src/jni/NativeFlagRoundtrip.cpp
@@ -1,5 +1,5 @@
 // AUTOGENERATED FILE - DO NOT MODIFY!
-// This file generated by Djinni from enum.djinni
+// This file generated by Djinni from enum_flags.djinni
 
 #include "NativeFlagRoundtrip.hpp"  // my header
 #include "Marshal.hpp"
diff --git a/test-suite/generated-src/jni/NativeFlagRoundtrip.hpp b/test-suite/generated-src/jni/NativeFlagRoundtrip.hpp
index 668faf24a..9c07909fb 100644
--- a/test-suite/generated-src/jni/NativeFlagRoundtrip.hpp
+++ b/test-suite/generated-src/jni/NativeFlagRoundtrip.hpp
@@ -1,5 +1,5 @@
 // AUTOGENERATED FILE - DO NOT MODIFY!
-// This file generated by Djinni from enum.djinni
+// This file generated by Djinni from enum_flags.djinni
 
 #pragma once
 
diff --git a/test-suite/generated-src/jni/NativeRecordWithFlags.cpp b/test-suite/generated-src/jni/NativeRecordWithFlags.cpp
index 9a4af8576..840ddde03 100644
--- a/test-suite/generated-src/jni/NativeRecordWithFlags.cpp
+++ b/test-suite/generated-src/jni/NativeRecordWithFlags.cpp
@@ -1,5 +1,5 @@
 // AUTOGENERATED FILE - DO NOT MODIFY!
-// This file generated by Djinni from enum.djinni
+// This file generated by Djinni from enum_flags.djinni
 
 #include "NativeRecordWithFlags.hpp"  // my header
 #include "NativeAccessFlags.hpp"
diff --git a/test-suite/generated-src/jni/NativeRecordWithFlags.hpp b/test-suite/generated-src/jni/NativeRecordWithFlags.hpp
index ed963cf6b..3fdec0e2a 100644
--- a/test-suite/generated-src/jni/NativeRecordWithFlags.hpp
+++ b/test-suite/generated-src/jni/NativeRecordWithFlags.hpp
@@ -1,5 +1,5 @@
 // AUTOGENERATED FILE - DO NOT MODIFY!
-// This file generated by Djinni from enum.djinni
+// This file generated by Djinni from enum_flags.djinni
 
 #pragma once
 
diff --git a/test-suite/generated-src/objc/DBAccessFlags+Private.h b/test-suite/generated-src/objc/DBAccessFlags+Private.h
index 96d26938e..d76d4554c 100644
--- a/test-suite/generated-src/objc/DBAccessFlags+Private.h
+++ b/test-suite/generated-src/objc/DBAccessFlags+Private.h
@@ -1,5 +1,5 @@
 // AUTOGENERATED FILE - DO NOT MODIFY!
-// This file generated by Djinni from enum.djinni
+// This file generated by Djinni from enum_flags.djinni
 
 #include "access_flags.hpp"
 #import "DJIMarshal+Private.h"
diff --git a/test-suite/generated-src/objc/DBAccessFlags.h b/test-suite/generated-src/objc/DBAccessFlags.h
index 4a968b9cc..a2f252cde 100644
--- a/test-suite/generated-src/objc/DBAccessFlags.h
+++ b/test-suite/generated-src/objc/DBAccessFlags.h
@@ -1,5 +1,5 @@
 // AUTOGENERATED FILE - DO NOT MODIFY!
-// This file generated by Djinni from enum.djinni
+// This file generated by Djinni from enum_flags.djinni
 
 #import <Foundation/Foundation.h>
 
diff --git a/test-suite/generated-src/objc/DBEmptyFlags+Private.h b/test-suite/generated-src/objc/DBEmptyFlags+Private.h
index 223cb273d..fa814c75b 100644
--- a/test-suite/generated-src/objc/DBEmptyFlags+Private.h
+++ b/test-suite/generated-src/objc/DBEmptyFlags+Private.h
@@ -1,5 +1,5 @@
 // AUTOGENERATED FILE - DO NOT MODIFY!
-// This file generated by Djinni from enum.djinni
+// This file generated by Djinni from enum_flags.djinni
 
 #include "empty_flags.hpp"
 #import "DJIMarshal+Private.h"
diff --git a/test-suite/generated-src/objc/DBEmptyFlags.h b/test-suite/generated-src/objc/DBEmptyFlags.h
index d08f17f2e..54e1d12b6 100644
--- a/test-suite/generated-src/objc/DBEmptyFlags.h
+++ b/test-suite/generated-src/objc/DBEmptyFlags.h
@@ -1,5 +1,5 @@
 // AUTOGENERATED FILE - DO NOT MODIFY!
-// This file generated by Djinni from enum.djinni
+// This file generated by Djinni from enum_flags.djinni
 
 #import <Foundation/Foundation.h>
 
diff --git a/test-suite/generated-src/objc/DBFlagRoundtrip+Private.h b/test-suite/generated-src/objc/DBFlagRoundtrip+Private.h
index 6a3cd9cc6..984d43057 100644
--- a/test-suite/generated-src/objc/DBFlagRoundtrip+Private.h
+++ b/test-suite/generated-src/objc/DBFlagRoundtrip+Private.h
@@ -1,5 +1,5 @@
 // AUTOGENERATED FILE - DO NOT MODIFY!
-// This file generated by Djinni from enum.djinni
+// This file generated by Djinni from enum_flags.djinni
 
 #include "flag_roundtrip.hpp"
 #include <memory>
diff --git a/test-suite/generated-src/objc/DBFlagRoundtrip+Private.mm b/test-suite/generated-src/objc/DBFlagRoundtrip+Private.mm
index beeb3207e..32e112d44 100644
--- a/test-suite/generated-src/objc/DBFlagRoundtrip+Private.mm
+++ b/test-suite/generated-src/objc/DBFlagRoundtrip+Private.mm
@@ -1,5 +1,5 @@
 // AUTOGENERATED FILE - DO NOT MODIFY!
-// This file generated by Djinni from enum.djinni
+// This file generated by Djinni from enum_flags.djinni
 
 #import "DBFlagRoundtrip+Private.h"
 #import "DBFlagRoundtrip.h"
diff --git a/test-suite/generated-src/objc/DBFlagRoundtrip.h b/test-suite/generated-src/objc/DBFlagRoundtrip.h
index d4c6e6d54..a73ef8571 100644
--- a/test-suite/generated-src/objc/DBFlagRoundtrip.h
+++ b/test-suite/generated-src/objc/DBFlagRoundtrip.h
@@ -1,5 +1,5 @@
 // AUTOGENERATED FILE - DO NOT MODIFY!
-// This file generated by Djinni from enum.djinni
+// This file generated by Djinni from enum_flags.djinni
 
 #import "DBAccessFlags.h"
 #import "DBEmptyFlags.h"
diff --git a/test-suite/generated-src/objc/DBRecordWithFlags+Private.h b/test-suite/generated-src/objc/DBRecordWithFlags+Private.h
index e74cfd889..31cc6523f 100644
--- a/test-suite/generated-src/objc/DBRecordWithFlags+Private.h
+++ b/test-suite/generated-src/objc/DBRecordWithFlags+Private.h
@@ -1,5 +1,5 @@
 // AUTOGENERATED FILE - DO NOT MODIFY!
-// This file generated by Djinni from enum.djinni
+// This file generated by Djinni from enum_flags.djinni
 
 #import "DBRecordWithFlags.h"
 #include "record_with_flags.hpp"
diff --git a/test-suite/generated-src/objc/DBRecordWithFlags+Private.mm b/test-suite/generated-src/objc/DBRecordWithFlags+Private.mm
index 1a0731f94..378bf7c90 100644
--- a/test-suite/generated-src/objc/DBRecordWithFlags+Private.mm
+++ b/test-suite/generated-src/objc/DBRecordWithFlags+Private.mm
@@ -1,5 +1,5 @@
 // AUTOGENERATED FILE - DO NOT MODIFY!
-// This file generated by Djinni from enum.djinni
+// This file generated by Djinni from enum_flags.djinni
 
 #import "DBRecordWithFlags+Private.h"
 #import "DBAccessFlags+Private.h"
diff --git a/test-suite/generated-src/objc/DBRecordWithFlags.h b/test-suite/generated-src/objc/DBRecordWithFlags.h
index a47b151ed..c815ea887 100644
--- a/test-suite/generated-src/objc/DBRecordWithFlags.h
+++ b/test-suite/generated-src/objc/DBRecordWithFlags.h
@@ -1,5 +1,5 @@
 // AUTOGENERATED FILE - DO NOT MODIFY!
-// This file generated by Djinni from enum.djinni
+// This file generated by Djinni from enum_flags.djinni
 
 #import "DBAccessFlags.h"
 #import <Foundation/Foundation.h>
diff --git a/test-suite/generated-src/objc/DBRecordWithFlags.mm b/test-suite/generated-src/objc/DBRecordWithFlags.mm
index ef9e1cfd4..7a29174a5 100644
--- a/test-suite/generated-src/objc/DBRecordWithFlags.mm
+++ b/test-suite/generated-src/objc/DBRecordWithFlags.mm
@@ -1,5 +1,5 @@
 // AUTOGENERATED FILE - DO NOT MODIFY!
-// This file generated by Djinni from enum.djinni
+// This file generated by Djinni from enum_flags.djinni
 
 #import "DBRecordWithFlags.h"
 
diff --git a/test-suite/generated-src/outFileList.txt b/test-suite/generated-src/outFileList.txt
index 205fcccf9..a99741bc7 100644
--- a/test-suite/generated-src/outFileList.txt
+++ b/test-suite/generated-src/outFileList.txt
@@ -4,6 +4,10 @@ djinni-output-temp/cpp/record_with_duration_and_derivings.cpp
 djinni-output-temp/cpp/date_record.hpp
 djinni-output-temp/cpp/date_record.cpp
 djinni-output-temp/cpp/map_date_record.hpp
+djinni-output-temp/cpp/access_flags.hpp
+djinni-output-temp/cpp/empty_flags.hpp
+djinni-output-temp/cpp/flag_roundtrip.hpp
+djinni-output-temp/cpp/record_with_flags.hpp
 djinni-output-temp/cpp/_varname_record_.hpp
 djinni-output-temp/cpp/_varname_interface_.hpp
 djinni-output-temp/cpp/extended_record_base.hpp
@@ -35,10 +39,6 @@ djinni-output-temp/cpp/user_token.hpp
 djinni-output-temp/cpp/color.hpp
 djinni-output-temp/cpp/enum_usage_record.hpp
 djinni-output-temp/cpp/enum_usage_interface.hpp
-djinni-output-temp/cpp/access_flags.hpp
-djinni-output-temp/cpp/empty_flags.hpp
-djinni-output-temp/cpp/flag_roundtrip.hpp
-djinni-output-temp/cpp/record_with_flags.hpp
 djinni-output-temp/cpp/client_returned_record.hpp
 djinni-output-temp/cpp/client_interface.hpp
 djinni-output-temp/cpp/reverse_client_interface.hpp
@@ -56,6 +56,10 @@ djinni-output-temp/java/TestDuration.java
 djinni-output-temp/java/RecordWithDurationAndDerivings.java
 djinni-output-temp/java/DateRecord.java
 djinni-output-temp/java/MapDateRecord.java
+djinni-output-temp/java/AccessFlags.java
+djinni-output-temp/java/EmptyFlags.java
+djinni-output-temp/java/FlagRoundtrip.java
+djinni-output-temp/java/RecordWithFlags.java
 djinni-output-temp/java/VarnameRecord.java
 djinni-output-temp/java/VarnameInterface.java
 djinni-output-temp/java/ExtendedRecord.java
@@ -81,10 +85,6 @@ djinni-output-temp/java/UserToken.java
 djinni-output-temp/java/Color.java
 djinni-output-temp/java/EnumUsageRecord.java
 djinni-output-temp/java/EnumUsageInterface.java
-djinni-output-temp/java/AccessFlags.java
-djinni-output-temp/java/EmptyFlags.java
-djinni-output-temp/java/FlagRoundtrip.java
-djinni-output-temp/java/RecordWithFlags.java
 djinni-output-temp/java/ClientReturnedRecord.java
 djinni-output-temp/java/ClientInterface.java
 djinni-output-temp/java/ReverseClientInterface.java
@@ -104,6 +104,12 @@ djinni-output-temp/jni/NativeDateRecord.hpp
 djinni-output-temp/jni/NativeDateRecord.cpp
 djinni-output-temp/jni/NativeMapDateRecord.hpp
 djinni-output-temp/jni/NativeMapDateRecord.cpp
+djinni-output-temp/jni/NativeAccessFlags.hpp
+djinni-output-temp/jni/NativeEmptyFlags.hpp
+djinni-output-temp/jni/NativeFlagRoundtrip.hpp
+djinni-output-temp/jni/NativeFlagRoundtrip.cpp
+djinni-output-temp/jni/NativeRecordWithFlags.hpp
+djinni-output-temp/jni/NativeRecordWithFlags.cpp
 djinni-output-temp/jni/NativeVarnameRecord.hpp
 djinni-output-temp/jni/NativeVarnameRecord.cpp
 djinni-output-temp/jni/NativeVarnameInterface.hpp
@@ -153,12 +159,6 @@ djinni-output-temp/jni/NativeEnumUsageRecord.hpp
 djinni-output-temp/jni/NativeEnumUsageRecord.cpp
 djinni-output-temp/jni/NativeEnumUsageInterface.hpp
 djinni-output-temp/jni/NativeEnumUsageInterface.cpp
-djinni-output-temp/jni/NativeAccessFlags.hpp
-djinni-output-temp/jni/NativeEmptyFlags.hpp
-djinni-output-temp/jni/NativeFlagRoundtrip.hpp
-djinni-output-temp/jni/NativeFlagRoundtrip.cpp
-djinni-output-temp/jni/NativeRecordWithFlags.hpp
-djinni-output-temp/jni/NativeRecordWithFlags.cpp
 djinni-output-temp/jni/NativeClientReturnedRecord.hpp
 djinni-output-temp/jni/NativeClientReturnedRecord.cpp
 djinni-output-temp/jni/NativeClientInterface.hpp
@@ -188,6 +188,11 @@ djinni-output-temp/objc/DBDateRecord.h
 djinni-output-temp/objc/DBDateRecord.mm
 djinni-output-temp/objc/DBMapDateRecord.h
 djinni-output-temp/objc/DBMapDateRecord.mm
+djinni-output-temp/objc/DBAccessFlags.h
+djinni-output-temp/objc/DBEmptyFlags.h
+djinni-output-temp/objc/DBFlagRoundtrip.h
+djinni-output-temp/objc/DBRecordWithFlags.h
+djinni-output-temp/objc/DBRecordWithFlags.mm
 djinni-output-temp/objc/DBVarnameRecord.h
 djinni-output-temp/objc/DBVarnameRecord.mm
 djinni-output-temp/objc/DBVarnameInterface.h
@@ -223,11 +228,6 @@ djinni-output-temp/objc/DBColor.h
 djinni-output-temp/objc/DBEnumUsageRecord.h
 djinni-output-temp/objc/DBEnumUsageRecord.mm
 djinni-output-temp/objc/DBEnumUsageInterface.h
-djinni-output-temp/objc/DBAccessFlags.h
-djinni-output-temp/objc/DBEmptyFlags.h
-djinni-output-temp/objc/DBFlagRoundtrip.h
-djinni-output-temp/objc/DBRecordWithFlags.h
-djinni-output-temp/objc/DBRecordWithFlags.mm
 djinni-output-temp/objc/DBClientReturnedRecord.h
 djinni-output-temp/objc/DBClientReturnedRecord.mm
 djinni-output-temp/objc/DBClientInterface.h
@@ -255,6 +255,12 @@ djinni-output-temp/objc/DBDateRecord+Private.h
 djinni-output-temp/objc/DBDateRecord+Private.mm
 djinni-output-temp/objc/DBMapDateRecord+Private.h
 djinni-output-temp/objc/DBMapDateRecord+Private.mm
+djinni-output-temp/objc/DBAccessFlags+Private.h
+djinni-output-temp/objc/DBEmptyFlags+Private.h
+djinni-output-temp/objc/DBFlagRoundtrip+Private.h
+djinni-output-temp/objc/DBFlagRoundtrip+Private.mm
+djinni-output-temp/objc/DBRecordWithFlags+Private.h
+djinni-output-temp/objc/DBRecordWithFlags+Private.mm
 djinni-output-temp/objc/DBVarnameRecord+Private.h
 djinni-output-temp/objc/DBVarnameRecord+Private.mm
 djinni-output-temp/objc/DBVarnameInterface+Private.h
@@ -304,12 +310,6 @@ djinni-output-temp/objc/DBEnumUsageRecord+Private.h
 djinni-output-temp/objc/DBEnumUsageRecord+Private.mm
 djinni-output-temp/objc/DBEnumUsageInterface+Private.h
 djinni-output-temp/objc/DBEnumUsageInterface+Private.mm
-djinni-output-temp/objc/DBAccessFlags+Private.h
-djinni-output-temp/objc/DBEmptyFlags+Private.h
-djinni-output-temp/objc/DBFlagRoundtrip+Private.h
-djinni-output-temp/objc/DBFlagRoundtrip+Private.mm
-djinni-output-temp/objc/DBRecordWithFlags+Private.h
-djinni-output-temp/objc/DBRecordWithFlags+Private.mm
 djinni-output-temp/objc/DBClientReturnedRecord+Private.h
 djinni-output-temp/objc/DBClientReturnedRecord+Private.mm
 djinni-output-temp/objc/DBClientInterface+Private.h

From 565425de8576955965413932f3333156de91784d Mon Sep 17 00:00:00 2001
From: Sebastian Schuberth <sschuberth@users.noreply.github.com>
Date: Thu, 4 Jan 2018 21:11:34 +0100
Subject: [PATCH 54/56] Upgrade example build (#339)

* example: Guard against ndkDir being null at configuration time

This is a follow-up to PR #329.

* example: Upgrade to Android Gradle plugin 3.0.1

Each version of the Android Gradle Plugin now has a default version of the
build tools. The "compile" configuration was renamed to "implementation".

* example: Upgrade to Gradle 4.4.1
---
 example/android/app/build.gradle              |  29 ++++++++++--------
 example/android/build.gradle                  |   3 +-
 .../android/gradle/wrapper/gradle-wrapper.jar | Bin 54708 -> 54333 bytes
 .../gradle/wrapper/gradle-wrapper.properties  |   2 +-
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
index 906d1cff6..fa5b3a406 100644
--- a/example/android/app/build.gradle
+++ b/example/android/app/build.gradle
@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "26.0.0"
 
     defaultConfig {
         applicationId "com.dropbox.textsort"
@@ -27,33 +26,37 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.google.code.findbugs:jsr305:3.0.0'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'com.google.code.findbugs:jsr305:3.0.0'
 }
 
 task ndkBuild(type: Exec) {
-    File ndkDir = project.android.ndkDirectory
-    def ndkBuildExecutable = new File(ndkDir, 'ndk-build')
+    def ndkDir = project.android.ndkDirectory
+    def ndkBuildExecutable
+
+    if (ndkDir) {
+        ndkBuildExecutable = new File(ndkDir, 'ndk-build')
+        def MainDirectory = System.getProperty("user.dir") + '/app/'
+
+        environment("NDK_PROJECT_PATH", MainDirectory)
+        environment("GYP_CONFIGURATION", "Release")
+
+        commandLine ndkBuildExecutable
+    }
 
     doFirst {
-        if (ndkDir == null) {
+        if (!ndkDir) {
             def gradle_project_root = project.rootProject.rootDir
             throw new GradleException("NDK is not configured. Make sure there is a local.properties " +
                     "file with an ndk.dir entry in the directory ${gradle_project_root}.")
         }
 
-        if (!ndkBuildExecutable.exists()) {
+        if (!ndkBuildExecutable.file) {
             throw new GradleException("Could not find ndk-build. The configured NDK directory ${ndkDir} may not be correct.")
         }
     }
-
-    String MainDirectory = System.getProperty("user.dir") + '/app/'
-    environment("NDK_PROJECT_PATH", MainDirectory)
-    environment("GYP_CONFIGURATION", "Release")
-    commandLine ndkBuildExecutable
 }
 
 tasks.withType(JavaCompile) {
     compileTask -> compileTask.dependsOn ndkBuild
 }
-
diff --git a/example/android/build.gradle b/example/android/build.gradle
index 596601301..22690c837 100644
--- a/example/android/build.gradle
+++ b/example/android/build.gradle
@@ -2,10 +2,11 @@
 
 buildscript {
     repositories {
+        google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.0.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/example/android/gradle/wrapper/gradle-wrapper.jar b/example/android/gradle/wrapper/gradle-wrapper.jar
index 736fb7d3f94c051b359fc7ae7212d351bc094bdd..99340b4ad18d3c7e764794d300ffd35017036793 100644
GIT binary patch
delta 16251
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
DaV9OZ

delta 16603
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

diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties
index 26b61d748..57c7d2d22 100644
--- a/example/android/gradle/wrapper/gradle-wrapper.properties
+++ b/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-all.zip

From 0001a3e8c6c7200f42184f4f7d61f0126a2f7d06 Mon Sep 17 00:00:00 2001
From: Louis Wilson <b.umlaut.n@gmail.com>
Date: Thu, 22 Feb 2018 15:37:59 -0800
Subject: [PATCH 55/56] Follow naming convention for parameter names in method
 docstrings (#352)

* Update parameter names in documentation

Because parameter names may not be written in the same format between
C++, Objective-C, and Java, it is impossible to have doxygen- or
javadoc-style @param annotations that match for all languages. This
change simply looks for "@param <PARAMNAME>" in the docstring and
rewrites it the same way as the sourcecode does.

* Replace all occurrences of parameter name in docstring

* Also update Java for static methods

* Add multi-word parameter name to test suite

And reference it from the docstring.

* Revert "Add multi-word parameter name to test suite"

This reverts commit 785a22690ff14261fc7c4843984d467784956a47.

* Add multi-word parameter name to test suite

And reference it from the docstring.
---
 src/source/CppGenerator.scala                          |  2 +-
 src/source/JavaGenerator.scala                         |  4 ++--
 src/source/ObjcGenerator.scala                         |  2 +-
 src/source/generator.scala                             | 10 ++++++++++
 test-suite/djinni/varnames.djinni                      |  3 +++
 test-suite/generated-src/cpp/_varname_interface_.hpp   |  5 +++++
 .../java/com/dropbox/djinni/test/VarnameInterface.java |  5 +++++
 test-suite/generated-src/objc/DBVarnameInterface.h     |  5 +++++
 8 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/src/source/CppGenerator.scala b/src/source/CppGenerator.scala
index 28d309b1a..b4bcea828 100644
--- a/src/source/CppGenerator.scala
+++ b/src/source/CppGenerator.scala
@@ -309,7 +309,7 @@ class CppGenerator(spec: Spec) extends Generator(spec) {
         // Methods
         for (m <- i.methods) {
           w.wl
-          writeDoc(w, m.doc)
+          writeMethodDoc(w, m, idCpp.local)
           val ret = marshal.returnType(m.ret, methodNamesInScope)
           val params = m.params.map(p => marshal.paramType(p.ty, methodNamesInScope) + " " + idCpp.local(p.ident))
           if (m.static) {
diff --git a/src/source/JavaGenerator.scala b/src/source/JavaGenerator.scala
index 1c0c23804..51ab88c90 100644
--- a/src/source/JavaGenerator.scala
+++ b/src/source/JavaGenerator.scala
@@ -147,7 +147,7 @@ class JavaGenerator(spec: Spec) extends Generator(spec) {
         val throwException = spec.javaCppException.fold("")(" throws " + _)
         for (m <- i.methods if !m.static) {
           skipFirst { w.wl }
-          writeDoc(w, m.doc)
+          writeMethodDoc(w, m, idJava.local)
           val ret = marshal.returnType(m.ret)
           val params = m.params.map(p => {
             val nullityAnnotation = marshal.nullityAnnotation(p.ty).map(_ + " ").getOrElse("")
@@ -158,7 +158,7 @@ class JavaGenerator(spec: Spec) extends Generator(spec) {
         }
         for (m <- i.methods if m.static) {
           skipFirst { w.wl }
-          writeDoc(w, m.doc)
+          writeMethodDoc(w, m, idJava.local)
           val ret = marshal.returnType(m.ret)
           val params = m.params.map(p => {
             val nullityAnnotation = marshal.nullityAnnotation(p.ty).map(_ + " ").getOrElse("")
diff --git a/src/source/ObjcGenerator.scala b/src/source/ObjcGenerator.scala
index c62f60b9a..420c6cd1d 100644
--- a/src/source/ObjcGenerator.scala
+++ b/src/source/ObjcGenerator.scala
@@ -107,7 +107,7 @@ class ObjcGenerator(spec: Spec) extends BaseObjcGenerator(spec) {
       if (i.ext.objc) w.wl(s"@protocol $self") else w.wl(s"@interface $self : NSObject")
       for (m <- i.methods) {
         w.wl
-        writeDoc(w, m.doc)
+        writeMethodDoc(w, m, idObjc.local)
         writeObjcFuncDecl(m, w)
         w.wl(";")
       }
diff --git a/src/source/generator.scala b/src/source/generator.scala
index e5f687722..17780f39c 100644
--- a/src/source/generator.scala
+++ b/src/source/generator.scala
@@ -24,6 +24,7 @@ import djinni.syntax.Error
 import djinni.writer.IndentWriter
 import scala.language.implicitConversions
 import scala.collection.mutable
+import scala.util.matching.Regex
 
 package object generatorTools {
 
@@ -416,6 +417,15 @@ abstract class Generator(spec: Spec)
 
   // --------------------------------------------------------------------------
 
+  def writeMethodDoc(w: IndentWriter, method: Interface.Method, ident: IdentConverter) {
+    val paramReplacements = method.params.map(p => (s"\\b${Regex.quote(p.ident.name)}\\b", s"${ident(p.ident.name)}"))
+    val newDoc = Doc(method.doc.lines.map(l => {
+      paramReplacements.foldLeft(l)((line, rep) =>
+        line.replaceAll(rep._1, rep._2))
+    }))
+    writeDoc(w, newDoc)
+  }
+
   def writeDoc(w: IndentWriter, doc: Doc) {
     doc.lines.length match {
       case 0 =>
diff --git a/test-suite/djinni/varnames.djinni b/test-suite/djinni/varnames.djinni
index 5b3e5e567..169ff33f7 100644
--- a/test-suite/djinni/varnames.djinni
+++ b/test-suite/djinni/varnames.djinni
@@ -6,6 +6,9 @@ _varname_record_ = record {
 }
 
 _varname_interface_ = interface +c {
+    # We should also rewrite parameter names in docstrings.
+    # _r_arg_ should be rewritten.
+    # _i_arg_ should not.
     _rmethod_(_r_arg_: _varname_record_): _varname_record_;
     _imethod_(_i_arg_: _varname_interface_): _varname_interface_;
 }
diff --git a/test-suite/generated-src/cpp/_varname_interface_.hpp b/test-suite/generated-src/cpp/_varname_interface_.hpp
index dddbfffad..5b66e949e 100644
--- a/test-suite/generated-src/cpp/_varname_interface_.hpp
+++ b/test-suite/generated-src/cpp/_varname_interface_.hpp
@@ -13,6 +13,11 @@ class VarnameInterface {
 public:
     virtual ~VarnameInterface() {}
 
+    /**
+     * We should also rewrite parameter names in docstrings.
+     * _r_arg_ should be rewritten.
+     * _i_arg_ should not.
+     */
     virtual VarnameRecord _rmethod_(const VarnameRecord & _r_arg_) = 0;
 
     virtual std::shared_ptr<VarnameInterface> _imethod_(const std::shared_ptr<VarnameInterface> & _i_arg_) = 0;
diff --git a/test-suite/generated-src/java/com/dropbox/djinni/test/VarnameInterface.java b/test-suite/generated-src/java/com/dropbox/djinni/test/VarnameInterface.java
index 57b016f5d..cb9a0ed6e 100644
--- a/test-suite/generated-src/java/com/dropbox/djinni/test/VarnameInterface.java
+++ b/test-suite/generated-src/java/com/dropbox/djinni/test/VarnameInterface.java
@@ -8,6 +8,11 @@
 import javax.annotation.Nonnull;
 
 public abstract class VarnameInterface {
+    /**
+     * We should also rewrite parameter names in docstrings.
+     * RArg should be rewritten.
+     * _i_arg_ should not.
+     */
     @Nonnull
     public abstract VarnameRecord Rmethod(@Nonnull VarnameRecord RArg);
 
diff --git a/test-suite/generated-src/objc/DBVarnameInterface.h b/test-suite/generated-src/objc/DBVarnameInterface.h
index ec27c0279..c3f0a83ce 100644
--- a/test-suite/generated-src/objc/DBVarnameInterface.h
+++ b/test-suite/generated-src/objc/DBVarnameInterface.h
@@ -8,6 +8,11 @@
 
 @interface DBVarnameInterface : NSObject
 
+/**
+ * We should also rewrite parameter names in docstrings.
+ * RArg should be rewritten.
+ * _i_arg_ should not.
+ */
 - (nonnull DBVarnameRecord *)Rmethod:(nonnull DBVarnameRecord *)RArg;
 
 - (nullable DBVarnameInterface *)Imethod:(nullable DBVarnameInterface *)IArg;

From 9463fa9a09e29d68444a5059584324df971e0114 Mon Sep 17 00:00:00 2001
From: Yannick Heinrich <yannick.heinrich@gmail.com>
Date: Fri, 2 Mar 2018 22:51:41 +0100
Subject: [PATCH 56/56] Generate an XCode like bridging header. (#342)

* Generate an XCode like bridging header.

Generates also the version number and name variable.

* Add new generated headers.

* Changes naming accorging to comments.

* Update generated variable names.
---
 .../objc/TextSort-Bridging-Header.h            | 11 +++++++++++
 src/source/Main.scala                          |  9 +++++----
 src/source/SwiftBridgingHeaderGenerator.scala  | 18 +++++++++++++++++-
 src/source/generator.scala                     |  4 +++-
 4 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/example/generated-src/objc/TextSort-Bridging-Header.h b/example/generated-src/objc/TextSort-Bridging-Header.h
index bad025562..840e576f0 100644
--- a/example/generated-src/objc/TextSort-Bridging-Header.h
+++ b/example/generated-src/objc/TextSort-Bridging-Header.h
@@ -1,6 +1,17 @@
 // AUTOGENERATED FILE - DO NOT MODIFY!
 // This file generated by Djinni
 
+// TextSort_Bridging_Header.h
+// TextSort_Bridging_Header
+
+#import <Foundation/Foundation.h>
+
+//! Project version number for TextSortBridgingHeader.
+FOUNDATION_EXPORT double TextSortBridgingHeaderVersionNumber;
+
+//! Project version string for TextSortBridgingHeader.
+FOUNDATION_EXPORT const unsigned char TextSortBridgingHeaderVersionString[];
+
 #import "TXSItemList.h"
 #import "TXSSortOrder.h"
 #import "TXSSortItems.h"
diff --git a/src/source/Main.scala b/src/source/Main.scala
index 84d97f017..ecbcee006 100644
--- a/src/source/Main.scala
+++ b/src/source/Main.scala
@@ -69,7 +69,7 @@ object Main {
     var objcTypePrefix: String = ""
     var objcIncludePrefix: String = ""
     var objcExtendedRecordIncludePrefix: String = ""
-    var objcSwiftBridgingHeader: Option[String] = None
+    var objcSwiftBridgingHeaderName: Option[String] = None
     var objcppIncludePrefix: String = ""
     var objcppIncludeCppPrefix: String = ""
     var objcppIncludeObjcPrefixOptional: Option[String] = None
@@ -168,7 +168,7 @@ object Main {
         .text("The prefix for Objective-C data types (usually two or three letters)")
       opt[String]("objc-include-prefix").valueName("<prefix>").foreach(objcIncludePrefix = _)
         .text("The prefix for #import of header files from Objective-C files.")
-      opt[String]("objc-swift-bridging-header").valueName("<name>").foreach(x => objcSwiftBridgingHeader = Some(x))
+      opt[String]("objc-swift-bridging-header").valueName("<name>").foreach(x => objcSwiftBridgingHeaderName = Some(x))
         .text("The name of Objective-C Bridging Header used in XCode's Swift projects.")
       note("")
       opt[File]("objcpp-out").valueName("<out-folder>").foreach(x => objcppOutFolder = Some(x))
@@ -288,8 +288,8 @@ object Main {
     } else {
       None
     }
-    val objcSwiftBridgingHeaderWriter = if (objcSwiftBridgingHeader.isDefined && objcOutFolder.isDefined) {
-      val objcSwiftBridgingHeaderFile = new File(objcOutFolder.get.getPath, objcSwiftBridgingHeader.get + ".h")
+    val objcSwiftBridgingHeaderWriter = if (objcSwiftBridgingHeaderName.isDefined && objcOutFolder.isDefined) {
+      val objcSwiftBridgingHeaderFile = new File(objcOutFolder.get.getPath, objcSwiftBridgingHeaderName.get + ".h")
       if (objcSwiftBridgingHeaderFile.getParentFile != null)
         createFolder("output file list", objcSwiftBridgingHeaderFile.getParentFile)
       Some(new BufferedWriter(new FileWriter(objcSwiftBridgingHeaderFile)))
@@ -346,6 +346,7 @@ object Main {
       objcppNamespace,
       objcBaseLibIncludePrefix,
       objcSwiftBridgingHeaderWriter,
+      objcSwiftBridgingHeaderName,
       outFileListWriter,
       skipGeneration,
       yamlOutFolder,
diff --git a/src/source/SwiftBridgingHeaderGenerator.scala b/src/source/SwiftBridgingHeaderGenerator.scala
index 441ea987b..f5d9d0761 100644
--- a/src/source/SwiftBridgingHeaderGenerator.scala
+++ b/src/source/SwiftBridgingHeaderGenerator.scala
@@ -38,8 +38,24 @@ class SwiftBridgingHeaderGenerator(spec: Spec) extends Generator(spec) {
 }
 
 object SwiftBridgingHeaderGenerator {
-  def writeAutogenerationWarning(writer: Writer) {
+  
+  val bridgingHeaderName = (s: String) => s.split('-').mkString("_")
+  val bridgingHeaderVariables = (s: String) => s.split('-').mkString("")
+
+  def writeAutogenerationWarning(name: String, writer: Writer) {
+    val bridgingHeaderVarName = bridgingHeaderName(name)
     writer.write("// AUTOGENERATED FILE - DO NOT MODIFY!\n")
     writer.write("// This file generated by Djinni\n\n")
+    writer.write("// " + bridgingHeaderVarName + ".h\n")
+    writer.write("// " + bridgingHeaderVarName + "\n\n")
+  }
+
+  def writeBridgingVars(name: String, writer: Writer) {
+    val bridgingHeaderVarName = bridgingHeaderVariables(name)
+    writer.write("#import <Foundation/Foundation.h>\n\n")
+    writer.write("//! Project version number for " + bridgingHeaderVarName +".\n")
+    writer.write("FOUNDATION_EXPORT double " + bridgingHeaderVarName + "VersionNumber;\n\n")
+    writer.write("//! Project version string for " + bridgingHeaderVarName +".\n")
+    writer.write("FOUNDATION_EXPORT const unsigned char " + bridgingHeaderVarName + "VersionString[];\n\n")
   }
 }
\ No newline at end of file
diff --git a/src/source/generator.scala b/src/source/generator.scala
index 17780f39c..b6024a7f5 100644
--- a/src/source/generator.scala
+++ b/src/source/generator.scala
@@ -77,6 +77,7 @@ package object generatorTools {
                    objcppNamespace: String,
                    objcBaseLibIncludePrefix: String,
                    objcSwiftBridgingHeaderWriter: Option[Writer],
+                   objcSwiftBridgingHeaderName: Option[String],
                    outFileListWriter: Option[Writer],
                    skipGeneration: Boolean,
                    yamlOutFolder: Option[File],
@@ -217,7 +218,8 @@ package object generatorTools {
         new ObjcppGenerator(spec).generate(idl)
       }
       if (spec.objcSwiftBridgingHeaderWriter.isDefined) {
-        SwiftBridgingHeaderGenerator.writeAutogenerationWarning(spec.objcSwiftBridgingHeaderWriter.get)
+        SwiftBridgingHeaderGenerator.writeAutogenerationWarning(spec.objcSwiftBridgingHeaderName.get, spec.objcSwiftBridgingHeaderWriter.get)
+        SwiftBridgingHeaderGenerator.writeBridgingVars(spec.objcSwiftBridgingHeaderName.get, spec.objcSwiftBridgingHeaderWriter.get)
         new SwiftBridgingHeaderGenerator(spec).generate(idl)
       }
       if (spec.yamlOutFolder.isDefined) {