diff --git a/.github/label-config.yml b/.github/label-config.yml index a506b4959f94e..d4becb1ec5c61 100644 --- a/.github/label-config.yml +++ b/.github/label-config.yml @@ -3,6 +3,3 @@ S-Needs-Triage: - "**" - -S-Pre-Relicense: -- "**" diff --git a/Cargo.toml b/Cargo.toml index 7feb450cc82be..f95b76f75a9ee 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ description = "A refreshingly simple data-driven game engine and app framework" exclude = ["assets/**/*", "tools/**/*", ".github/**/*", "crates/**/*"] homepage = "https://bevyengine.org" keywords = ["game", "engine", "gamedev", "graphics", "bevy"] -license = "MIT" +license = "MIT OR Apache-2.0" readme = "README.md" repository = "https://github.com/bevyengine/bevy" diff --git a/LICENSE b/LICENSE index 9d1f4a3d52339..fbd8360493ed5 100644 --- a/LICENSE +++ b/LICENSE @@ -1,21 +1,6 @@ -MIT License +Bevy is dual-licensed under either -Copyright (c) 2020 Carter Anderson +* MIT License (docs/LICENSE-MIT or http://opensource.org/licenses/MIT) +* Apache License, Version 2.0 (docs/LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0) -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. \ No newline at end of file +at your option. \ No newline at end of file diff --git a/README.md b/README.md index 567ed27aea6e1..734584d4eb147 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # [![Bevy](assets/branding/bevy_logo_light_dark_and_dimmed.svg)](https://bevyengine.org) [![Crates.io](https://img.shields.io/crates/v/bevy.svg)](https://crates.io/crates/bevy) -[![license](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE) +[![MIT/Apache 2.0](https://img.shields.io/badge/license-MIT%2FApache-blue.svg)](./LICENSE) [![Crates.io](https://img.shields.io/crates/d/bevy.svg)](https://crates.io/crates/bevy) [![Rust](https://github.com/bevyengine/bevy/workflows/CI/badge.svg)](https://github.com/bevyengine/bevy/actions) ![iOS cron CI](https://github.com/bevyengine/bevy/workflows/iOS%20cron%20CI/badge.svg) @@ -98,3 +98,16 @@ Plugins are very welcome to extend Bevy's features. [Guidelines][plugin_guidelin ## Thanks and Alternatives Additionally, we would like to thank the [Amethyst](https://github.com/amethyst/amethyst), [macroquad](https://github.com/not-fl3/macroquad), [coffee](https://github.com/hecrj/coffee), [ggez](https://github.com/ggez/ggez), [rg3d](https://github.com/mrDIMAS/rg3d), and [Piston](https://github.com/PistonDevelopers/piston) projects for providing solid examples of game engine development in Rust. If you are looking for a Rust game engine, it is worth considering all of your options. Each engine has different design goals, and some will likely resonate with you more than others. + +## License + +Bevy is free and open source! All code in this repository is dual-licensed under either: + +* MIT License ([LICENSE-MIT](docs/LICENSE-MIT) or [http://opensource.org/licenses/MIT](http://opensource.org/licenses/MIT)) +* Apache License, Version 2.0 ([LICENSE-APACHE](docs/LICENSE-APACHE) or [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)) + +at your option. This means you can select the license you prefer! This dual-licensing approach is the de-facto standard in the Rust ecosystem and there are [very good reasons](https://github.com/bevyengine/bevy/issues/2373) to include both. + +Unless you explicitly state otherwise, any contribution intentionally submitted +for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any +additional terms or conditions. diff --git a/crates/bevy_app/Cargo.toml b/crates/bevy_app/Cargo.toml index 37b9d7f6f6bb9..58e8ac243e79c 100644 --- a/crates/bevy_app/Cargo.toml +++ b/crates/bevy_app/Cargo.toml @@ -9,7 +9,7 @@ authors = [ description = "Provides core App functionality for Bevy Engine" homepage = "https://bevyengine.org" repository = "https://github.com/bevyengine/bevy" -license = "MIT" +license = "MIT OR Apache-2.0" keywords = ["bevy"] [features] diff --git a/crates/bevy_asset/Cargo.toml b/crates/bevy_asset/Cargo.toml index 838265886517b..0e13e0d1fc0ac 100644 --- a/crates/bevy_asset/Cargo.toml +++ b/crates/bevy_asset/Cargo.toml @@ -9,7 +9,7 @@ authors = [ description = "Provides asset functionality for Bevy Engine" homepage = "https://bevyengine.org" repository = "https://github.com/bevyengine/bevy" -license = "MIT" +license = "MIT OR Apache-2.0" keywords = ["bevy"] [features] diff --git a/crates/bevy_audio/Cargo.toml b/crates/bevy_audio/Cargo.toml index b16ee2ab38bce..e5d9b02163e76 100644 --- a/crates/bevy_audio/Cargo.toml +++ b/crates/bevy_audio/Cargo.toml @@ -9,7 +9,7 @@ authors = [ description = "Provides audio functionality for Bevy Engine" homepage = "https://bevyengine.org" repository = "https://github.com/bevyengine/bevy" -license = "MIT" +license = "MIT OR Apache-2.0" keywords = ["bevy"] [dependencies] diff --git a/crates/bevy_core/Cargo.toml b/crates/bevy_core/Cargo.toml index 107cead7be36d..ef6283e890aff 100644 --- a/crates/bevy_core/Cargo.toml +++ b/crates/bevy_core/Cargo.toml @@ -9,7 +9,7 @@ authors = [ description = "Provides core functionality for Bevy Engine" homepage = "https://bevyengine.org" repository = "https://github.com/bevyengine/bevy" -license = "MIT" +license = "MIT OR Apache-2.0" keywords = ["bevy"] diff --git a/crates/bevy_derive/Cargo.toml b/crates/bevy_derive/Cargo.toml index c384141a19075..2729d6f1076b3 100644 --- a/crates/bevy_derive/Cargo.toml +++ b/crates/bevy_derive/Cargo.toml @@ -9,7 +9,7 @@ authors = [ description = "Provides derive implementations for Bevy Engine" homepage = "https://bevyengine.org" repository = "https://github.com/bevyengine/bevy" -license = "MIT" +license = "MIT OR Apache-2.0" keywords = ["bevy"] [lib] diff --git a/crates/bevy_diagnostic/Cargo.toml b/crates/bevy_diagnostic/Cargo.toml index a1c679046e06a..83b234b01dd81 100644 --- a/crates/bevy_diagnostic/Cargo.toml +++ b/crates/bevy_diagnostic/Cargo.toml @@ -9,7 +9,7 @@ authors = [ description = "Provides diagnostic functionality for Bevy Engine" homepage = "https://bevyengine.org" repository = "https://github.com/bevyengine/bevy" -license = "MIT" +license = "MIT OR Apache-2.0" keywords = ["bevy"] diff --git a/crates/bevy_dylib/Cargo.toml b/crates/bevy_dylib/Cargo.toml index 094b7be7fcffa..cb424f6673a62 100644 --- a/crates/bevy_dylib/Cargo.toml +++ b/crates/bevy_dylib/Cargo.toml @@ -9,7 +9,7 @@ authors = [ description = "Force the Bevy Engine to be dynamically linked for faster linking" homepage = "https://bevyengine.org" repository = "https://github.com/bevyengine/bevy" -license = "MIT" +license = "MIT OR Apache-2.0" keywords = ["bevy"] [lib] diff --git a/crates/bevy_dynamic_plugin/Cargo.toml b/crates/bevy_dynamic_plugin/Cargo.toml index 4a8fa0c9bc304..99589c7cc94b9 100644 --- a/crates/bevy_dynamic_plugin/Cargo.toml +++ b/crates/bevy_dynamic_plugin/Cargo.toml @@ -9,7 +9,7 @@ edition = "2018" description = "Provides dynamic plugin loading capabilities for non-wasm platforms" homepage = "https://bevyengine.org" repository = "https://github.com/bevyengine/bevy" -license = "MIT" +license = "MIT OR Apache-2.0" keywords = ["bevy"] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/crates/bevy_ecs/Cargo.toml b/crates/bevy_ecs/Cargo.toml index e83a7b2497088..b7797993bc427 100644 --- a/crates/bevy_ecs/Cargo.toml +++ b/crates/bevy_ecs/Cargo.toml @@ -9,7 +9,7 @@ authors = [ description = "Bevy Engine's entity component system" homepage = "https://bevyengine.org" repository = "https://github.com/bevyengine/bevy" -license = "MIT" +license = "MIT OR Apache-2.0" keywords = ["ecs", "game", "bevy"] categories = ["game-engines", "data-structures"] diff --git a/crates/bevy_ecs/macros/Cargo.toml b/crates/bevy_ecs/macros/Cargo.toml index c443f27fa235f..b6617e54ee41c 100644 --- a/crates/bevy_ecs/macros/Cargo.toml +++ b/crates/bevy_ecs/macros/Cargo.toml @@ -7,7 +7,7 @@ authors = [ "Carter Anderson ", ] edition = "2018" -license = "MIT" +license = "MIT OR Apache-2.0" [lib] proc-macro = true diff --git a/crates/bevy_gilrs/Cargo.toml b/crates/bevy_gilrs/Cargo.toml index 20a0cddfe329e..e913abb9b9d7b 100644 --- a/crates/bevy_gilrs/Cargo.toml +++ b/crates/bevy_gilrs/Cargo.toml @@ -6,7 +6,7 @@ authors = ["Bevy Contributors ", "Carter Anderson