Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,6 @@ jobs:
- uses: android-actions/setup-android@v4
- run: sdkmanager "platforms;android-30"
- run: sdkmanager "build-tools;33.0.2"
- run: cp platforms/android/classes.dex platforms/android/classes.dex.orig
- run: ./platforms/android/build-dex.sh
- run: cmp platforms/android/classes.dex.orig platforms/android/classes.dex
- run: cp adapters/android/classes.dex adapters/android/classes.dex.orig
- run: ./adapters/android/build-dex.sh
- run: cmp adapters/android/classes.dex.orig adapters/android/classes.dex
2 changes: 1 addition & 1 deletion .release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"common":"0.24.1","consumer":"0.38.0","platforms/macos":"0.26.3","platforms/windows":"0.34.0","platforms/winit":"0.33.2","platforms/unix":"0.22.1","platforms/atspi-common":"0.19.1","platforms/android":"0.7.5","platforms/ios":"0.1.2"}
{"accesskit":"0.24.1","accesskit_consumer":"0.38.0","adapters/macos":"0.26.3","adapters/windows":"0.34.0","adapters/winit":"0.33.2","adapters/unix":"0.22.1","adapters/atspi-common":"0.19.1","adapters/android":"0.7.5","adapters/ios":"0.1.2"}
24 changes: 12 additions & 12 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
[workspace]
resolver = "2"
members = [
"common",
"consumer",
"platforms/android",
"platforms/atspi-common",
"platforms/ios",
"platforms/macos",
"platforms/unix",
"platforms/windows",
"platforms/winit",
"accesskit",
"accesskit_consumer",
"adapters/android",
"adapters/atspi-common",
"adapters/ios",
"adapters/macos",
"adapters/unix",
"adapters/windows",
"adapters/winit",
]
default-members = [
"common",
"consumer",
"platforms/winit",
"accesskit",
"accesskit_consumer",
"adapters/winit",
]

[workspace.package]
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
3 changes: 1 addition & 2 deletions consumer/Cargo.toml → accesskit_consumer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,5 @@ edition.workspace = true
rust-version.workspace = true

[dependencies]
accesskit = { version = "0.24.1", path = "../common" }
accesskit = { version = "0.24.1", path = "../accesskit" }
hashbrown.workspace = true

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions platforms/android/Cargo.toml → adapters/android/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ rust-version.workspace = true
embedded-dex = []

[dependencies]
accesskit = { version = "0.24.1", path = "../../common" }
accesskit_consumer = { version = "0.38.0", path = "../../consumer" }
accesskit = { version = "0.24.1", path = "../../accesskit" }
accesskit_consumer = { version = "0.38.0", path = "../../accesskit_consumer" }
jni = "0.21.1"
log = "0.4.17"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ rust-version.workspace = true
simplified-api = []

[dependencies]
accesskit = { version = "0.24.1", path = "../../common" }
accesskit_consumer = { version = "0.38.0", path = "../../consumer" }
accesskit = { version = "0.24.1", path = "../../accesskit" }
accesskit_consumer = { version = "0.38.0", path = "../../accesskit_consumer" }
atspi-common = { version = "0.13", default-features = false }
phf = { version = "0.13.1", features = ["macros"] }
serde = "1.0"
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions platforms/ios/Cargo.toml → adapters/ios/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ rust-version.workspace = true
default-target = "aarch64-apple-ios"

[dependencies]
accesskit = { version = "0.24.1", path = "../../common" }
accesskit_consumer = { version = "0.38.0", path = "../../consumer" }
accesskit = { version = "0.24.1", path = "../../accesskit" }
accesskit_consumer = { version = "0.38.0", path = "../../accesskit_consumer" }
hashbrown.workspace = true
objc2 = "0.5.1"
objc2-foundation = { version = "0.2.0", features = [
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions platforms/macos/Cargo.toml → adapters/macos/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ rust-version.workspace = true
default-target = "x86_64-apple-darwin"

[dependencies]
accesskit = { version = "0.24.1", path = "../../common" }
accesskit_consumer = { version = "0.38.0", path = "../../consumer" }
accesskit = { version = "0.24.1", path = "../../accesskit" }
accesskit_consumer = { version = "0.38.0", path = "../../accesskit_consumer" }
hashbrown.workspace = true
objc2 = "0.5.1"
objc2-foundation = { version = "0.2.0", features = [
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion platforms/unix/Cargo.toml → adapters/unix/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ async-io = ["dep:async-channel", "dep:async-executor", "dep:async-task", "dep:fu
tokio = ["dep:tokio", "dep:tokio-stream"]

[dependencies]
accesskit = { version = "0.24.1", path = "../../common" }
accesskit = { version = "0.24.1", path = "../../accesskit" }
accesskit_atspi_common = { version = "0.19.1", path = "../atspi-common" }
atspi = { version = "0.29", default-features = false, features = ["proxies"] }
futures-lite = "2.3"
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions platforms/windows/Cargo.toml → adapters/windows/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ default-target = "x86_64-pc-windows-msvc"
targets = []

[dependencies]
accesskit = { version = "0.24.1", path = "../../common" }
accesskit_consumer = { version = "0.38.0", path = "../../consumer" }
accesskit = { version = "0.24.1", path = "../../accesskit" }
accesskit_consumer = { version = "0.38.0", path = "../../accesskit_consumer" }
hashbrown.workspace = true
static_assertions = "1.1.0"
windows-core = "0.62.0"
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion platforms/winit/Cargo.toml → adapters/winit/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ async-io = ["accesskit_unix/async-io"]
tokio = ["accesskit_unix/tokio"]

[dependencies]
accesskit = { version = "0.24.1", path = "../../common" }
accesskit = { version = "0.24.1", path = "../../accesskit" }
winit = { version = "0.30.5", default-features = false }
rwh_05 = { package = "raw-window-handle", version = "0.5", features = ["std"], optional = true }
rwh_06 = { package = "raw-window-handle", version = "0.6.2", features = ["std"], optional = true }
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
18 changes: 9 additions & 9 deletions release-please-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
"plugins": ["cargo-workspace"],
"release-type": "rust",
"packages": {
"common": {},
"consumer": {},
"platforms/android": {},
"platforms/atspi-common": {},
"platforms/ios": {},
"platforms/macos": {},
"platforms/unix": {},
"platforms/windows": {},
"platforms/winit": {}
"accesskit": {},
"accesskit_consumer": {},
"adapters/android": {},
"adapters/atspi-common": {},
"adapters/ios": {},
"adapters/macos": {},
"adapters/unix": {},
"adapters/windows": {},
"adapters/winit": {}
}
}
Loading