From 83bf7eae660b96d86fe5f36512926116714e1b26 Mon Sep 17 00:00:00 2001
From: Jan-Erik Rediger <jrediger@mozilla.com>
Date: Wed, 21 Jun 2023 11:43:04 +0200
Subject: [PATCH 1/9] Release process: Remove step to touch uniffi/CHANGELOG.md

That file was ultimately not added in #1445.
We keep only a single changelog, listing all changes.
---
 docs/release-process.md | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/docs/release-process.md b/docs/release-process.md
index 1d73dea28b..d912b26575 100644
--- a/docs/release-process.md
+++ b/docs/release-process.md
@@ -21,13 +21,6 @@ Steps:
    * Anything that affects any UniFFI consumers should be listed, this includes consumers that
      use UniFFI to generate their scaffolding/bindings, external bindings generators, etc.
 
-1. Take a look over `uniffi/CHANGELOG.md` and make sure the "unreleased" section lists changes for
-   the release that affect users of the top-level `uniffi` crate.
-   * This should be a copy of the items from the top-level `CHANGELOG.md` that affects
-     scaffolding/bindings generation.
-   * Note that breaking changes for a particular `uniffi_*` crate are not necessarily breaking for
-     the `uniffi` crate.  See `./uniffi-versioning.md` for a discussion of this.
-
 1. Decide on a new version number for `uniffi` crate.  Since we are pre-`1.0`, if there are breaking
    changes then this should be a minor version bump, otherwise a patch version bump.
 

From 29782167bc10aa4cdd176e5225a4dc12d605d8e7 Mon Sep 17 00:00:00 2001
From: Jan-Erik Rediger <jrediger@mozilla.com>
Date: Wed, 21 Jun 2023 12:00:28 +0200
Subject: [PATCH 2/9] Correct the process description: releasing backend crates
 will not automatically create a tag

---
 docs/release-process.md | 2 +-
 release.toml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/release-process.md b/docs/release-process.md
index d912b26575..3cec1fe06a 100644
--- a/docs/release-process.md
+++ b/docs/release-process.md
@@ -51,7 +51,7 @@ Steps:
          worthwhile anyway!.
    * Release the crates: `cargo release-backend-crates -x {MAJOR}.{MINOR}.{PATCH}`.
        * **This will publish the new releases on crates.io**
-   This will create a local git tag, but does not push it to github.
+       * This will **NOT** create a local git tag.
 
 1. Release `uniffi`
    * **Do not execute this before the previous step.**  It depends on the published crates from that step
diff --git a/release.toml b/release.toml
index 26e8667df8..2e4e2bef2a 100644
--- a/release.toml
+++ b/release.toml
@@ -1,7 +1,7 @@
 tag-name = "v{{version}}"
 consolidate-commits = true
 
-shared-version=false
+shared-version = false
 
 # Disabling auto pushing for now to avoid accidents (although we can still "accidentally" publish
 # to crates.io, so it's not clear this is saving us anything?)

From 01e700f97c6211ef863656433808408a58095b14 Mon Sep 17 00:00:00 2001
From: Jan-Erik Rediger <jrediger@mozilla.com>
Date: Wed, 21 Jun 2023 14:03:55 +0200
Subject: [PATCH 3/9] Python: Remove unused import

---
 uniffi_bindgen/src/bindings/python/templates/wrapper.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/uniffi_bindgen/src/bindings/python/templates/wrapper.py b/uniffi_bindgen/src/bindings/python/templates/wrapper.py
index 8232d2fb96..c701efe385 100644
--- a/uniffi_bindgen/src/bindings/python/templates/wrapper.py
+++ b/uniffi_bindgen/src/bindings/python/templates/wrapper.py
@@ -24,7 +24,6 @@
 {%- if ci.has_async_fns() %}
 import asyncio
 {%- endif %}
-import contextvars
 import platform
 {%- for req in self.imports() %}
 {{ req.render() }}

From 68107e38247d5086d5b9c4a379dd6640944b4fd5 Mon Sep 17 00:00:00 2001
From: Mark Hammond <mhammond@skippinet.com.au>
Date: Wed, 21 Jun 2023 10:57:36 -0400
Subject: [PATCH 4/9] Fix Kotlin error handling in async functions (#1614)

---
 fixtures/futures/src/lib.rs                      | 10 ++++++++++
 fixtures/futures/tests/bindings/test_futures.kts |  8 ++++++++
 fixtures/futures/tests/bindings/test_futures.py  | 15 ++++++++++++++-
 .../futures/tests/bindings/test_futures.swift    | 16 ++++++++++++++++
 .../src/bindings/kotlin/templates/AsyncTypes.kt  |  6 +++---
 5 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/fixtures/futures/src/lib.rs b/fixtures/futures/src/lib.rs
index 088b36db74..38012d6bcb 100644
--- a/fixtures/futures/src/lib.rs
+++ b/fixtures/futures/src/lib.rs
@@ -116,6 +116,16 @@ pub async fn fallible_me(do_fail: bool) -> Result<u8, MyError> {
     }
 }
 
+// An async function returning a struct that can throw.
+#[uniffi::export]
+pub async fn fallible_struct(do_fail: bool) -> Result<Arc<Megaphone>, MyError> {
+    if do_fail {
+        Err(MyError::Foo)
+    } else {
+        Ok(new_megaphone())
+    }
+}
+
 /// Sync function that generates a new `Megaphone`.
 ///
 /// It builds a `Megaphone` which has async methods on it.
diff --git a/fixtures/futures/tests/bindings/test_futures.kts b/fixtures/futures/tests/bindings/test_futures.kts
index 93d3a2e1cb..6fa2643a55 100644
--- a/fixtures/futures/tests/bindings/test_futures.kts
+++ b/fixtures/futures/tests/bindings/test_futures.kts
@@ -166,6 +166,14 @@ runBlocking {
 
     print("fallible method (with exception): ${time4}ms")
     assert(time4 < 100)
+
+    fallibleStruct(false)
+    try {
+        fallibleStruct(true)
+        assert(false) // should never be reached
+    } catch (exception: MyException) {
+        assert(true)
+    }
     println(" ... ok")
 }
 
diff --git a/fixtures/futures/tests/bindings/test_futures.py b/fixtures/futures/tests/bindings/test_futures.py
index 0ced85ea2e..17ce24292d 100644
--- a/fixtures/futures/tests/bindings/test_futures.py
+++ b/fixtures/futures/tests/bindings/test_futures.py
@@ -1,4 +1,4 @@
-from uniffi_futures import always_ready, void, sleep, say_after, new_megaphone, say_after_with_tokio, fallible_me, MyError, MyRecord, new_my_record
+from uniffi_futures import always_ready, void, sleep, say_after, new_megaphone, say_after_with_tokio, fallible_me, fallible_struct, MyError, MyRecord, new_my_record
 import unittest
 from datetime import datetime
 import asyncio
@@ -110,6 +110,19 @@ async def test():
 
         asyncio.run(test())
 
+    def test_fallible_struct(self):
+        async def test():
+            megaphone = await fallible_struct(False)
+            self.assertEqual(await megaphone.fallible_me(False), 42)
+
+            try:
+                await fallible_struct(True)
+                self.assertTrue(False) # should never be reached
+            except MyError as exception:
+                pass
+
+        asyncio.run(test())
+
     def test_record(self):
         async def test():
             result = await new_my_record("foo", 42)
diff --git a/fixtures/futures/tests/bindings/test_futures.swift b/fixtures/futures/tests/bindings/test_futures.swift
index 6d315f20aa..d02410dcfa 100644
--- a/fixtures/futures/tests/bindings/test_futures.swift
+++ b/fixtures/futures/tests/bindings/test_futures.swift
@@ -155,6 +155,12 @@ Task {
 	counter.leave()
 }
 
