Skip to content

Commit aaa3368

Browse files
committed
update winit, fail compilation 👍
1 parent bea7fd1 commit aaa3368

File tree

3 files changed

+30
-8
lines changed

3 files changed

+30
-8
lines changed

Cargo.toml

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,11 @@ bevy_asset = ["bevy_internal/bevy_asset"]
7171
bevy_audio = ["bevy_internal/bevy_audio"]
7272

7373
# Provides cameras and other basic render pipeline features
74-
bevy_core_pipeline = ["bevy_internal/bevy_core_pipeline", "bevy_asset", "bevy_render"]
74+
bevy_core_pipeline = [
75+
"bevy_internal/bevy_core_pipeline",
76+
"bevy_asset",
77+
"bevy_render",
78+
]
7579

7680
# Plugin for dynamic loading (using [libloading](https://crates.io/crates/libloading))
7781
bevy_dynamic_plugin = ["bevy_internal/bevy_dynamic_plugin"]
@@ -83,7 +87,12 @@ bevy_gilrs = ["bevy_internal/bevy_gilrs"]
8387
bevy_gltf = ["bevy_internal/bevy_gltf", "bevy_asset", "bevy_scene", "bevy_pbr"]
8488

8589
# Adds PBR rendering
86-
bevy_pbr = ["bevy_internal/bevy_pbr", "bevy_asset", "bevy_render", "bevy_core_pipeline"]
90+
bevy_pbr = [
91+
"bevy_internal/bevy_pbr",
92+
"bevy_asset",
93+
"bevy_render",
94+
"bevy_core_pipeline",
95+
]
8796

8897
# Provides rendering functionality
8998
bevy_render = ["bevy_internal/bevy_render"]
@@ -98,7 +107,12 @@ bevy_sprite = ["bevy_internal/bevy_sprite", "bevy_render", "bevy_core_pipeline"]
98107
bevy_text = ["bevy_internal/bevy_text"]
99108

100109
# A custom ECS-driven UI framework
101-
bevy_ui = ["bevy_internal/bevy_ui", "bevy_core_pipeline", "bevy_text", "bevy_sprite"]
110+
bevy_ui = [
111+
"bevy_internal/bevy_ui",
112+
"bevy_core_pipeline",
113+
"bevy_text",
114+
"bevy_sprite",
115+
]
102116

103117
# winit window and input backend
104118
bevy_winit = ["bevy_internal/bevy_winit"]
@@ -113,7 +127,11 @@ trace_chrome = ["trace", "bevy_internal/trace_chrome"]
113127
trace_tracy = ["trace", "bevy_internal/trace_tracy"]
114128

115129
# Tracing support, with memory profiling, exposing a port for Tracy
116-
trace_tracy_memory = ["trace", "bevy_internal/trace_tracy", "bevy_internal/trace_tracy_memory"]
130+
trace_tracy_memory = [
131+
"trace",
132+
"bevy_internal/trace_tracy",
133+
"bevy_internal/trace_tracy_memory",
134+
]
117135

118136
# Tracing support
119137
trace = ["bevy_internal/trace"]

crates/bevy_animation/Cargo.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ bevy_app = { path = "../bevy_app", version = "0.11.0-dev" }
1414
bevy_asset = { path = "../bevy_asset", version = "0.11.0-dev" }
1515
bevy_core = { path = "../bevy_core", version = "0.11.0-dev" }
1616
bevy_math = { path = "../bevy_math", version = "0.11.0-dev" }
17-
bevy_reflect = { path = "../bevy_reflect", version = "0.11.0-dev", features = ["bevy"] }
17+
bevy_reflect = { path = "../bevy_reflect", version = "0.11.0-dev", features = [
18+
"bevy",
19+
] }
1820
bevy_time = { path = "../bevy_time", version = "0.11.0-dev" }
1921
bevy_utils = { path = "../bevy_utils", version = "0.11.0-dev" }
2022
bevy_ecs = { path = "../bevy_ecs", version = "0.11.0-dev" }

crates/bevy_winit/Cargo.toml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,15 @@ bevy_utils = { path = "../bevy_utils", version = "0.11.0-dev" }
2828
bevy_tasks = { path = "../bevy_tasks", version = "0.11.0-dev" }
2929

3030
# other
31-
winit = { version = "0.28", default-features = false }
32-
accesskit_winit = { version = "0.12", default-features = false }
31+
winit = { git = "https://github.com/rust-windowing/winit.git", branch = "master", default-features = false }
32+
accesskit_winit = { git = "https://github.com/Vrixyz/accesskit.git", branch = "winit-main-after-0.28", default-features = false }
3333
approx = { version = "0.5", default-features = false }
3434
raw-window-handle = "0.5"
3535

3636
[target.'cfg(target_os = "android")'.dependencies]
37-
winit = { version = "0.28", default-features = false, features = ["android-native-activity"] }
37+
winit = { git = "https://github.com/rust-windowing/winit.git", branch = "master", default-features = false, features = [
38+
"android-native-activity",
39+
] }
3840
once_cell = "1.11"
3941

4042
[target.'cfg(target_arch = "wasm32")'.dependencies]

0 commit comments

Comments
 (0)