Skip to content

Commit

Permalink
Add a version to the example/fixture dependencies on uniffi
Browse files Browse the repository at this point in the history 
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.
  • Loading branch information
@glandium @badboy
glandium authored and badboy committed Jun 23, 2023
1 parent 6938c26 commit 6ac168b
Show file tree
Hide file tree
Showing 42 changed files with 115 additions and 115 deletions.
2 changes: 1 addition & 1 deletion examples/app/uniffi-bindgen-cli/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
6 changes: 3 additions & 3 deletions examples/arithmetic/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
6 changes: 3 additions & 3 deletions examples/callbacks/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
6 changes: 3 additions & 3 deletions examples/custom-types/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
6 changes: 3 additions & 3 deletions examples/geometry/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
6 changes: 3 additions & 3 deletions examples/rondpoint/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
6 changes: 3 additions & 3 deletions examples/sprites/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
6 changes: 3 additions & 3 deletions examples/todolist/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
6 changes: 3 additions & 3 deletions examples/traits/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }

4 changes: 2 additions & 2 deletions fixtures/benchmarks/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
Expand Down
6 changes: 3 additions & 3 deletions fixtures/callbacks/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
6 changes: 3 additions & 3 deletions fixtures/coverall/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
6 changes: 3 additions & 3 deletions fixtures/ext-types/guid/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
6 changes: 3 additions & 3 deletions fixtures/ext-types/lib/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
Expand All @@ -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"] }
4 changes: 2 additions & 2 deletions fixtures/ext-types/uniffi-one/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
6 changes: 3 additions & 3 deletions fixtures/external-types/lib/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
6 changes: 3 additions & 3 deletions fixtures/foreign-executor/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
6 changes: 3 additions & 3 deletions fixtures/futures/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
6 changes: 3 additions & 3 deletions fixtures/keywords/kotlin/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
6 changes: 3 additions & 3 deletions fixtures/keywords/rust/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
6 changes: 3 additions & 3 deletions fixtures/keywords/swift/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
2 changes: 1 addition & 1 deletion fixtures/metadata/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
6 changes: 3 additions & 3 deletions fixtures/proc-macro/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
4 changes: 2 additions & 2 deletions fixtures/reexport-scaffolding-macro/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
6 changes: 3 additions & 3 deletions fixtures/regressions/cdylib-crate-type-dependency/ffi-crate/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
6 changes: 3 additions & 3 deletions fixtures/regressions/enum-without-i32-helpers/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
4 changes: 2 additions & 2 deletions fixtures/regressions/fully-qualified-types/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
6 changes: 3 additions & 3 deletions fixtures/regressions/kotlin-experimental-unsigned-types/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Loading

0 comments on commit 6ac168b

Please sign in to comment.