Skip to content

Commit

Permalink
Merge tag 'v0.28.0' into merge/v0.28.0
Browse files Browse the repository at this point in the history
fixtures/regressions/cdylib-crate-type-dependency/ffi-crate/Cargo.toml
fixtures/regressions/kotlin-experimental-unsigned-types/Cargo.toml
uniffi_bindgen/src/bindings/kotlin/templates/CallbackInterfaceTemplate.kt
uniffi_bindgen/src/bindings/kotlin/templates/TopLevelFunctionTemplate.kt
uniffi_bindgen/src/bindings/python/templates/CallbackInterfaceTemplate.py
uniffi_bindgen/src/bindings/python/templates/TopLevelFunctionTemplate.py
uniffi_bindgen/src/bindings/swift/templates/CallbackInterfaceTemplate.swift
uniffi_bindgen/src/bindings/swift/templates/ObjectTemplate.swift
uniffi_bindgen/src/bindings/swift/templates/RecordTemplate.swift
uniffi_bindgen/src/bindings/swift/templates/TopLevelFunctionTemplate.swift
  • Loading branch information
arg0d committed Aug 2, 2024
2 parents 1a5dc52 + cd38cce commit ecee858
Show file tree
Hide file tree
Showing 535 changed files with 19,203 additions and 8,506 deletions.
4 changes: 3 additions & 1 deletion .cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
# Cargo command to release a new version for all packages, except uniffi
release-backend-crates = [
"release",
"--execute",
"--no-publish",
"-p", "uniffi_core",
"-p", "uniffi_bindgen",
"-p", "uniffi_build",
Expand All @@ -11,4 +13,4 @@ release-backend-crates = [
"-p", "uniffi_testing",
"-p", "uniffi_udl",
]
release-uniffi = ["release", "-p", "uniffi"]
release-uniffi = ["release", "--execute", "--no-publish", "-p", "uniffi"]
41 changes: 22 additions & 19 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
version: 2.1

commands:
install-mdbook:
install-mkdocs:
steps:
- run:
name: Install mdBook
command: |
mkdir -p $HOME/.bin
pushd $HOME/.bin
curl -sfSL --retry 5 --retry-delay 10 https://github.com/rust-lang-nursery/mdBook/releases/download/v0.4.2/mdbook-v0.4.2-x86_64-unknown-linux-gnu.tar.gz | tar xz
echo 'export PATH="$HOME/.bin:$PATH"' >> $BASH_ENV
popd
sudo apt-get update -qq
sudo apt-get install -qy --no-install-recommends python3-pip
sudo apt-get clean
pip install -r tools/requirements_docs.txt
# Our policy for updating rust versions is at https://github.com/mozilla/uniffi-rs/tree/main/docs/policies/rust-versions.md
# See also rust-toolchain.toml in the root of this repo, which is used to specify our official target version.
prepare-rust-target-version:
Expand All @@ -22,7 +22,7 @@ commands:
# Our minimum supported rust version is specified here.
prepare-rust-min-version:
steps:
- run: rustup override set 1.66.0
- run: rustup override set 1.74.0
- run: rustup update
build-api-docs:
steps:
Expand All @@ -39,7 +39,7 @@ orbs:
jobs:
Check Rust formatting:
docker:
- image: cimg/rust:1.72
- image: cimg/rust:1.77.1
resource_class: small
steps:
- checkout
Expand All @@ -49,7 +49,7 @@ jobs:
- run: cargo fmt -- --check
Lint Rust with clippy:
docker:
- image: cimg/rust:1.72
- image: cimg/rust:1.77.1
resource_class: small
steps:
- checkout
Expand All @@ -59,7 +59,7 @@ jobs:
- run: cargo clippy --all --all-targets -- -D warnings
Lint Rust Docs:
docker:
- image: cimg/rust:1.72
- image: cimg/rust:1.77.1
resource_class: small
steps:
- checkout
Expand Down Expand Up @@ -117,18 +117,21 @@ jobs:
- run: cargo test -- --skip trybuild_ui_tests
Deploy website:
docker:
- image: cimg/rust:1.72
- image: cimg/rust:1.77.1
resource_class: small
steps:
- checkout
- prepare-rust-target-version
- build-api-docs
- run: cp -r ./target/doc ./docs/manual/src/internals/api
- install-mdbook
- run: mdbook build docs/manual
- gh-pages/deploy:
build-dir: docs/manual/book
ssh-fingerprints: "ac:68:a3:78:ea:ee:00:05:30:e1:dc:1f:2e:2f:7c:81"
- install-mkdocs
# It should be possible to do something like https://github.com/jimporter/mike/issues/49
# So we can automagically deploy on release too!
- run:
name: Deploy docs
# can't use `gh-pages/deploy`, it doesn't handle the versioning.
command: |
# circle ci docs and jj both do this git config.
git config user.name 'uniffi-docs[bot]'
git config user.email 'uniffi-docs[bot]@users.noreply.github.io'
mike deploy next --push
Deploy Docker:
docker:
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@ target
.*.swp
*.jar
.vscode
.idea
xcuserdata
docs/manual/src/internals/api
# The old mdbook outdir
docs/manual/book

examples/app/ios/Generated
examples/app/ios/IOSApp.xcodeproj/project.xcworkspace/xcshareddata/
Loading

0 comments on commit ecee858

Please sign in to comment.