diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b94d5133a..4df550738 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 00ada8e3c..91ea4b8fd 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -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"} \ No newline at end of file +{"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"} diff --git a/Cargo.toml b/Cargo.toml index a9f16b58c..e5ca8b5e7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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] diff --git a/common/CHANGELOG.md b/accesskit/CHANGELOG.md similarity index 100% rename from common/CHANGELOG.md rename to accesskit/CHANGELOG.md diff --git a/common/Cargo.toml b/accesskit/Cargo.toml similarity index 100% rename from common/Cargo.toml rename to accesskit/Cargo.toml diff --git a/common/README.md b/accesskit/README.md similarity index 100% rename from common/README.md rename to accesskit/README.md diff --git a/common/src/geometry.rs b/accesskit/src/geometry.rs similarity index 100% rename from common/src/geometry.rs rename to accesskit/src/geometry.rs diff --git a/common/src/lib.rs b/accesskit/src/lib.rs similarity index 100% rename from common/src/lib.rs rename to accesskit/src/lib.rs diff --git a/consumer/CHANGELOG.md b/accesskit_consumer/CHANGELOG.md similarity index 100% rename from consumer/CHANGELOG.md rename to accesskit_consumer/CHANGELOG.md diff --git a/consumer/Cargo.toml b/accesskit_consumer/Cargo.toml similarity index 86% rename from consumer/Cargo.toml rename to accesskit_consumer/Cargo.toml index 9f8395fbc..ca1bce074 100644 --- a/consumer/Cargo.toml +++ b/accesskit_consumer/Cargo.toml @@ -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 - diff --git a/consumer/README.md b/accesskit_consumer/README.md similarity index 100% rename from consumer/README.md rename to accesskit_consumer/README.md diff --git a/consumer/src/filters.rs b/accesskit_consumer/src/filters.rs similarity index 100% rename from consumer/src/filters.rs rename to accesskit_consumer/src/filters.rs diff --git a/consumer/src/iterators.rs b/accesskit_consumer/src/iterators.rs similarity index 100% rename from consumer/src/iterators.rs rename to accesskit_consumer/src/iterators.rs diff --git a/consumer/src/lib.rs b/accesskit_consumer/src/lib.rs similarity index 100% rename from consumer/src/lib.rs rename to accesskit_consumer/src/lib.rs diff --git a/consumer/src/node.rs b/accesskit_consumer/src/node.rs similarity index 100% rename from consumer/src/node.rs rename to accesskit_consumer/src/node.rs diff --git a/consumer/src/text.rs b/accesskit_consumer/src/text.rs similarity index 100% rename from consumer/src/text.rs rename to accesskit_consumer/src/text.rs diff --git a/consumer/src/tree.rs b/accesskit_consumer/src/tree.rs similarity index 100% rename from consumer/src/tree.rs rename to accesskit_consumer/src/tree.rs diff --git a/platforms/android/.gitignore b/adapters/android/.gitignore similarity index 100% rename from platforms/android/.gitignore rename to adapters/android/.gitignore diff --git a/platforms/android/CHANGELOG.md b/adapters/android/CHANGELOG.md similarity index 100% rename from platforms/android/CHANGELOG.md rename to adapters/android/CHANGELOG.md diff --git a/platforms/android/Cargo.toml b/adapters/android/Cargo.toml similarity index 75% rename from platforms/android/Cargo.toml rename to adapters/android/Cargo.toml index c9b919df1..60c4a06bc 100644 --- a/platforms/android/Cargo.toml +++ b/adapters/android/Cargo.toml @@ -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" diff --git a/platforms/android/README.md b/adapters/android/README.md similarity index 100% rename from platforms/android/README.md rename to adapters/android/README.md diff --git a/platforms/android/build-dex.sh b/adapters/android/build-dex.sh similarity index 100% rename from platforms/android/build-dex.sh rename to adapters/android/build-dex.sh diff --git a/platforms/android/classes.dex b/adapters/android/classes.dex similarity index 100% rename from platforms/android/classes.dex rename to adapters/android/classes.dex diff --git a/platforms/android/java/dev/accesskit/android/Delegate.java b/adapters/android/java/dev/accesskit/android/Delegate.java similarity index 100% rename from platforms/android/java/dev/accesskit/android/Delegate.java rename to adapters/android/java/dev/accesskit/android/Delegate.java diff --git a/platforms/android/src/action.rs b/adapters/android/src/action.rs similarity index 100% rename from platforms/android/src/action.rs rename to adapters/android/src/action.rs diff --git a/platforms/android/src/adapter.rs b/adapters/android/src/adapter.rs similarity index 100% rename from platforms/android/src/adapter.rs rename to adapters/android/src/adapter.rs diff --git a/platforms/android/src/event.rs b/adapters/android/src/event.rs similarity index 100% rename from platforms/android/src/event.rs rename to adapters/android/src/event.rs diff --git a/platforms/android/src/filters.rs b/adapters/android/src/filters.rs similarity index 100% rename from platforms/android/src/filters.rs rename to adapters/android/src/filters.rs diff --git a/platforms/android/src/inject.rs b/adapters/android/src/inject.rs similarity index 100% rename from platforms/android/src/inject.rs rename to adapters/android/src/inject.rs diff --git a/platforms/android/src/lib.rs b/adapters/android/src/lib.rs similarity index 100% rename from platforms/android/src/lib.rs rename to adapters/android/src/lib.rs diff --git a/platforms/android/src/node.rs b/adapters/android/src/node.rs similarity index 100% rename from platforms/android/src/node.rs rename to adapters/android/src/node.rs diff --git a/platforms/android/src/util.rs b/adapters/android/src/util.rs similarity index 100% rename from platforms/android/src/util.rs rename to adapters/android/src/util.rs diff --git a/platforms/atspi-common/CHANGELOG.md b/adapters/atspi-common/CHANGELOG.md similarity index 100% rename from platforms/atspi-common/CHANGELOG.md rename to adapters/atspi-common/CHANGELOG.md diff --git a/platforms/atspi-common/Cargo.toml b/adapters/atspi-common/Cargo.toml similarity index 81% rename from platforms/atspi-common/Cargo.toml rename to adapters/atspi-common/Cargo.toml index a4b391d03..5e3f75fd9 100644 --- a/platforms/atspi-common/Cargo.toml +++ b/adapters/atspi-common/Cargo.toml @@ -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" diff --git a/platforms/atspi-common/README.md b/adapters/atspi-common/README.md similarity index 100% rename from platforms/atspi-common/README.md rename to adapters/atspi-common/README.md diff --git a/platforms/atspi-common/src/action.rs b/adapters/atspi-common/src/action.rs similarity index 100% rename from platforms/atspi-common/src/action.rs rename to adapters/atspi-common/src/action.rs diff --git a/platforms/atspi-common/src/adapter.rs b/adapters/atspi-common/src/adapter.rs similarity index 100% rename from platforms/atspi-common/src/adapter.rs rename to adapters/atspi-common/src/adapter.rs diff --git a/platforms/atspi-common/src/callback.rs b/adapters/atspi-common/src/callback.rs similarity index 100% rename from platforms/atspi-common/src/callback.rs rename to adapters/atspi-common/src/callback.rs diff --git a/platforms/atspi-common/src/context.rs b/adapters/atspi-common/src/context.rs similarity index 100% rename from platforms/atspi-common/src/context.rs rename to adapters/atspi-common/src/context.rs diff --git a/platforms/atspi-common/src/error.rs b/adapters/atspi-common/src/error.rs similarity index 100% rename from platforms/atspi-common/src/error.rs rename to adapters/atspi-common/src/error.rs diff --git a/platforms/atspi-common/src/events.rs b/adapters/atspi-common/src/events.rs similarity index 100% rename from platforms/atspi-common/src/events.rs rename to adapters/atspi-common/src/events.rs diff --git a/platforms/atspi-common/src/filters.rs b/adapters/atspi-common/src/filters.rs similarity index 100% rename from platforms/atspi-common/src/filters.rs rename to adapters/atspi-common/src/filters.rs diff --git a/platforms/atspi-common/src/lib.rs b/adapters/atspi-common/src/lib.rs similarity index 100% rename from platforms/atspi-common/src/lib.rs rename to adapters/atspi-common/src/lib.rs diff --git a/platforms/atspi-common/src/node.rs b/adapters/atspi-common/src/node.rs similarity index 100% rename from platforms/atspi-common/src/node.rs rename to adapters/atspi-common/src/node.rs diff --git a/platforms/atspi-common/src/rect.rs b/adapters/atspi-common/src/rect.rs similarity index 100% rename from platforms/atspi-common/src/rect.rs rename to adapters/atspi-common/src/rect.rs diff --git a/platforms/atspi-common/src/simplified.rs b/adapters/atspi-common/src/simplified.rs similarity index 100% rename from platforms/atspi-common/src/simplified.rs rename to adapters/atspi-common/src/simplified.rs diff --git a/platforms/atspi-common/src/text_attributes.rs b/adapters/atspi-common/src/text_attributes.rs similarity index 100% rename from platforms/atspi-common/src/text_attributes.rs rename to adapters/atspi-common/src/text_attributes.rs diff --git a/platforms/atspi-common/src/util.rs b/adapters/atspi-common/src/util.rs similarity index 100% rename from platforms/atspi-common/src/util.rs rename to adapters/atspi-common/src/util.rs diff --git a/platforms/ios/CHANGELOG.md b/adapters/ios/CHANGELOG.md similarity index 100% rename from platforms/ios/CHANGELOG.md rename to adapters/ios/CHANGELOG.md diff --git a/platforms/ios/Cargo.toml b/adapters/ios/Cargo.toml similarity index 87% rename from platforms/ios/Cargo.toml rename to adapters/ios/Cargo.toml index f6cbaeeb6..79f914b4f 100644 --- a/platforms/ios/Cargo.toml +++ b/adapters/ios/Cargo.toml @@ -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 = [ diff --git a/platforms/ios/README.md b/adapters/ios/README.md similarity index 100% rename from platforms/ios/README.md rename to adapters/ios/README.md diff --git a/platforms/ios/src/adapter.rs b/adapters/ios/src/adapter.rs similarity index 100% rename from platforms/ios/src/adapter.rs rename to adapters/ios/src/adapter.rs diff --git a/platforms/ios/src/context.rs b/adapters/ios/src/context.rs similarity index 100% rename from platforms/ios/src/context.rs rename to adapters/ios/src/context.rs diff --git a/platforms/ios/src/event.rs b/adapters/ios/src/event.rs similarity index 100% rename from platforms/ios/src/event.rs rename to adapters/ios/src/event.rs diff --git a/platforms/ios/src/filters.rs b/adapters/ios/src/filters.rs similarity index 100% rename from platforms/ios/src/filters.rs rename to adapters/ios/src/filters.rs diff --git a/platforms/ios/src/lib.rs b/adapters/ios/src/lib.rs similarity index 100% rename from platforms/ios/src/lib.rs rename to adapters/ios/src/lib.rs diff --git a/platforms/ios/src/node.rs b/adapters/ios/src/node.rs similarity index 100% rename from platforms/ios/src/node.rs rename to adapters/ios/src/node.rs diff --git a/platforms/ios/src/subclass.rs b/adapters/ios/src/subclass.rs similarity index 100% rename from platforms/ios/src/subclass.rs rename to adapters/ios/src/subclass.rs diff --git a/platforms/ios/src/util.rs b/adapters/ios/src/util.rs similarity index 100% rename from platforms/ios/src/util.rs rename to adapters/ios/src/util.rs diff --git a/platforms/macos/CHANGELOG.md b/adapters/macos/CHANGELOG.md similarity index 100% rename from platforms/macos/CHANGELOG.md rename to adapters/macos/CHANGELOG.md diff --git a/platforms/macos/Cargo.toml b/adapters/macos/Cargo.toml similarity index 85% rename from platforms/macos/Cargo.toml rename to adapters/macos/Cargo.toml index d158c111a..73ca74a01 100644 --- a/platforms/macos/Cargo.toml +++ b/adapters/macos/Cargo.toml @@ -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 = [ diff --git a/platforms/macos/README.md b/adapters/macos/README.md similarity index 100% rename from platforms/macos/README.md rename to adapters/macos/README.md diff --git a/platforms/macos/src/adapter.rs b/adapters/macos/src/adapter.rs similarity index 100% rename from platforms/macos/src/adapter.rs rename to adapters/macos/src/adapter.rs diff --git a/platforms/macos/src/context.rs b/adapters/macos/src/context.rs similarity index 100% rename from platforms/macos/src/context.rs rename to adapters/macos/src/context.rs diff --git a/platforms/macos/src/event.rs b/adapters/macos/src/event.rs similarity index 100% rename from platforms/macos/src/event.rs rename to adapters/macos/src/event.rs diff --git a/platforms/macos/src/filters.rs b/adapters/macos/src/filters.rs similarity index 100% rename from platforms/macos/src/filters.rs rename to adapters/macos/src/filters.rs diff --git a/platforms/macos/src/lib.rs b/adapters/macos/src/lib.rs similarity index 100% rename from platforms/macos/src/lib.rs rename to adapters/macos/src/lib.rs diff --git a/platforms/macos/src/node.rs b/adapters/macos/src/node.rs similarity index 100% rename from platforms/macos/src/node.rs rename to adapters/macos/src/node.rs diff --git a/platforms/macos/src/patch.rs b/adapters/macos/src/patch.rs similarity index 100% rename from platforms/macos/src/patch.rs rename to adapters/macos/src/patch.rs diff --git a/platforms/macos/src/subclass.rs b/adapters/macos/src/subclass.rs similarity index 100% rename from platforms/macos/src/subclass.rs rename to adapters/macos/src/subclass.rs diff --git a/platforms/macos/src/util.rs b/adapters/macos/src/util.rs similarity index 100% rename from platforms/macos/src/util.rs rename to adapters/macos/src/util.rs diff --git a/platforms/unix/CHANGELOG.md b/adapters/unix/CHANGELOG.md similarity index 100% rename from platforms/unix/CHANGELOG.md rename to adapters/unix/CHANGELOG.md diff --git a/platforms/unix/Cargo.toml b/adapters/unix/Cargo.toml similarity index 95% rename from platforms/unix/Cargo.toml rename to adapters/unix/Cargo.toml index f7f33837f..de3d137af 100644 --- a/platforms/unix/Cargo.toml +++ b/adapters/unix/Cargo.toml @@ -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" diff --git a/platforms/unix/README.md b/adapters/unix/README.md similarity index 100% rename from platforms/unix/README.md rename to adapters/unix/README.md diff --git a/platforms/unix/src/adapter.rs b/adapters/unix/src/adapter.rs similarity index 100% rename from platforms/unix/src/adapter.rs rename to adapters/unix/src/adapter.rs diff --git a/platforms/unix/src/atspi/bus.rs b/adapters/unix/src/atspi/bus.rs similarity index 100% rename from platforms/unix/src/atspi/bus.rs rename to adapters/unix/src/atspi/bus.rs diff --git a/platforms/unix/src/atspi/interfaces/accessible.rs b/adapters/unix/src/atspi/interfaces/accessible.rs similarity index 100% rename from platforms/unix/src/atspi/interfaces/accessible.rs rename to adapters/unix/src/atspi/interfaces/accessible.rs diff --git a/platforms/unix/src/atspi/interfaces/action.rs b/adapters/unix/src/atspi/interfaces/action.rs similarity index 100% rename from platforms/unix/src/atspi/interfaces/action.rs rename to adapters/unix/src/atspi/interfaces/action.rs diff --git a/platforms/unix/src/atspi/interfaces/application.rs b/adapters/unix/src/atspi/interfaces/application.rs similarity index 100% rename from platforms/unix/src/atspi/interfaces/application.rs rename to adapters/unix/src/atspi/interfaces/application.rs diff --git a/platforms/unix/src/atspi/interfaces/cache.rs b/adapters/unix/src/atspi/interfaces/cache.rs similarity index 100% rename from platforms/unix/src/atspi/interfaces/cache.rs rename to adapters/unix/src/atspi/interfaces/cache.rs diff --git a/platforms/unix/src/atspi/interfaces/component.rs b/adapters/unix/src/atspi/interfaces/component.rs similarity index 100% rename from platforms/unix/src/atspi/interfaces/component.rs rename to adapters/unix/src/atspi/interfaces/component.rs diff --git a/platforms/unix/src/atspi/interfaces/hyperlink.rs b/adapters/unix/src/atspi/interfaces/hyperlink.rs similarity index 100% rename from platforms/unix/src/atspi/interfaces/hyperlink.rs rename to adapters/unix/src/atspi/interfaces/hyperlink.rs diff --git a/platforms/unix/src/atspi/interfaces/mod.rs b/adapters/unix/src/atspi/interfaces/mod.rs similarity index 100% rename from platforms/unix/src/atspi/interfaces/mod.rs rename to adapters/unix/src/atspi/interfaces/mod.rs diff --git a/platforms/unix/src/atspi/interfaces/selection.rs b/adapters/unix/src/atspi/interfaces/selection.rs similarity index 100% rename from platforms/unix/src/atspi/interfaces/selection.rs rename to adapters/unix/src/atspi/interfaces/selection.rs diff --git a/platforms/unix/src/atspi/interfaces/text.rs b/adapters/unix/src/atspi/interfaces/text.rs similarity index 100% rename from platforms/unix/src/atspi/interfaces/text.rs rename to adapters/unix/src/atspi/interfaces/text.rs diff --git a/platforms/unix/src/atspi/interfaces/value.rs b/adapters/unix/src/atspi/interfaces/value.rs similarity index 100% rename from platforms/unix/src/atspi/interfaces/value.rs rename to adapters/unix/src/atspi/interfaces/value.rs diff --git a/platforms/unix/src/atspi/mod.rs b/adapters/unix/src/atspi/mod.rs similarity index 100% rename from platforms/unix/src/atspi/mod.rs rename to adapters/unix/src/atspi/mod.rs diff --git a/platforms/unix/src/atspi/object_address.rs b/adapters/unix/src/atspi/object_address.rs similarity index 100% rename from platforms/unix/src/atspi/object_address.rs rename to adapters/unix/src/atspi/object_address.rs diff --git a/platforms/unix/src/atspi/object_id.rs b/adapters/unix/src/atspi/object_id.rs similarity index 100% rename from platforms/unix/src/atspi/object_id.rs rename to adapters/unix/src/atspi/object_id.rs diff --git a/platforms/unix/src/context.rs b/adapters/unix/src/context.rs similarity index 100% rename from platforms/unix/src/context.rs rename to adapters/unix/src/context.rs diff --git a/platforms/unix/src/executor.rs b/adapters/unix/src/executor.rs similarity index 100% rename from platforms/unix/src/executor.rs rename to adapters/unix/src/executor.rs diff --git a/platforms/unix/src/lib.rs b/adapters/unix/src/lib.rs similarity index 100% rename from platforms/unix/src/lib.rs rename to adapters/unix/src/lib.rs diff --git a/platforms/unix/src/util.rs b/adapters/unix/src/util.rs similarity index 100% rename from platforms/unix/src/util.rs rename to adapters/unix/src/util.rs diff --git a/platforms/windows/CHANGELOG.md b/adapters/windows/CHANGELOG.md similarity index 100% rename from platforms/windows/CHANGELOG.md rename to adapters/windows/CHANGELOG.md diff --git a/platforms/windows/Cargo.toml b/adapters/windows/Cargo.toml similarity index 87% rename from platforms/windows/Cargo.toml rename to adapters/windows/Cargo.toml index 25a1b9d24..c40459400 100644 --- a/platforms/windows/Cargo.toml +++ b/adapters/windows/Cargo.toml @@ -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" diff --git a/platforms/windows/README.md b/adapters/windows/README.md similarity index 100% rename from platforms/windows/README.md rename to adapters/windows/README.md diff --git a/platforms/windows/examples/hello_world.rs b/adapters/windows/examples/hello_world.rs similarity index 100% rename from platforms/windows/examples/hello_world.rs rename to adapters/windows/examples/hello_world.rs diff --git a/platforms/windows/src/adapter.rs b/adapters/windows/src/adapter.rs similarity index 100% rename from platforms/windows/src/adapter.rs rename to adapters/windows/src/adapter.rs diff --git a/platforms/windows/src/context.rs b/adapters/windows/src/context.rs similarity index 100% rename from platforms/windows/src/context.rs rename to adapters/windows/src/context.rs diff --git a/platforms/windows/src/filters.rs b/adapters/windows/src/filters.rs similarity index 100% rename from platforms/windows/src/filters.rs rename to adapters/windows/src/filters.rs diff --git a/platforms/windows/src/lib.rs b/adapters/windows/src/lib.rs similarity index 100% rename from platforms/windows/src/lib.rs rename to adapters/windows/src/lib.rs diff --git a/platforms/windows/src/node.rs b/adapters/windows/src/node.rs similarity index 100% rename from platforms/windows/src/node.rs rename to adapters/windows/src/node.rs diff --git a/platforms/windows/src/subclass.rs b/adapters/windows/src/subclass.rs similarity index 100% rename from platforms/windows/src/subclass.rs rename to adapters/windows/src/subclass.rs diff --git a/platforms/windows/src/tests/mod.rs b/adapters/windows/src/tests/mod.rs similarity index 100% rename from platforms/windows/src/tests/mod.rs rename to adapters/windows/src/tests/mod.rs diff --git a/platforms/windows/src/tests/simple.rs b/adapters/windows/src/tests/simple.rs similarity index 100% rename from platforms/windows/src/tests/simple.rs rename to adapters/windows/src/tests/simple.rs diff --git a/platforms/windows/src/tests/subclassed.rs b/adapters/windows/src/tests/subclassed.rs similarity index 100% rename from platforms/windows/src/tests/subclassed.rs rename to adapters/windows/src/tests/subclassed.rs diff --git a/platforms/windows/src/text.rs b/adapters/windows/src/text.rs similarity index 100% rename from platforms/windows/src/text.rs rename to adapters/windows/src/text.rs diff --git a/platforms/windows/src/util.rs b/adapters/windows/src/util.rs similarity index 100% rename from platforms/windows/src/util.rs rename to adapters/windows/src/util.rs diff --git a/platforms/windows/src/window_handle.rs b/adapters/windows/src/window_handle.rs similarity index 100% rename from platforms/windows/src/window_handle.rs rename to adapters/windows/src/window_handle.rs diff --git a/platforms/winit/CHANGELOG.md b/adapters/winit/CHANGELOG.md similarity index 100% rename from platforms/winit/CHANGELOG.md rename to adapters/winit/CHANGELOG.md diff --git a/platforms/winit/Cargo.toml b/adapters/winit/Cargo.toml similarity index 97% rename from platforms/winit/Cargo.toml rename to adapters/winit/Cargo.toml index ea137a23c..558b43a30 100644 --- a/platforms/winit/Cargo.toml +++ b/adapters/winit/Cargo.toml @@ -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 } diff --git a/platforms/winit/README.md b/adapters/winit/README.md similarity index 100% rename from platforms/winit/README.md rename to adapters/winit/README.md diff --git a/platforms/winit/examples/apple/.gitignore b/adapters/winit/examples/apple/.gitignore similarity index 100% rename from platforms/winit/examples/apple/.gitignore rename to adapters/winit/examples/apple/.gitignore diff --git a/platforms/winit/examples/apple/build_with_cargo.bash b/adapters/winit/examples/apple/build_with_cargo.bash similarity index 100% rename from platforms/winit/examples/apple/build_with_cargo.bash rename to adapters/winit/examples/apple/build_with_cargo.bash diff --git a/platforms/winit/examples/apple/project.yml b/adapters/winit/examples/apple/project.yml similarity index 100% rename from platforms/winit/examples/apple/project.yml rename to adapters/winit/examples/apple/project.yml diff --git a/platforms/winit/examples/mixed_handlers.rs b/adapters/winit/examples/mixed_handlers.rs similarity index 100% rename from platforms/winit/examples/mixed_handlers.rs rename to adapters/winit/examples/mixed_handlers.rs diff --git a/platforms/winit/examples/simple.rs b/adapters/winit/examples/simple.rs similarity index 100% rename from platforms/winit/examples/simple.rs rename to adapters/winit/examples/simple.rs diff --git a/platforms/winit/examples/util/fill.rs b/adapters/winit/examples/util/fill.rs similarity index 100% rename from platforms/winit/examples/util/fill.rs rename to adapters/winit/examples/util/fill.rs diff --git a/platforms/winit/src/lib.rs b/adapters/winit/src/lib.rs similarity index 100% rename from platforms/winit/src/lib.rs rename to adapters/winit/src/lib.rs diff --git a/platforms/winit/src/platform_impl/android.rs b/adapters/winit/src/platform_impl/android.rs similarity index 100% rename from platforms/winit/src/platform_impl/android.rs rename to adapters/winit/src/platform_impl/android.rs diff --git a/platforms/winit/src/platform_impl/ios.rs b/adapters/winit/src/platform_impl/ios.rs similarity index 100% rename from platforms/winit/src/platform_impl/ios.rs rename to adapters/winit/src/platform_impl/ios.rs diff --git a/platforms/winit/src/platform_impl/macos.rs b/adapters/winit/src/platform_impl/macos.rs similarity index 100% rename from platforms/winit/src/platform_impl/macos.rs rename to adapters/winit/src/platform_impl/macos.rs diff --git a/platforms/winit/src/platform_impl/mod.rs b/adapters/winit/src/platform_impl/mod.rs similarity index 100% rename from platforms/winit/src/platform_impl/mod.rs rename to adapters/winit/src/platform_impl/mod.rs diff --git a/platforms/winit/src/platform_impl/null.rs b/adapters/winit/src/platform_impl/null.rs similarity index 100% rename from platforms/winit/src/platform_impl/null.rs rename to adapters/winit/src/platform_impl/null.rs diff --git a/platforms/winit/src/platform_impl/unix.rs b/adapters/winit/src/platform_impl/unix.rs similarity index 100% rename from platforms/winit/src/platform_impl/unix.rs rename to adapters/winit/src/platform_impl/unix.rs diff --git a/platforms/winit/src/platform_impl/windows.rs b/adapters/winit/src/platform_impl/windows.rs similarity index 100% rename from platforms/winit/src/platform_impl/windows.rs rename to adapters/winit/src/platform_impl/windows.rs diff --git a/release-please-config.json b/release-please-config.json index e0cf47199..f117c84c5 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -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": {} } }