+Task {
+	let m = try await fallibleStruct(doFail: false)
+	let result = try await m.fallibleMe(doFail: false)
+	assert(result == 42)
+}
+
 counter.enter()
 
 Task {
@@ -193,6 +199,16 @@ Task {
 	counter.leave()
 }
 
+Task {
+	do {
+		let _ = try await fallibleStruct(doFail: true)
+	} catch MyError.Foo {
+		assert(true)
+	} catch {
+		assert(false)
+	}
+}
+
 counter.enter()
 
 Task {
diff --git a/uniffi_bindgen/src/bindings/kotlin/templates/AsyncTypes.kt b/uniffi_bindgen/src/bindings/kotlin/templates/AsyncTypes.kt
index a22d53c3f4..57e3b268ca 100644
--- a/uniffi_bindgen/src/bindings/kotlin/templates/AsyncTypes.kt
+++ b/uniffi_bindgen/src/bindings/kotlin/templates/AsyncTypes.kt
@@ -15,7 +15,7 @@
 internal interface UniFfiFutureCallback{{ callback_param|ffi_type_name }} : com.sun.jna.Callback {
     // Note: callbackData is always 0.  We could pass Rust a pointer/usize to represent the
     // continuation, but with JNA it's easier to just store it in the callback handler.
-    fun invoke(_callbackData: USize, returnValue: {{ callback_param|ffi_type_name_by_value }}, callStatus: RustCallStatus.ByValue);
+    fun invoke(_callbackData: USize, returnValue: {{ callback_param|ffi_type_name_by_value }}?, callStatus: RustCallStatus.ByValue);
 }
 {%- endfor %}
 
@@ -26,12 +26,12 @@ internal interface UniFfiFutureCallback{{ callback_param|ffi_type_name }} : com.
 
 internal class {{ result_type|future_callback_handler }}(val continuation: {{ result_type|future_continuation_type }})
     : UniFfiFutureCallback{{ callback_param|ffi_type_name }} {
-    override fun invoke(_callbackData: USize, returnValue: {{ callback_param|ffi_type_name_by_value }}, callStatus: RustCallStatus.ByValue) {
+    override fun invoke(_callbackData: USize, returnValue: {{ callback_param|ffi_type_name_by_value }}?, callStatus: RustCallStatus.ByValue) {
         try {
             checkCallStatus({{ result_type|error_handler }}, callStatus)
             {%- match result_type.return_type %}
             {%- when Some(return_type) %}
-            continuation.resume({{ return_type|lift_fn }}(returnValue))
+            continuation.resume({{ return_type|lift_fn }}(returnValue!!))
             {%- when None %}
             continuation.resume(Unit)
             {%- endmatch %}

From 6938c262293802f00a373f0d1aa16a2079071b24 Mon Sep 17 00:00:00 2001
From: Jan-Erik Rediger <jrediger@mozilla.com>
Date: Wed, 21 Jun 2023 15:20:40 +0200
Subject: [PATCH 5/9] Delay contract checks until after all functions are
 defined

Otherwise we might call it with the wrong ABI.
This so far wasn't an issue on platforms UniFFI tests on,
but can be observed on Windows (at leats in Wine),
where suddenly the checksums won't match, e.g.
39784 is expected, but the call gets 33135464 back.
The former is 0x9b68 and fits well within a 16-bit unsigned integer.
The latter is 0x1f99b68 which does not fit (but it has the same suffix,
guess why...)
---
 .../bindings/python/templates/NamespaceLibraryTemplate.py    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/uniffi_bindgen/src/bindings/python/templates/NamespaceLibraryTemplate.py b/uniffi_bindgen/src/bindings/python/templates/NamespaceLibraryTemplate.py
index ab6ba409a3..6944d3834a 100644
--- a/uniffi_bindgen/src/bindings/python/templates/NamespaceLibraryTemplate.py
+++ b/uniffi_bindgen/src/bindings/python/templates/NamespaceLibraryTemplate.py
@@ -52,8 +52,6 @@ def loadIndirect():
     libname = libname.format("{{ config.cdylib_name() }}")
     path = str(Path(__file__).parent / libname)
     lib = ctypes.cdll.LoadLibrary(path)
-    uniffi_check_contract_api_version(lib)
-    uniffi_check_api_checksums(lib)
     return lib
 
 def uniffi_check_contract_api_version(lib):
@@ -82,3 +80,6 @@ def uniffi_check_api_checksums(lib):
 )
 _UniFFILib.{{ func.name() }}.restype = {% match func.return_type() %}{% when Some with (type_) %}{{ type_|ffi_type_name }}{% when None %}None{% endmatch %}
 {%- endfor %}
+{# Ensure to call the contract verification only after we defined all functions. -#}
+uniffi_check_contract_api_version(_UniFFILib)
+uniffi_check_api_checksums(_UniFFILib)

From 6ac168b91df5853f5cb77b36b35b59a42cc4c80f Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh@glandium.org>
Date: Thu, 22 Jun 2023 16:10:48 +0900
Subject: [PATCH 6/9] Add a version to the example/fixture dependencies on
 uniffi

This should allow to vendor the crates without hacks like
https://searchfox.org/mozilla-central/rev/fb55a4ee44a9a95d099aa806ca494eb988252ded/Cargo.toml#192-197

The downside is that it requires updating the version when the uniffi
version bumps in a semver-incompatible way.
---
 examples/app/uniffi-bindgen-cli/Cargo.toml                  | 2 +-
 examples/arithmetic/Cargo.toml                              | 6 +++---
 examples/callbacks/Cargo.toml                               | 6 +++---
 examples/custom-types/Cargo.toml                            | 6 +++---
 examples/geometry/Cargo.toml                                | 6 +++---
 examples/rondpoint/Cargo.toml                               | 6 +++---
 examples/sprites/Cargo.toml                                 | 6 +++---
 examples/todolist/Cargo.toml                                | 6 +++---
 examples/traits/Cargo.toml                                  | 6 +++---
 fixtures/benchmarks/Cargo.toml                              | 4 ++--
 fixtures/callbacks/Cargo.toml                               | 6 +++---
 fixtures/coverall/Cargo.toml                                | 6 +++---
 fixtures/ext-types/guid/Cargo.toml                          | 6 +++---
 fixtures/ext-types/lib/Cargo.toml                           | 6 +++---
 fixtures/ext-types/uniffi-one/Cargo.toml                    | 4 ++--
 fixtures/external-types/lib/Cargo.toml                      | 6 +++---
 fixtures/foreign-executor/Cargo.toml                        | 6 +++---
 fixtures/futures/Cargo.toml                                 | 6 +++---
 fixtures/keywords/kotlin/Cargo.toml                         | 6 +++---
 fixtures/keywords/rust/Cargo.toml                           | 6 +++---
 fixtures/keywords/swift/Cargo.toml                          | 6 +++---
 fixtures/metadata/Cargo.toml                                | 2 +-
 fixtures/proc-macro/Cargo.toml                              | 6 +++---
 fixtures/reexport-scaffolding-macro/Cargo.toml              | 4 ++--
 .../cdylib-crate-type-dependency/ffi-crate/Cargo.toml       | 6 +++---
 fixtures/regressions/enum-without-i32-helpers/Cargo.toml    | 6 +++---
 fixtures/regressions/fully-qualified-types/Cargo.toml       | 4 ++--
 .../kotlin-experimental-unsigned-types/Cargo.toml           | 6 +++---
 fixtures/regressions/logging-callback-interface/Cargo.toml  | 6 +++---
 fixtures/regressions/missing-newline/Cargo.toml             | 6 +++---
 fixtures/regressions/swift-callbacks-omit-labels/Cargo.toml | 6 +++---
 fixtures/regressions/swift-dictionary-nesting/Cargo.toml    | 6 +++---
 fixtures/regressions/unary-result-alias/Cargo.toml          | 6 +++---
 fixtures/simple-fns/Cargo.toml                              | 6 +++---
 fixtures/simple-iface/Cargo.toml                            | 6 +++---
 fixtures/swift-bridging-header-compile/Cargo.toml           | 6 +++---
 fixtures/swift-omit-labels/Cargo.toml                       | 6 +++---
 fixtures/trait-methods/Cargo.toml                           | 6 +++---
 fixtures/type-limits/Cargo.toml                             | 6 +++---
 fixtures/uitests/Cargo.toml                                 | 2 +-
 fixtures/uniffi-fixture-time/Cargo.toml                     | 6 +++---
 fixtures/version-mismatch/Cargo.toml                        | 4 ++--
 42 files changed, 115 insertions(+), 115 deletions(-)

diff --git a/examples/app/uniffi-bindgen-cli/Cargo.toml b/examples/app/uniffi-bindgen-cli/Cargo.toml
index 4edd7fe9fe..76e46a744c 100644
--- a/examples/app/uniffi-bindgen-cli/Cargo.toml
+++ b/examples/app/uniffi-bindgen-cli/Cargo.toml
@@ -9,4 +9,4 @@ name = "uniffi-bindgen"
 path = "uniffi-bindgen.rs"
 
 [dependencies]
-uniffi = { path = "../../../uniffi", features = ["cli"] }
+uniffi = { path = "../../../uniffi", version = "0.24", features = ["cli"] }
diff --git a/examples/arithmetic/Cargo.toml b/examples/arithmetic/Cargo.toml
index 771fa1fb6e..7be3b6801c 100644
--- a/examples/arithmetic/Cargo.toml
+++ b/examples/arithmetic/Cargo.toml
@@ -11,11 +11,11 @@ crate-type = ["lib", "cdylib"]
 name = "arithmetical"
 
 [dependencies]
-uniffi = {path = "../../uniffi"}
+uniffi = {path = "../../uniffi", version = "0.24" }
 thiserror = "1.0"
 
 [build-dependencies]
-uniffi = {path = "../../uniffi", features = ["build"] }
+uniffi = {path = "../../uniffi", version = "0.24", features = ["build"] }
 
 [dev-dependencies]
-uniffi = {path = "../../uniffi", features = ["bindgen-tests"] }
+uniffi = {path = "../../uniffi", version = "0.24", features = ["bindgen-tests"] }
diff --git a/examples/callbacks/Cargo.toml b/examples/callbacks/Cargo.toml
index 80daaee928..f5d50f1b4c 100644
--- a/examples/callbacks/Cargo.toml
+++ b/examples/callbacks/Cargo.toml
@@ -11,11 +11,11 @@ crate-type = ["lib", "cdylib"]
 name = "uniffi_callbacks"
 
 [dependencies]
-uniffi = {path = "../../uniffi"}
+uniffi = {path = "../../uniffi", version = "0.24" }
 thiserror = "1.0"
 
 [build-dependencies]
-uniffi = {path = "../../uniffi", features = ["build"] }
+uniffi = {path = "../../uniffi", version = "0.24", features = ["build"] }
 
 [dev-dependencies]
-uniffi = {path = "../../uniffi", features = ["bindgen-tests"] }
+uniffi = {path = "../../uniffi", version = "0.24", features = ["bindgen-tests"] }
diff --git a/examples/custom-types/Cargo.toml b/examples/custom-types/Cargo.toml
index 194f17099f..4616a6c82e 100644
--- a/examples/custom-types/Cargo.toml
+++ b/examples/custom-types/Cargo.toml
@@ -14,11 +14,11 @@ name = "custom_types"
 anyhow = "1"
 bytes = "1.3"
 serde_json = "1"
-uniffi = {path = "../../uniffi"}
+uniffi = {path = "../../uniffi", version = "0.24" }
 url = "2.2"
 
 [build-dependencies]
-uniffi = {path = "../../uniffi", features = ["build"] }
+uniffi = {path = "../../uniffi", version = "0.24", features = ["build"] }
 
 [dev-dependencies]
-uniffi = {path = "../../uniffi", features = ["bindgen-tests"] }
+uniffi = {path = "../../uniffi", version = "0.24", features = ["bindgen-tests"] }
diff --git a/examples/geometry/Cargo.toml b/examples/geometry/Cargo.toml
index 4601185607..158e4317f4 100644
--- a/examples/geometry/Cargo.toml
+++ b/examples/geometry/Cargo.toml
@@ -11,10 +11,10 @@ crate-type = ["lib", "cdylib"]
 name = "uniffi_geometry"
 
 [dependencies]
-uniffi = {path = "../../uniffi"}
+uniffi = {path = "../../uniffi", version = "0.24" }
 
 [build-dependencies]
-uniffi = {path = "../../uniffi", features = ["build"] }
+uniffi = {path = "../../uniffi", version = "0.24", features = ["build"] }
 
 [dev-dependencies]
-uniffi = {path = "../../uniffi", features = ["bindgen-tests"] }
+uniffi = {path = "../../uniffi", version = "0.24", features = ["bindgen-tests"] }
diff --git a/examples/rondpoint/Cargo.toml b/examples/rondpoint/Cargo.toml
index a3f8a9d217..16b3a2739c 100644
--- a/examples/rondpoint/Cargo.toml
+++ b/examples/rondpoint/Cargo.toml
@@ -11,10 +11,10 @@ crate-type = ["lib", "cdylib"]
 name = "uniffi_rondpoint"
 
 [dependencies]
-uniffi = {path = "../../uniffi"}
+uniffi = {path = "../../uniffi", version = "0.24" }
 
 [build-dependencies]
-uniffi = {path = "../../uniffi", features = ["build"] }
+uniffi = {path = "../../uniffi", version = "0.24", features = ["build"] }
 
 [dev-dependencies]
-uniffi = {path = "../../uniffi", features = ["bindgen-tests"] }
+uniffi = {path = "../../uniffi", version = "0.24", features = ["bindgen-tests"] }
diff --git a/examples/sprites/Cargo.toml b/examples/sprites/Cargo.toml
index 15d7a4fca4..3f3c22fdf7 100644
--- a/examples/sprites/Cargo.toml
+++ b/examples/sprites/Cargo.toml
@@ -11,10 +11,10 @@ crate-type = ["lib", "cdylib"]
 name = "uniffi_sprites"
 
 [dependencies]
-uniffi = {path = "../../uniffi"}
+uniffi = {path = "../../uniffi", version = "0.24" }
 
 [build-dependencies]
-uniffi = {path = "../../uniffi", features = ["build"] }
+uniffi = {path = "../../uniffi", version = "0.24", features = ["build"] }
 
 [dev-dependencies]
-uniffi = {path = "../../uniffi", features = ["bindgen-tests"] }
+uniffi = {path = "../../uniffi", version = "0.24", features = ["bindgen-tests"] }
diff --git a/examples/todolist/Cargo.toml b/examples/todolist/Cargo.toml
index 76aa2e4962..26d57a1f9d 100644
--- a/examples/todolist/Cargo.toml
+++ b/examples/todolist/Cargo.toml
@@ -11,12 +11,12 @@ crate-type = ["lib", "cdylib"]
 name = "uniffi_todolist"
 
 [dependencies]
-uniffi = {path = "../../uniffi"}
+uniffi = {path = "../../uniffi", version = "0.24" }
 once_cell = "1.12"
 thiserror = "1.0"
 
 [build-dependencies]
-uniffi = {path = "../../uniffi", features = ["build"] }
+uniffi = {path = "../../uniffi", version = "0.24", features = ["build"] }
 
 [dev-dependencies]
-uniffi = {path = "../../uniffi", features = ["bindgen-tests"] }
+uniffi = {path = "../../uniffi", version = "0.24", features = ["bindgen-tests"] }
diff --git a/examples/traits/Cargo.toml b/examples/traits/Cargo.toml
index 42cb31e3be..b53df91c04 100644
--- a/examples/traits/Cargo.toml
+++ b/examples/traits/Cargo.toml
@@ -11,12 +11,12 @@ crate-type = ["lib", "cdylib"]
 name = "uniffi_traits"
 
 [dependencies]
-uniffi = {path = "../../uniffi"}
+uniffi = {path = "../../uniffi", version = "0.24" }
 thiserror = "1.0"
 
 [build-dependencies]
-uniffi = {path = "../../uniffi", features = ["build"] }
+uniffi = {path = "../../uniffi", version = "0.24", features = ["build"] }
 
 [dev-dependencies]
-uniffi = {path = "../../uniffi", features = ["bindgen-tests"] }
+uniffi = {path = "../../uniffi", version = "0.24", features = ["bindgen-tests"] }
 
diff --git a/fixtures/benchmarks/Cargo.toml b/fixtures/benchmarks/Cargo.toml
index 77914717b9..f5a72ae5e0 100644
--- a/fixtures/benchmarks/Cargo.toml
+++ b/fixtures/benchmarks/Cargo.toml
@@ -12,12 +12,12 @@ name = "uniffi_benchmarks"
 bench = false
 
 [dependencies]
-uniffi = {path = "../../uniffi"}
+uniffi = {path = "../../uniffi", version = "0.24" }
 clap = { version = "4", features = ["cargo", "std", "derive"] }
 criterion = "0.5.1"
 
 [build-dependencies]
-uniffi = {path = "../../uniffi", features = ["build"] }
+uniffi = {path = "../../uniffi", version = "0.24", features = ["build"] }
 
 [dev-dependencies]
 uniffi_bindgen = {path = "../../uniffi_bindgen"}
diff --git a/fixtures/callbacks/Cargo.toml b/fixtures/callbacks/Cargo.toml
index 33c5de32a4..7ff5520479 100644
--- a/fixtures/callbacks/Cargo.toml
+++ b/fixtures/callbacks/Cargo.toml
@@ -11,11 +11,11 @@ crate-type = ["lib", "cdylib"]
 name = "uniffi_fixture_callbacks"
 
 [dependencies]
-uniffi = {path = "../../uniffi"}
+uniffi = {path = "../../uniffi", version = "0.24" }
 thiserror = "1.0"
 
 [build-dependencies]
-uniffi = {path = "../../uniffi", features = ["build"] }
+uniffi = {path = "../../uniffi", version = "0.24", features = ["build"] }
 
 [dev-dependencies]
-uniffi = {path = "../../uniffi", features = ["bindgen-tests"] }
+uniffi = {path = "../../uniffi", version = "0.24", features = ["bindgen-tests"] }
diff --git a/fixtures/coverall/Cargo.toml b/fixtures/coverall/Cargo.toml
index 777d2134b9..a755924b3f 100644
--- a/fixtures/coverall/Cargo.toml
+++ b/fixtures/coverall/Cargo.toml
@@ -11,12 +11,12 @@ crate-type = ["lib", "cdylib"]
 name = "uniffi_coverall"
 
 [dependencies]
-uniffi = {path = "../../uniffi"}
+uniffi = {path = "../../uniffi", version = "0.24" }
 once_cell = "1.12"
 thiserror = "1.0"
 
 [build-dependencies]
-uniffi = {path = "../../uniffi", features = ["build"] }
+uniffi = {path = "../../uniffi", version = "0.24", features = ["build"] }
 
 [dev-dependencies]
-uniffi = {path = "../../uniffi", features = ["bindgen-tests"] }
+uniffi = {path = "../../uniffi", version = "0.24", features = ["bindgen-tests"] }
diff --git a/fixtures/ext-types/guid/Cargo.toml b/fixtures/ext-types/guid/Cargo.toml
index f204dbc1ab..435bd20c37 100644
--- a/fixtures/ext-types/guid/Cargo.toml
+++ b/fixtures/ext-types/guid/Cargo.toml
@@ -15,10 +15,10 @@ anyhow = "1"
 bytes = "1.3"
 serde_json = "1"
 thiserror = "1.0"
-uniffi = {path = "../../../uniffi"}
+uniffi = {path = "../../../uniffi", version = "0.24" }
 
 [build-dependencies]
-uniffi = {path = "../../../uniffi", features = ["build"] }
+uniffi = {path = "../../../uniffi", version = "0.24", features = ["build"] }
 
 [dev-dependencies]
-uniffi = {path = "../../../uniffi", features = ["bindgen-tests"] }
+uniffi = {path = "../../../uniffi", version = "0.24", features = ["bindgen-tests"] }
diff --git a/fixtures/ext-types/lib/Cargo.toml b/fixtures/ext-types/lib/Cargo.toml
index 323dba2e9b..de3e01a956 100644
--- a/fixtures/ext-types/lib/Cargo.toml
+++ b/fixtures/ext-types/lib/Cargo.toml
@@ -20,7 +20,7 @@ name = "uniffi_ext_types_lib"
 [dependencies]
 anyhow = "1"
 bytes = "1.3"
-uniffi = {path = "../../../uniffi"}
+uniffi = {path = "../../../uniffi", version = "0.24" }
 
 uniffi-fixture-ext-types-lib-one = {path = "../uniffi-one"}
 uniffi-fixture-ext-types-guid = {path = "../guid"}
@@ -31,7 +31,7 @@ uniffi-example-custom-types = {path = "../../../examples/custom-types"}
 url = "2.2"
 
 [build-dependencies]
-uniffi = {path = "../../../uniffi", features = ["build"] }
+uniffi = {path = "../../../uniffi", version = "0.24", features = ["build"] }
 
 [dev-dependencies]
-uniffi = {path = "../../../uniffi", features = ["bindgen-tests"] }
+uniffi = {path = "../../../uniffi", version = "0.24", features = ["bindgen-tests"] }
diff --git a/fixtures/ext-types/uniffi-one/Cargo.toml b/fixtures/ext-types/uniffi-one/Cargo.toml
index 5e4a6be4b4..de1dbf9807 100644
--- a/fixtures/ext-types/uniffi-one/Cargo.toml
+++ b/fixtures/ext-types/uniffi-one/Cargo.toml
@@ -13,7 +13,7 @@ name = "uniffi_one"
 [dependencies]
 anyhow = "1"
 bytes = "1.3"
-uniffi = {path = "../../../uniffi"}
+uniffi = {path = "../../../uniffi", version = "0.24" }
 
 [build-dependencies]
-uniffi = {path = "../../../uniffi", features = ["build"] }
+uniffi = {path = "../../../uniffi", version = "0.24", features = ["build"] }
diff --git a/fixtures/external-types/lib/Cargo.toml b/fixtures/external-types/lib/Cargo.toml
index 35a6bd6304..297d32dcbc 100644
--- a/fixtures/external-types/lib/Cargo.toml
+++ b/fixtures/external-types/lib/Cargo.toml
@@ -13,12 +13,12 @@ name = "uniffi_external_types_lib"
 [dependencies]
 anyhow = "1"
 bytes = "1.3"
-uniffi = {path = "../../../uniffi"}
+uniffi = {path = "../../../uniffi", version = "0.24" }
 crate_one = {path = "../crate-one"}
 crate_two = {path = "../crate-two"}
 
 [build-dependencies]
-uniffi = {path = "../../../uniffi", features = ["build"] }
+uniffi = {path = "../../../uniffi", version = "0.24", features = ["build"] }
 
 [dev-dependencies]
-uniffi = {path = "../../../uniffi", features = ["bindgen-tests"] }
+uniffi = {path = "../../../uniffi", version = "0.24", features = ["bindgen-tests"] }
diff --git a/fixtures/foreign-executor/Cargo.toml b/fixtures/foreign-executor/Cargo.toml
index adc6741fdb..d12f34569a 100644
--- a/fixtures/foreign-executor/Cargo.toml
+++ b/fixtures/foreign-executor/Cargo.toml
@@ -10,10 +10,10 @@ crate-type = ["lib", "cdylib"]
 name = "uniffi_fixture_foreign_executor"
 
 [dependencies]
-uniffi = { path = "../../uniffi" }
+uniffi = { path = "../../uniffi", version = "0.24" }
 
 [build-dependencies]
-uniffi = { path = "../../uniffi", features = ["build"] }
+uniffi = { path = "../../uniffi", version = "0.24", features = ["build"] }
 
 [dev-dependencies]
-uniffi = { path = "../../uniffi", features = ["bindgen-tests"] }
+uniffi = { path = "../../uniffi", version = "0.24", features = ["bindgen-tests"] }
diff --git a/fixtures/futures/Cargo.toml b/fixtures/futures/Cargo.toml
index c089e9ea8d..18526a81e9 100644
--- a/fixtures/futures/Cargo.toml
+++ b/fixtures/futures/Cargo.toml
@@ -15,11 +15,11 @@ name = "uniffi-fixtures-futures"
 path = "src/bin.rs"
 
 [dependencies]
-uniffi = { path = "../../uniffi", features = ["tokio", "cli"] }
+uniffi = { path = "../../uniffi", version = "0.24", features = ["tokio", "cli"] }
 tokio = { version = "1.24.1", features = ["time"] }
 
 [build-dependencies]
-uniffi = { path = "../../uniffi", features = ["build"] }
+uniffi = { path = "../../uniffi", version = "0.24", features = ["build"] }
 
 [dev-dependencies]
-uniffi = { path = "../../uniffi", features = ["bindgen-tests"] }
+uniffi = { path = "../../uniffi", version = "0.24", features = ["bindgen-tests"] }
diff --git a/fixtures/keywords/kotlin/Cargo.toml b/fixtures/keywords/kotlin/Cargo.toml
index 63c7343059..97d9a5214b 100644
--- a/fixtures/keywords/kotlin/Cargo.toml
+++ b/fixtures/keywords/kotlin/Cargo.toml
@@ -11,10 +11,10 @@ name = "uniffi_keywords_kotlin"
 
 [dependencies]
 thiserror = "1.0"
-uniffi = {path = "../../../uniffi"}
+uniffi = {path = "../../../uniffi", version = "0.24" }
 
 [build-dependencies]
-uniffi = {path = "../../../uniffi", features = ["build"] }
+uniffi = {path = "../../../uniffi", version = "0.24", features = ["build"] }
 
 [dev-dependencies]
-uniffi = {path = "../../../uniffi", features = ["bindgen-tests"] }
+uniffi = {path = "../../../uniffi", version = "0.24", features = ["bindgen-tests"] }
diff --git a/fixtures/keywords/rust/Cargo.toml b/fixtures/keywords/rust/Cargo.toml
index 73819025c3..98939c1a4c 100644
--- a/fixtures/keywords/rust/Cargo.toml
+++ b/fixtures/keywords/rust/Cargo.toml
@@ -11,10 +11,10 @@ name = "uniffi_keywords_rust"
 
 [dependencies]
 thiserror = "1.0"
-uniffi = {path = "../../../uniffi"}
+uniffi = {path = "../../../uniffi", version = "0.24" }
 
 [build-dependencies]
-uniffi = {path = "../../../uniffi", features = ["build"] }
+uniffi = {path = "../../../uniffi", version = "0.24", features = ["build"] }
 
 [dev-dependencies]
-uniffi = {path = "../../../uniffi", features = ["bindgen-tests"] }
+uniffi = {path = "../../../uniffi", version = "0.24", features = ["bindgen-tests"] }
diff --git a/fixtures/keywords/swift/Cargo.toml b/fixtures/keywords/swift/Cargo.toml
index 4c323d9207..b7c35fd0bb 100644
--- a/fixtures/keywords/swift/Cargo.toml
+++ b/fixtures/keywords/swift/Cargo.toml
@@ -11,10 +11,10 @@ name = "uniffi_keywords_swift"
 
 [dependencies]
 thiserror = "1.0"
-uniffi = {path = "../../../uniffi"}
+uniffi = {path = "../../../uniffi", version = "0.24" }
 
 [build-dependencies]
-uniffi = {path = "../../../uniffi", features = ["build"] }
+uniffi = {path = "../../../uniffi", version = "0.24", features = ["build"] }
 
 [dev-dependencies]
-uniffi = {path = "../../../uniffi", features = ["bindgen-tests"] }
+uniffi = {path = "../../../uniffi", version = "0.24", features = ["bindgen-tests"] }
diff --git a/fixtures/metadata/Cargo.toml b/fixtures/metadata/Cargo.toml
index 23ea205801..8807874989 100644
--- a/fixtures/metadata/Cargo.toml
+++ b/fixtures/metadata/Cargo.toml
@@ -9,6 +9,6 @@ publish = false
 name = "uniffi_fixture_metadata"
 
 [dependencies]
-uniffi = { path = "../../uniffi" }
+uniffi = { path = "../../uniffi", version = "0.24" }
 uniffi_meta = { path = "../../uniffi_meta" }
 uniffi_core = { path = "../../uniffi_core" }
diff --git a/fixtures/proc-macro/Cargo.toml b/fixtures/proc-macro/Cargo.toml
index 4719955337..b504919b40 100644
--- a/fixtures/proc-macro/Cargo.toml
+++ b/fixtures/proc-macro/Cargo.toml
@@ -11,12 +11,12 @@ name = "uniffi_proc_macro"
 crate-type = ["lib", "cdylib"]
 
 [dependencies]
-uniffi = { path = "../../uniffi" }
+uniffi = { path = "../../uniffi", version = "0.24" }
 thiserror = "1.0"
 lazy_static = "1.4"
 
 [build-dependencies]
-uniffi = {path = "../../uniffi", features = ["build"] }
+uniffi = {path = "../../uniffi", version = "0.24", features = ["build"] }
 
 [dev-dependencies]
-uniffi = {path = "../../uniffi", features = ["bindgen-tests"] }
+uniffi = {path = "../../uniffi", version = "0.24", features = ["bindgen-tests"] }
diff --git a/fixtures/reexport-scaffolding-macro/Cargo.toml b/fixtures/reexport-scaffolding-macro/Cargo.toml
index 4e9bb25390..5e0f95048d 100644
--- a/fixtures/reexport-scaffolding-macro/Cargo.toml
+++ b/fixtures/reexport-scaffolding-macro/Cargo.toml
@@ -15,10 +15,10 @@ crate-type = ["lib", "cdylib"]
 [dependencies]
 uniffi-fixture-callbacks = { path = "../callbacks" }
 uniffi-fixture-coverall = { path = "../coverall" }
-uniffi = { path = "../../uniffi" }
+uniffi = { path = "../../uniffi", version = "0.24" }
 uniffi_bindgen = { path = "../../uniffi_bindgen" }
 
 [dev-dependencies]
 cargo_metadata = "0.15"
 libloading = "0.7"
-uniffi = { path = "../../uniffi" }
+uniffi = { path = "../../uniffi", version = "0.24" }
diff --git a/fixtures/regressions/cdylib-crate-type-dependency/ffi-crate/Cargo.toml b/fixtures/regressions/cdylib-crate-type-dependency/ffi-crate/Cargo.toml
index c51c6ef3d6..cd46829794 100644
--- a/fixtures/regressions/cdylib-crate-type-dependency/ffi-crate/Cargo.toml
+++ b/fixtures/regressions/cdylib-crate-type-dependency/ffi-crate/Cargo.toml
@@ -11,11 +11,11 @@ crate-type = ["lib", "cdylib"]
 name = "uniffi_empty"
 
 [dependencies]
-uniffi = {path = "../../../../uniffi"}
+uniffi = {path = "../../../../uniffi", version = "0.24" }
 uniffi-fixture-regression-cdylib-dependency = {path = "../cdylib-dependency"}
 
 [build-dependencies]
-uniffi = {path = "../../../../uniffi", features = ["build"] }
+uniffi = {path = "../../../../uniffi", version = "0.24", features = ["build"] }
 
 [dev-dependencies]
-uniffi = {path = "../../../../uniffi", features = ["bindgen-tests"] }
+uniffi = {path = "../../../../uniffi", version = "0.24", features = ["bindgen-tests"] }
diff --git a/fixtures/regressions/enum-without-i32-helpers/Cargo.toml b/fixtures/regressions/enum-without-i32-helpers/Cargo.toml
index d9cfe30af3..447274d90f 100644
--- a/fixtures/regressions/enum-without-i32-helpers/Cargo.toml
+++ b/fixtures/regressions/enum-without-i32-helpers/Cargo.toml
@@ -11,10 +11,10 @@ crate-type = ["lib", "cdylib"]
 name = "uniffi_regression_test_i356"
 
 [dependencies]
-uniffi = {path = "../../../uniffi"}
+uniffi = {path = "../../../uniffi", version = "0.24" }
 
 [build-dependencies]
-uniffi = {path = "../../../uniffi", features = ["build"] }
+uniffi = {path = "../../../uniffi", version = "0.24", features = ["build"] }
 
 [dev-dependencies]
-uniffi = {path = "../../../uniffi", features = ["bindgen-tests"] }
+uniffi = {path = "../../../uniffi", version = "0.24", features = ["bindgen-tests"] }
diff --git a/fixtures/regressions/fully-qualified-types/Cargo.toml b/fixtures/regressions/fully-qualified-types/Cargo.toml
index c028c5cd0b..0175d9cc6e 100644
--- a/fixtures/regressions/fully-qualified-types/Cargo.toml
+++ b/fixtures/regressions/fully-qualified-types/Cargo.toml
@@ -11,7 +11,7 @@ crate-type = ["lib", "cdylib"]
 name = "uniffi_regression_test_i1015"
 
 [dependencies]
-uniffi = {path = "../../../uniffi"}
+uniffi = {path = "../../../uniffi", version = "0.24" }
 
 [build-dependencies]
-uniffi = {path = "../../../uniffi", features = ["build"] }
+uniffi = {path = "../../../uniffi", version = "0.24", features = ["build"] }
diff --git a/fixtures/regressions/kotlin-experimental-unsigned-types/Cargo.toml b/fixtures/regressions/kotlin-experimental-unsigned-types/Cargo.toml
index baa420e215..40d699945b 100644
--- a/fixtures/regressions/kotlin-experimental-unsigned-types/Cargo.toml
+++ b/fixtures/regressions/kotlin-experimental-unsigned-types/Cargo.toml
@@ -11,10 +11,10 @@ crate-type = ["lib", "cdylib"]
 name = "uniffi_regression_test_kt_unsigned_types"
 
 [dependencies]
-uniffi = {path = "../../../uniffi"}
+uniffi = {path = "../../../uniffi", version = "0.24" }
 
 [build-dependencies]
-uniffi = {path = "../../../uniffi", features = ["build"] }
+uniffi = {path = "../../../uniffi", version = "0.24", features = ["build"] }
 
 [dev-dependencies]
-uniffi = {path = "../../../uniffi", features = ["bindgen-tests"] }
+uniffi = {path = "../../../uniffi", version = "0.24", features = ["bindgen-tests"] }
diff --git a/fixtures/regressions/logging-callback-interface/Cargo.toml b/fixtures/regressions/logging-callback-interface/Cargo.toml
index c2c710d117..4a7f7bd952 100644
--- a/fixtures/regressions/logging-callback-interface/Cargo.toml
+++ b/fixtures/regressions/logging-callback-interface/Cargo.toml
@@ -11,10 +11,10 @@ name = "uniffi_regression_logging_callback_interface"
 
 [dependencies]
 log = "0.4"
-uniffi = {path = "../../../uniffi"}
+uniffi = {path = "../../../uniffi", version = "0.24" }
 
 [build-dependencies]
-uniffi = {path = "../../../uniffi", features = ["build"] }
+uniffi = {path = "../../../uniffi", version = "0.24", features = ["build"] }
 
 [dev-dependencies]
-uniffi = {path = "../../../uniffi", features = ["bindgen-tests"] }
+uniffi = {path = "../../../uniffi", version = "0.24", features = ["bindgen-tests"] }
diff --git a/fixtures/regressions/missing-newline/Cargo.toml b/fixtures/regressions/missing-newline/Cargo.toml
index f1af491fac..03c5559b51 100644
--- a/fixtures/regressions/missing-newline/Cargo.toml
+++ b/fixtures/regressions/missing-newline/Cargo.toml
@@ -10,10 +10,10 @@ crate-type = ["lib", "cdylib"]
 name = "uniffi_regression_test_missing_newline"
 
 [dependencies]
-uniffi = {path = "../../../uniffi"}
+uniffi = {path = "../../../uniffi", version = "0.24" }
 
 [build-dependencies]
-uniffi = {path = "../../../uniffi", features = ["build"] }
+uniffi = {path = "../../../uniffi", version = "0.24", features = ["build"] }
 
 [dev-dependencies]
-uniffi = {path = "../../../uniffi", features = ["bindgen-tests"] }
+uniffi = {path = "../../../uniffi", version = "0.24", features = ["bindgen-tests"] }
diff --git a/fixtures/regressions/swift-callbacks-omit-labels/Cargo.toml b/fixtures/regressions/swift-callbacks-omit-labels/Cargo.toml
index ef1ff6b811..a2e8b927f0 100644
--- a/fixtures/regressions/swift-callbacks-omit-labels/Cargo.toml
+++ b/fixtures/regressions/swift-callbacks-omit-labels/Cargo.toml
@@ -10,10 +10,10 @@ crate-type = ["lib", "cdylib"]
 name = "uniffi_regression_test_callbacks_omit_labels"
 
 [dependencies]
-uniffi = {path = "../../../uniffi"}
+uniffi = {path = "../../../uniffi", version = "0.24" }
 
 [build-dependencies]
-uniffi = {path = "../../../uniffi", features = ["build"] }
+uniffi = {path = "../../../uniffi", version = "0.24", features = ["build"] }
 
 [dev-dependencies]
-uniffi = {path = "../../../uniffi", features = ["bindgen-tests"] }
+uniffi = {path = "../../../uniffi", version = "0.24", features = ["bindgen-tests"] }
diff --git a/fixtures/regressions/swift-dictionary-nesting/Cargo.toml b/fixtures/regressions/swift-dictionary-nesting/Cargo.toml
index 8bfec25a83..b48ad28290 100644
--- a/fixtures/regressions/swift-dictionary-nesting/Cargo.toml
+++ b/fixtures/regressions/swift-dictionary-nesting/Cargo.toml
@@ -10,10 +10,10 @@ crate-type = ["lib", "cdylib"]
 name = "uniffi_regression_test_swift_dictionary_nesting"
 
 [dependencies]
-uniffi = {path = "../../../uniffi"}
+uniffi = {path = "../../../uniffi", version = "0.24" }
 
 [build-dependencies]
-uniffi = {path = "../../../uniffi", features = ["build"] }
+uniffi = {path = "../../../uniffi", version = "0.24", features = ["build"] }
 
 [dev-dependencies]
-uniffi = {path = "../../../uniffi", features = ["bindgen-tests"] }
+uniffi = {path = "../../../uniffi", version = "0.24", features = ["bindgen-tests"] }
diff --git a/fixtures/regressions/unary-result-alias/Cargo.toml b/fixtures/regressions/unary-result-alias/Cargo.toml
index db34747d9c..b092599617 100644
--- a/fixtures/regressions/unary-result-alias/Cargo.toml
+++ b/fixtures/regressions/unary-result-alias/Cargo.toml
@@ -10,11 +10,11 @@ name = "uniffi_unary_result_alias"
 crate-type = ["lib", "cdylib"]
 
 [dependencies]
-uniffi = { path = "../../../uniffi" }
+uniffi = { path = "../../../uniffi", version = "0.24" }
 thiserror = "1.0"
 
 [build-dependencies]
-uniffi = {path = "../../../uniffi", features = ["build"] }
+uniffi = {path = "../../../uniffi", version = "0.24", features = ["build"] }
 
 [dev-dependencies]
-uniffi = {path = "../../../uniffi", features = ["bindgen-tests"] }
+uniffi = {path = "../../../uniffi", version = "0.24", features = ["bindgen-tests"] }
diff --git a/fixtures/simple-fns/Cargo.toml b/fixtures/simple-fns/Cargo.toml
index a6b34ed6dc..050996b401 100644
--- a/fixtures/simple-fns/Cargo.toml
+++ b/fixtures/simple-fns/Cargo.toml
@@ -11,10 +11,10 @@ name = "uniffi_simple_fns"
 crate-type = ["lib", "cdylib"]
 
 [dependencies]
-uniffi = { path = "../../uniffi" }
+uniffi = { path = "../../uniffi", version = "0.24" }
 
 [build-dependencies]
-uniffi = {path = "../../uniffi", features = ["build"] }
+uniffi = {path = "../../uniffi", version = "0.24", features = ["build"] }
 
 [dev-dependencies]
-uniffi = {path = "../../uniffi", features = ["bindgen-tests"] }
+uniffi = {path = "../../uniffi", version = "0.24", features = ["bindgen-tests"] }
diff --git a/fixtures/simple-iface/Cargo.toml b/fixtures/simple-iface/Cargo.toml
index f0feae3a52..5c0cf05be5 100644
--- a/fixtures/simple-iface/Cargo.toml
+++ b/fixtures/simple-iface/Cargo.toml
@@ -11,12 +11,12 @@ name = "uniffi_simple_iface"
 crate-type = ["lib", "cdylib"]
 
 [dependencies]
-uniffi = { path = "../../uniffi" }
+uniffi = { path = "../../uniffi", version = "0.24" }
 thiserror = "1.0"
 lazy_static = "1.4"
 
 [build-dependencies]
-uniffi = {path = "../../uniffi", features = ["build"] }
+uniffi = {path = "../../uniffi", version = "0.24", features = ["build"] }
 
 [dev-dependencies]
-uniffi = {path = "../../uniffi", features = ["bindgen-tests"] }
+uniffi = {path = "../../uniffi", version = "0.24", features = ["bindgen-tests"] }
diff --git a/fixtures/swift-bridging-header-compile/Cargo.toml b/fixtures/swift-bridging-header-compile/Cargo.toml
index e1b1072803..d9f45c54a5 100644
--- a/fixtures/swift-bridging-header-compile/Cargo.toml
+++ b/fixtures/swift-bridging-header-compile/Cargo.toml
@@ -10,13 +10,13 @@ name = "uniffi_swift_bridging_header_compiler"
 crate-type = ["lib", "cdylib"]
 
 [dependencies]
-uniffi = { path = "../../uniffi" }
+uniffi = { path = "../../uniffi", version = "0.24" }
 camino = "1.0.8"
 
 [build-dependencies]
-uniffi = {path = "../../uniffi", features = ["build"] }
+uniffi = {path = "../../uniffi", version = "0.24", features = ["build"] }
 
 [dev-dependencies]
-uniffi = {path = "../../uniffi", features = ["bindgen-tests", "cli"] }
+uniffi = {path = "../../uniffi", version = "0.24", features = ["bindgen-tests", "cli"] }
 uniffi_testing = { path = "../../uniffi_testing" }
 anyhow = "1"
diff --git a/fixtures/swift-omit-labels/Cargo.toml b/fixtures/swift-omit-labels/Cargo.toml
index e2a5d6be87..7acca8296b 100644
--- a/fixtures/swift-omit-labels/Cargo.toml
+++ b/fixtures/swift-omit-labels/Cargo.toml
@@ -11,10 +11,10 @@ crate-type = ["lib", "cdylib"]
 name = "uniffi_omit_argument_labels"
 
 [dependencies]
-uniffi = {path = "../../uniffi"}
+uniffi = {path = "../../uniffi", version = "0.24" }
 
 [build-dependencies]
-uniffi = {path = "../../uniffi", features = ["build"] }
+uniffi = {path = "../../uniffi", version = "0.24", features = ["build"] }
 
 [dev-dependencies]
-uniffi = {path = "../../uniffi", features = ["bindgen-tests"] }
+uniffi = {path = "../../uniffi", version = "0.24", features = ["bindgen-tests"] }
diff --git a/fixtures/trait-methods/Cargo.toml b/fixtures/trait-methods/Cargo.toml
index 038fff8eb0..563a242af3 100644
--- a/fixtures/trait-methods/Cargo.toml
+++ b/fixtures/trait-methods/Cargo.toml
@@ -10,13 +10,13 @@ crate-type = ["lib", "cdylib"]
 name = "uniffi_trait_methods"
 
 [dependencies]
-uniffi = {path = "../../uniffi"}
+uniffi = {path = "../../uniffi", version = "0.24" }
 once_cell = "1.12"
 thiserror = "1.0"
 
 [build-dependencies]
-uniffi = {path = "../../uniffi", features = ["build"] }
+uniffi = {path = "../../uniffi", version = "0.24", features = ["build"] }
 
 [dev-dependencies]
-uniffi = {path = "../../uniffi", features = ["bindgen-tests"] }
+uniffi = {path = "../../uniffi", version = "0.24", features = ["bindgen-tests"] }
 
diff --git a/fixtures/type-limits/Cargo.toml b/fixtures/type-limits/Cargo.toml
index 71b546967e..85407f1f3c 100644
--- a/fixtures/type-limits/Cargo.toml
+++ b/fixtures/type-limits/Cargo.toml
@@ -10,10 +10,10 @@ name = "uniffi_type_limits"
 crate-type = ["lib", "cdylib"]
 
 [dependencies]
-uniffi = { path = "../../uniffi" }
+uniffi = { path = "../../uniffi", version = "0.24" }
 
 [build-dependencies]
-uniffi = {path = "../../uniffi", features = ["build"] }
+uniffi = {path = "../../uniffi", version = "0.24", features = ["build"] }
 
 [dev-dependencies]
-uniffi = {path = "../../uniffi", features = ["bindgen-tests"] }
+uniffi = {path = "../../uniffi", version = "0.24", features = ["bindgen-tests"] }
diff --git a/fixtures/uitests/Cargo.toml b/fixtures/uitests/Cargo.toml
index a3ba44b990..3f536ce5ca 100644
--- a/fixtures/uitests/Cargo.toml
+++ b/fixtures/uitests/Cargo.toml
@@ -10,7 +10,7 @@ publish = false
 name = "uniffi_uitests"
 
 [dependencies]
-uniffi = {path = "../../uniffi"}
+uniffi = {path = "../../uniffi", version = "0.24" }
 uniffi_macros = {path = "../../uniffi_macros"}
 
 [dev-dependencies]
diff --git a/fixtures/uniffi-fixture-time/Cargo.toml b/fixtures/uniffi-fixture-time/Cargo.toml
index de5e009589..df96ab3f6b 100644
--- a/fixtures/uniffi-fixture-time/Cargo.toml
+++ b/fixtures/uniffi-fixture-time/Cargo.toml
@@ -11,12 +11,12 @@ crate-type = ["lib", "cdylib"]
 name = "uniffi_chronological"
 
 [dependencies]
-uniffi = {path = "../../uniffi"}
+uniffi = {path = "../../uniffi", version = "0.24" }
 thiserror = "1.0"
 chrono = { version = "0.4.23", default-features = false, features = ["alloc", "std"] }
 
 [build-dependencies]
-uniffi = {path = "../../uniffi", features = ["build"] }
+uniffi = {path = "../../uniffi", version = "0.24", features = ["build"] }
 
 [dev-dependencies]
-uniffi = {path = "../../uniffi", features = ["bindgen-tests"] }
+uniffi = {path = "../../uniffi", version = "0.24", features = ["bindgen-tests"] }
diff --git a/fixtures/version-mismatch/Cargo.toml b/fixtures/version-mismatch/Cargo.toml
index f416a652e7..d02e28c172 100644
--- a/fixtures/version-mismatch/Cargo.toml
+++ b/fixtures/version-mismatch/Cargo.toml
@@ -20,7 +20,7 @@ default = []
 proc_macro_v2 = []
 
 [dependencies]
-uniffi = { path = "../../uniffi", features = ["cli"]}
+uniffi = { path = "../../uniffi", version = "0.24", features = ["cli"]}
 
 [build-dependencies]
-uniffi = { path = "../../uniffi", features = ["build"] }
+uniffi = { path = "../../uniffi", version = "0.24", features = ["build"] }

From c5afe0763561bd11e4da93e3bad0ad414be5ef1d Mon Sep 17 00:00:00 2001
From: Jan-Erik Rediger <jrediger@mozilla.com>
Date: Fri, 23 Jun 2023 12:04:32 +0200
Subject: [PATCH 7/9] Add all changes for next patch release

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f7b410afa8..2e8f55afca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,12 @@
 
 [All changes in [[UnreleasedUniFFIVersion]]](https://github.com/mozilla/uniffi-rs/compare/v0.24.0...HEAD).
 
+### What's changed
+
+- Python: remove unused import (and unbreak Python 3.6 compatibility) ([#1618](https://github.com/mozilla/uniffi-rs/pull/1618))
+- Python: Delay contract checks until after all functions are defined to avoid wrong ABI use ([#1619](https://github.com/mozilla/uniffi-rs/pull/1619))
+- Kotlin: Fix error handling in async functions ([#1614](https://github.com/mozilla/uniffi-rs/pull/1614))
+
 ## v0.24.0 (backend crates: v0.24.0) - (_2023-06-21_)
 
 [All changes in v0.24.0](https://github.com/mozilla/uniffi-rs/compare/v0.23.0...v0.24.0).

From 217d4ccbf5838b332207beb52eff835362e66309 Mon Sep 17 00:00:00 2001
From: Jan-Erik Rediger <jrediger@mozilla.com>
Date: Fri, 23 Jun 2023 12:16:38 +0200
Subject: [PATCH 8/9] chore: Release

---
 CHANGELOG.md                      | 6 +++++-
 uniffi/Cargo.toml                 | 8 ++++----
 uniffi_bindgen/Cargo.toml         | 6 +++---
 uniffi_build/Cargo.toml           | 4 ++--
 uniffi_checksum_derive/Cargo.toml | 2 +-
 uniffi_core/Cargo.toml            | 2 +-
 uniffi_macros/Cargo.toml          | 6 +++---
 uniffi_meta/Cargo.toml            | 6 +++---
 uniffi_testing/Cargo.toml         | 2 +-
 9 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2e8f55afca..bc37d7bbf9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,11 @@
 
 <!-- next-header -->
 
-## [[UnreleasedUniFFIVersion]] (backend crates: [[UnreleasedBackendVersion]]) - (_[[ReleaseDate]]_)
+## [[NextUnreleasedUniFFIVersion]] (backend crates: [[UnreleasedBackendVersion]]) - (_[[ReleaseDate]]_)
+
+[All changes in [[NextUnreleasedUniFFIVersion]]](https://github.com/mozilla/uniffi-rs/compare/v0.24.1...NEXT_HEAD).
+
+## [[UnreleasedUniFFIVersion]] (backend crates: v0.24.1) - (_2023-06-23_)
 
 [All changes in [[UnreleasedUniFFIVersion]]](https://github.com/mozilla/uniffi-rs/compare/v0.24.0...HEAD).
 
diff --git a/uniffi/Cargo.toml b/uniffi/Cargo.toml
index 07accd1e50..198c311c62 100644
--- a/uniffi/Cargo.toml
+++ b/uniffi/Cargo.toml
@@ -14,10 +14,10 @@ edition = "2021"
 keywords = ["ffi", "bindgen"]
 
 [dependencies]
-uniffi_bindgen = { path = "../uniffi_bindgen", version = "=0.24.0", optional = true }
-uniffi_build = { path = "../uniffi_build", version = "=0.24.0", optional = true }
-uniffi_core = { path = "../uniffi_core", version = "=0.24.0" }
-uniffi_macros = { path = "../uniffi_macros", version = "=0.24.0" }
+uniffi_bindgen = { path = "../uniffi_bindgen", version = "=0.24.1", optional = true }
+uniffi_build = { path = "../uniffi_build", version = "=0.24.1", optional = true }
+uniffi_core = { path = "../uniffi_core", version = "=0.24.1" }
+uniffi_macros = { path = "../uniffi_macros", version = "=0.24.1" }
 anyhow = "1"
 camino = { version = "1.0.8", optional = true }
 clap = { version = "4", features = ["cargo", "std", "derive"], optional = true }
diff --git a/uniffi_bindgen/Cargo.toml b/uniffi_bindgen/Cargo.toml
index 242143c88f..c7ea75e924 100644
--- a/uniffi_bindgen/Cargo.toml
+++ b/uniffi_bindgen/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uniffi_bindgen"
-version = "0.24.0"
+version = "0.24.1"
 authors = ["Firefox Sync Team <sync-team@mozilla.com>"]
 description = "a multi-language bindings generator for rust (codegen and cli tooling)"
 documentation = "https://mozilla.github.io/uniffi-rs"
@@ -25,6 +25,6 @@ serde = "1"
 serde_json = "1.0.80"
 toml = "0.5"
 weedle2 = { version = "4.0.0", path = "../weedle2" }
-uniffi_meta = { path = "../uniffi_meta", version = "=0.24.0" }
-uniffi_testing = { path = "../uniffi_testing", version = "=0.24.0" }
+uniffi_meta = { path = "../uniffi_meta", version = "=0.24.1" }
+uniffi_testing = { path = "../uniffi_testing", version = "=0.24.1" }
 clap = { version = "4", default-features = false, features = ["std", "derive"], optional = true }
diff --git a/uniffi_build/Cargo.toml b/uniffi_build/Cargo.toml
index 534551dafb..b217a6f44f 100644
--- a/uniffi_build/Cargo.toml
+++ b/uniffi_build/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uniffi_build"
-version = "0.24.0"
+version = "0.24.1"
 authors = ["Firefox Sync Team <sync-team@mozilla.com>"]
 description = "a multi-language bindings generator for rust (build script helpers)"
 documentation = "https://mozilla.github.io/uniffi-rs"
@@ -13,7 +13,7 @@ keywords = ["ffi", "bindgen"]
 [dependencies]
 anyhow = "1"
 camino = "1.0.8"
-uniffi_bindgen = { path = "../uniffi_bindgen", default-features = false, version = "=0.24.0" }
+uniffi_bindgen = { path = "../uniffi_bindgen", default-features = false, version = "=0.24.1" }
 
 [features]
 default = []
diff --git a/uniffi_checksum_derive/Cargo.toml b/uniffi_checksum_derive/Cargo.toml
index c624d9e716..287d747f99 100644
--- a/uniffi_checksum_derive/Cargo.toml
+++ b/uniffi_checksum_derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uniffi_checksum_derive"
-version = "0.24.0"
+version = "0.24.1"
 authors = ["Firefox Sync Team <sync-team@mozilla.com>"]
 description = "a multi-language bindings generator for rust (checksum custom derive)"
 documentation = "https://mozilla.github.io/uniffi-rs"
diff --git a/uniffi_core/Cargo.toml b/uniffi_core/Cargo.toml
index a43cb83532..41f50b8b08 100644
--- a/uniffi_core/Cargo.toml
+++ b/uniffi_core/Cargo.toml
@@ -4,7 +4,7 @@ description = "a multi-language bindings generator for rust (runtime support cod
 documentation = "https://mozilla.github.io/uniffi-rs"
 homepage = "https://mozilla.github.io/uniffi-rs"
 repository = "https://github.com/mozilla/uniffi-rs"
-version = "0.24.0"
+version = "0.24.1"
 authors = ["Firefox Sync Team <sync-team@mozilla.com>"]
 license = "MPL-2.0"
 edition = "2021"
diff --git a/uniffi_macros/Cargo.toml b/uniffi_macros/Cargo.toml
index fdff4ce186..c61c8d0296 100644
--- a/uniffi_macros/Cargo.toml
+++ b/uniffi_macros/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uniffi_macros"
-version = "0.24.0"
+version = "0.24.1"
 authors = ["Firefox Sync Team <sync-team@mozilla.com>"]
 description = "a multi-language bindings generator for rust (convenience macros)"
 documentation = "https://mozilla.github.io/uniffi-rs"
@@ -23,8 +23,8 @@ quote = "1.0"
 serde = "1.0.136"
 syn = { version = "2.0", features = ["full", "visit-mut"] }
 toml = "0.5.9"
-uniffi_build = { path = "../uniffi_build", version = "=0.24.0" }
-uniffi_meta = { path = "../uniffi_meta", version = "=0.24.0" }
+uniffi_build = { path = "../uniffi_build", version = "=0.24.1" }
+uniffi_meta = { path = "../uniffi_meta", version = "=0.24.1" }
 
 [features]
 default = []
diff --git a/uniffi_meta/Cargo.toml b/uniffi_meta/Cargo.toml
index 3f4f0adb78..f25820554d 100644
--- a/uniffi_meta/Cargo.toml
+++ b/uniffi_meta/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uniffi_meta"
-version = "0.24.0"
+version = "0.24.1"
 edition = "2021"
 description = "uniffi_meta"
 homepage = "https://mozilla.github.io/uniffi-rs"
@@ -13,5 +13,5 @@ anyhow = "1"
 bytes = "1.3"
 serde = { version = "1.0.136", features = ["derive"] }
 siphasher = "0.3"
-uniffi_checksum_derive = { version = "0.24.0", path = "../uniffi_checksum_derive" }
-uniffi_core = { path = "../uniffi_core", version = "=0.24.0" }
+uniffi_checksum_derive = { version = "0.24.1", path = "../uniffi_checksum_derive" }
+uniffi_core = { path = "../uniffi_core", version = "=0.24.1" }
diff --git a/uniffi_testing/Cargo.toml b/uniffi_testing/Cargo.toml
index 8769aaa521..cfd3f42ef4 100644
--- a/uniffi_testing/Cargo.toml
+++ b/uniffi_testing/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "uniffi_testing"
-version = "0.24.0"
+version = "0.24.1"
 authors = ["Firefox Sync Team <sync-team@mozilla.com>"]
 description = "a multi-language bindings generator for rust (testing helpers)"
 documentation = "https://mozilla.github.io/uniffi-rs"

From c0e64b839018728d8153ce1758d391b7782e2e21 Mon Sep 17 00:00:00 2001
From: Jan-Erik Rediger <jrediger@mozilla.com>
Date: Fri, 23 Jun 2023 12:20:10 +0200
Subject: [PATCH 9/9] chore: Release

---
 CHANGELOG.md      | 8 ++++----
 uniffi/Cargo.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc37d7bbf9..2102e5f59a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,13 +10,13 @@
 
 <!-- next-header -->
 
-## [[NextUnreleasedUniFFIVersion]] (backend crates: [[UnreleasedBackendVersion]]) - (_[[ReleaseDate]]_)
+## [[UnreleasedUniFFIVersion]] (backend crates: [[UnreleasedBackendVersion]]) - (_[[ReleaseDate]]_)
 
-[All changes in [[NextUnreleasedUniFFIVersion]]](https://github.com/mozilla/uniffi-rs/compare/v0.24.1...NEXT_HEAD).
+[All changes in [[UnreleasedUniFFIVersion]]](https://github.com/mozilla/uniffi-rs/compare/v0.24.1...HEAD).
 
-## [[UnreleasedUniFFIVersion]] (backend crates: v0.24.1) - (_2023-06-23_)
+## v0.24.1 (backend crates: v0.24.1) - (_2023-06-23_)
 
-[All changes in [[UnreleasedUniFFIVersion]]](https://github.com/mozilla/uniffi-rs/compare/v0.24.0...HEAD).
+[All changes in v0.24.1](https://github.com/mozilla/uniffi-rs/compare/v0.24.0...v0.24.1).
 
 ### What's changed
 
diff --git a/uniffi/Cargo.toml b/uniffi/Cargo.toml
index 198c311c62..2c3903f4df 100644
--- a/uniffi/Cargo.toml
+++ b/uniffi/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/mozilla/uniffi-rs"
 # Incrementing the minor version here means a breaking change to consumers.
 #   * See `docs/uniffi-versioning.md` for guidance on when to increment this
 #   * Make sure to also update `uniffi_bindgen::UNIFFI_CONTRACT_VERSION"
-version = "0.24.0"
+version = "0.24.1"
 authors = ["Firefox Sync Team <sync-team@mozilla.com>"]
 license = "MPL-2.0"
 edition = "2021"