Change default license to Apache-2.0. (FuelLabs#480)

* Change default license to Apache-2.0. * Update Forc manifest files. * Re-order manifest fields. * Fix typo. * Fix extra whitespace.
mitchmindtree · Dec 23, 2021 · 6820b85 · 6820b85
1 parent e8e1b94
commit 6820b85
Show file tree

Hide file tree

Showing 88 changed files with 92 additions and 92 deletions.
diff --git a/docs/src/getting-started/forc_project.md b/docs/src/getting-started/forc_project.md
@@ -24,7 +24,7 @@ $ tree .
 ```toml
 [project]
 author  = "user"
-license = "MIT"
+license = "Apache-2.0"
 name = "hello_world"
 entry = "main.sw"
 ```

diff --git a/example_project/example_dependency/Forc.toml b/example_project/example_dependency/Forc.toml
@@ -1,6 +1,6 @@
 [project]
 author  = "Alex Hansen"
-license = "MIT"
+license = "Apache-2.0"
 name = "example_dependency"
 entry = "main.sw"
 

diff --git a/example_project/fuel_project/Forc.toml b/example_project/fuel_project/Forc.toml
@@ -1,6 +1,6 @@
 [project]
 author  = "Alex Hansen"
-license = "MIT"
+license = "Apache-2.0"
 name = "Fuel example project"
 
 

diff --git a/forc/src/utils/defaults.rs b/forc/src/utils/defaults.rs
@@ -5,10 +5,10 @@ pub(crate) fn default_manifest(project_name: &str) -> String {
 
     format!(
         r#"[project]
-author  = "{}"
-license = "MIT"
 name = "{}"
+author = "{}"
 entry = "main.sw"
+license = "Apache-2.0"
 "#,
         real_name, project_name,
     )
@@ -23,11 +23,11 @@ pub(crate) fn default_tests_manifest(project_name: &str) -> String {
 
     format!(
         r#"[package]
-author  = "{}"
-license = "MIT"
 name = "{}"
-edition = "2021"
 version = "0.1.0"
+authors = "{}"
+edition = "2021"
+license = "Apache-2.0"
 
 [dependencies]
 tokio = {{ version = "1.12", features = ["rt", "macros"] }}

diff --git a/lib-core/Forc.toml b/lib-core/Forc.toml
@@ -1,5 +1,5 @@
 [project]
 author  = "Alexander Hansen"
-license = "MIT"
+license = "Apache-2.0"
 name = "core"
 entry = "lib.sw"
diff --git a/lib-std/Forc.toml b/lib-std/Forc.toml
@@ -1,6 +1,6 @@
 [project]
 author  = "Alex Hansen"
-license = "MIT"
+license = "Apache-2.0"
 name = "lib-std"
 entry = "lib.sw"
 

diff --git a/test/src/e2e_vm_tests/test_programs/address_test/Forc.toml b/test/src/e2e_vm_tests/test_programs/address_test/Forc.toml
@@ -1,6 +1,6 @@
 [project]
 author  = "Nick Furfaro"
-license = "MIT"
+license = "Apache-2.0"
 name = "address_test"
 entry = "main.sw"
 

diff --git a/test/src/e2e_vm_tests/test_programs/aliased_imports/Forc.toml b/test/src/e2e_vm_tests/test_programs/aliased_imports/Forc.toml
@@ -1,6 +1,6 @@
 [project]
 author  = "Emily Herbert <emily.herbert@fuel.sh>"
-license = "MIT"
+license = "Apache-2.0"
 name = "aliased_imports"
 entry = "main.sw"
 

diff --git a/test/src/e2e_vm_tests/test_programs/array_bad_index/Forc.toml b/test/src/e2e_vm_tests/test_programs/array_bad_index/Forc.toml
@@ -1,5 +1,5 @@
 [project]
 author  = "Toby Hutton <toby.hutton@fuel.sh>"
-license = "MIT"
+license = "Apache-2.0"
 name = "array_bad_index"
 entry = "main.sw"
diff --git a/test/src/e2e_vm_tests/test_programs/array_basics/Forc.toml b/test/src/e2e_vm_tests/test_programs/array_basics/Forc.toml
@@ -1,6 +1,6 @@
 [project]
 author  = "Toby Hutton <toby.hutton@fuel.sh>"
-license = "MIT"
+license = "Apache-2.0"
 name = "array_basics"
 entry = "main.sw"
 

diff --git a/test/src/e2e_vm_tests/test_programs/array_dynamic_oob/Forc.toml b/test/src/e2e_vm_tests/test_programs/array_dynamic_oob/Forc.toml
@@ -1,5 +1,5 @@
 [project]
 author  = "Toby Hutton <toby.hutton@fuel.sh>"
-license = "MIT"
+license = "Apache-2.0"
 name = "array_dynamic_oob"
 entry = "main.sw"
diff --git a/test/src/e2e_vm_tests/test_programs/array_generics/Forc.toml b/test/src/e2e_vm_tests/test_programs/array_generics/Forc.toml
@@ -1,5 +1,5 @@
 [project]
 author  = "Toby Hutton <toby.hutton@fuel.sh>"
-license = "MIT"
+license = "Apache-2.0"
 name = "array_generics"
 entry = "main.sw"
diff --git a/test/src/e2e_vm_tests/test_programs/array_oob/Forc.toml b/test/src/e2e_vm_tests/test_programs/array_oob/Forc.toml
@@ -1,5 +1,5 @@
 [project]
 author  = "Toby Hutton <toby.hutton@fuel.sh>"
-license = "MIT"
+license = "Apache-2.0"
 name = "array_oob"
 entry = "main.sw"
diff --git a/test/src/e2e_vm_tests/test_programs/asm_expr_basic/Forc.toml b/test/src/e2e_vm_tests/test_programs/asm_expr_basic/Forc.toml
@@ -1,5 +1,5 @@
 [project]
 author  = "Alexander Hansen <alex.hansen@fuel.sh>"
-license = "MIT"
+license = "Apache-2.0"
 name = "asm_expr_basic"
 entry = "main.sw"
diff --git a/test/src/e2e_vm_tests/test_programs/asm_missing_return/Forc.toml b/test/src/e2e_vm_tests/test_programs/asm_missing_return/Forc.toml
@@ -1,5 +1,5 @@
 [project]
 author  = "Alexander Hansen"
-license = "MIT"
+license = "Apache-2.0"
 name = "asm_missing_return"
 entry = "main.sw"
diff --git a/test/src/e2e_vm_tests/test_programs/asm_should_not_have_return/Forc.toml b/test/src/e2e_vm_tests/test_programs/asm_should_not_have_return/Forc.toml
@@ -1,5 +1,5 @@
 [project]
 author  = "Alexander Hansen"
-license = "MIT"
+license = "Apache-2.0"
 name = "asm_should_not_have_return"
 entry = "main.sw"
diff --git a/test/src/e2e_vm_tests/test_programs/asm_without_return/Forc.toml b/test/src/e2e_vm_tests/test_programs/asm_without_return/Forc.toml
@@ -1,5 +1,5 @@
 [project]
 author  = "Alexander Hansen"
-license = "MIT"
+license = "Apache-2.0"
 name = "asm_without_return"
 entry = "main.sw"
diff --git a/test/src/e2e_vm_tests/test_programs/assert_test/Forc.toml b/test/src/e2e_vm_tests/test_programs/assert_test/Forc.toml
@@ -1,6 +1,6 @@
 [project]
 author = "Nick Furfaro <nick.furfaro@fuel.sh>"
-license = "MIT"
+license = "Apache-2.0"
 name = "assert_test"
 entry = "main.sw"
 

diff --git a/test/src/e2e_vm_tests/test_programs/auth_testing_abi/Forc.toml b/test/src/e2e_vm_tests/test_programs/auth_testing_abi/Forc.toml
@@ -1,5 +1,5 @@
 [project]
 author  = "Alexander Hansen"
-license = "MIT"
+license = "Apache-2.0"
 name = "auth_testing_abi"
 entry = "main.sw"
diff --git a/test/src/e2e_vm_tests/test_programs/auth_testing_contract/Forc.toml b/test/src/e2e_vm_tests/test_programs/auth_testing_contract/Forc.toml
@@ -1,6 +1,6 @@
 [project]
 author  = "Alexander Hansen"
-license = "MIT"
+license = "Apache-2.0"
 name = "auth_testing_contract"
 entry = "main.sw"
 

diff --git a/test/src/e2e_vm_tests/test_programs/b256_bad_jumps/Forc.toml b/test/src/e2e_vm_tests/test_programs/b256_bad_jumps/Forc.toml
@@ -1,6 +1,6 @@
 [project]
 author  = "Toby Hutton <toby.hutton@fuel.sh>"
-license = "MIT"
+license = "Apache-2.0"
 name = "b256_bad_jumps"
 entry = "main.sw"
 

diff --git a/test/src/e2e_vm_tests/test_programs/b256_ops/Forc.toml b/test/src/e2e_vm_tests/test_programs/b256_ops/Forc.toml
@@ -1,6 +1,6 @@
 [project]
 author  = "Toby Hutton <toby.hutton@fuel.sh>"
-license = "MIT"
+license = "Apache-2.0"
 name = "b256_ops"
 entry = "main.sw"
 

diff --git a/test/src/e2e_vm_tests/test_programs/b512_struct_alignment/Forc.toml b/test/src/e2e_vm_tests/test_programs/b512_struct_alignment/Forc.toml
@@ -1,6 +1,6 @@
 [project]
 author  = "Alexander Hansen"
-license = "MIT"
+license = "Apache-2.0"
 name = "b512_panic_test"
 entry = "main.sw"
 

diff --git a/test/src/e2e_vm_tests/test_programs/b512_test/Forc.toml b/test/src/e2e_vm_tests/test_programs/b512_test/Forc.toml
@@ -1,6 +1,6 @@
 [project]
 author  = "Nick Furfaro"
-license = "MIT"
+license = "Apache-2.0"
 name = "b512_test"
 entry = "main.sw"
 

diff --git a/test/src/e2e_vm_tests/test_programs/bad_generic_annotation/Forc.toml b/test/src/e2e_vm_tests/test_programs/bad_generic_annotation/Forc.toml
@@ -1,5 +1,5 @@
 [project]
 author  = "Alexander Hansen"
-license = "MIT"
+license = "Apache-2.0"
 name = "bad_generic_annotation"
 entry = "main.sw"
diff --git a/test/src/e2e_vm_tests/test_programs/bad_generic_var_annotation/Forc.toml b/test/src/e2e_vm_tests/test_programs/bad_generic_var_annotation/Forc.toml
@@ -1,5 +1,5 @@
 [project]
 author  = "Alexander Hansen"
-license = "MIT"
+license = "Apache-2.0"
 name = "bad_generic_var_annotation"
 entry = "main.sw"
diff --git a/test/src/e2e_vm_tests/test_programs/bal_opcode/Forc.toml b/test/src/e2e_vm_tests/test_programs/bal_opcode/Forc.toml
@@ -1,6 +1,6 @@
 [project]
 author  = "Nick Furfaro"
-license = "MIT"
+license = "Apache-2.0"
 name = "bal_opcode"
 entry = "main.sw"
 

diff --git a/test/src/e2e_vm_tests/test_programs/balance_test_abi/Forc.toml b/test/src/e2e_vm_tests/test_programs/balance_test_abi/Forc.toml
@@ -1,5 +1,5 @@
 [project]
 author  = "Nick Furfaro"
-license = "MIT"
+license = "Apache-2.0"
 name = "balance_test_abi"
 entry = "main.sw"
diff --git a/test/src/e2e_vm_tests/test_programs/balance_test_contract/Forc.toml b/test/src/e2e_vm_tests/test_programs/balance_test_contract/Forc.toml
@@ -1,6 +1,6 @@
 [project]
 author  = "Nick Furfaro"
-license = "MIT"
+license = "Apache-2.0"
 name = "balance_test_contract"
 entry = "main.sw"
 

diff --git a/test/src/e2e_vm_tests/test_programs/basic_func_decl/Forc.toml b/test/src/e2e_vm_tests/test_programs/basic_func_decl/Forc.toml
@@ -1,6 +1,6 @@
 [project]
 author  = "Alexander Hansen <alex.hansen@fuel.sh>"
-license = "MIT"
+license = "Apache-2.0"
 name = "basic_func_decl"
 entry = "main.sw"
 

diff --git a/test/src/e2e_vm_tests/test_programs/basic_storage/Forc.toml b/test/src/e2e_vm_tests/test_programs/basic_storage/Forc.toml
@@ -1,6 +1,6 @@
 [project]
 author  = "Alexander Hansen"
-license = "MIT"
+license = "Apache-2.0"
 name = "basic_storage"
 entry = "main.sw"
 

diff --git a/test/src/e2e_vm_tests/test_programs/basic_storage_abi/Forc.toml b/test/src/e2e_vm_tests/test_programs/basic_storage_abi/Forc.toml
@@ -1,5 +1,5 @@
 [project]
 author  = "Alexander Hansen"
-license = "MIT"
+license = "Apache-2.0"
 name = "basic_storage_abi"
 entry = "main.sw"
diff --git a/test/src/e2e_vm_tests/test_programs/block_height/Forc.toml b/test/src/e2e_vm_tests/test_programs/block_height/Forc.toml
@@ -1,6 +1,6 @@
 [project]
 author  = "Nick Furfaro"
-license = "MIT"
+license = "Apache-2.0"
 name = "block_height"
 entry = "main.sw"
 

diff --git a/test/src/e2e_vm_tests/test_programs/bool_and_or/Forc.toml b/test/src/e2e_vm_tests/test_programs/bool_and_or/Forc.toml
@@ -1,6 +1,6 @@
 [project]
 author  = "Toby Hutton <toby.hutton@fuel.sh>"
-license = "MIT"
+license = "Apache-2.0"
 name = "bool_and_or"
 entry = "main.sw"
 

diff --git a/test/src/e2e_vm_tests/test_programs/call_basic_storage/Forc.toml b/test/src/e2e_vm_tests/test_programs/call_basic_storage/Forc.toml
@@ -1,6 +1,6 @@
 [project]
 author = "Alexander Hansen"
-license = "MIT"
+license = "Apache-2.0"
 name = "call_basic_storage"
 entry = "main.sw"
 

diff --git a/test/src/e2e_vm_tests/test_programs/call_increment_contract/Forc.toml b/test/src/e2e_vm_tests/test_programs/call_increment_contract/Forc.toml
@@ -1,6 +1,6 @@
 [project]
 author  = "Alexander Hansen"
-license = "MIT"
+license = "Apache-2.0"
 name = "call_increment_contract"
 entry = "main.sw"
 

diff --git a/test/src/e2e_vm_tests/test_programs/caller_auth_test/Forc.toml b/test/src/e2e_vm_tests/test_programs/caller_auth_test/Forc.toml
@@ -1,6 +1,6 @@
 [project]
 author  = "alex"
-license = "MIT"
+license = "Apache-2.0"
 name = "caller_auth_test"
 entry = "main.sw"
 

diff --git a/test/src/e2e_vm_tests/test_programs/caller_context_test/Forc.toml b/test/src/e2e_vm_tests/test_programs/caller_context_test/Forc.toml
@@ -1,6 +1,6 @@
 [project]
 author  = "Nick Furfaro"
-license = "MIT"
+license = "Apache-2.0"
 name = "caller_context_test"
 entry = "main.sw"
 

diff --git a/test/src/e2e_vm_tests/test_programs/const_decl/Forc.toml b/test/src/e2e_vm_tests/test_programs/const_decl/Forc.toml
@@ -1,6 +1,6 @@
 [project]
 author  = "Toby Hutton <toby.hutton@fuel.sh>"
-license = "MIT"
+license = "Apache-2.0"
 name = "const_decl"
 entry = "main.sw"
 

diff --git a/test/src/e2e_vm_tests/test_programs/const_decl_in_library/Forc.toml b/test/src/e2e_vm_tests/test_programs/const_decl_in_library/Forc.toml
@@ -1,6 +1,6 @@
 [project]
 author  = "Toby Hutton <toby.hutton@fuel.sh>"
-license = "MIT"
+license = "Apache-2.0"
 name = "const_decl_in_library"
 entry = "main.sw"
 

diff --git a/test/src/e2e_vm_tests/test_programs/context_testing_abi/Forc.toml b/test/src/e2e_vm_tests/test_programs/context_testing_abi/Forc.toml
@@ -1,6 +1,6 @@
 [project]
 author  = "Nick Furfaro"
-license = "MIT"
+license = "Apache-2.0"
 name = "context_testing_abi"
 entry = "main.sw"
 

diff --git a/test/src/e2e_vm_tests/test_programs/context_testing_contract/Forc.toml b/test/src/e2e_vm_tests/test_programs/context_testing_contract/Forc.toml
@@ -1,6 +1,6 @@
 [project]
 author  = "Nick Furfaro"
-license = "MIT"
+license = "Apache-2.0"
 name = "context_testing_contract"
 entry = "main.sw"
 

diff --git a/test/src/e2e_vm_tests/test_programs/contract_abi_impl/Forc.toml b/test/src/e2e_vm_tests/test_programs/contract_abi_impl/Forc.toml
@@ -1,6 +1,6 @@
 [project]
 author  = "Alexander Hansen <alex.hansen@fuel.sh>"
-license = "MIT"
+license = "Apache-2.0"
 name = "contract_abi_impl"
 entry = "main.sw"
 

diff --git a/test/src/e2e_vm_tests/test_programs/contract_call/Forc.toml b/test/src/e2e_vm_tests/test_programs/contract_call/Forc.toml
@@ -1,6 +1,6 @@
 [project]
 author  = "Alexander Hansen <alex.hansen@fuel.sh>"
-license = "MIT"
+license = "Apache-2.0"
 name = "contract_call"
 entry = "main.sw"
 

diff --git a/test/src/e2e_vm_tests/test_programs/contract_id_test/Forc.toml b/test/src/e2e_vm_tests/test_programs/contract_id_test/Forc.toml
@@ -1,6 +1,6 @@
 [project]
 author  = "Nick Furfaro"
-license = "MIT"
+license = "Apache-2.0"
 name = "contract_id_test"
 entry = "main.sw"
 

diff --git a/test/src/e2e_vm_tests/test_programs/contract_pure_calls_impure/Forc.toml b/test/src/e2e_vm_tests/test_programs/contract_pure_calls_impure/Forc.toml
@@ -1,5 +1,5 @@
 [project]
 author  = "Alexander Hansen"
-license = "MIT"
+license = "Apache-2.0"
 name = "valid_impurity"
 entry = "main.sw"
diff --git a/test/src/e2e_vm_tests/test_programs/dependencies/Forc.toml b/test/src/e2e_vm_tests/test_programs/dependencies/Forc.toml
@@ -1,6 +1,6 @@
 [project]
 author  = "Alexander Hansen <alex.hansen@fuel.sh>"
-license = "MIT"
+license = "Apache-2.0"
 name = "dependencies"
 entry = "main.sw"
 

diff --git a/test/src/e2e_vm_tests/test_programs/dependencies_parsing_error/Forc.toml b/test/src/e2e_vm_tests/test_programs/dependencies_parsing_error/Forc.toml
@@ -1,6 +1,6 @@
 [project]
 author  = "Emily Herbert <emily.herbert@fuel.sh>"
-license = "MIT"
+license = "Apache-2.0"
 name = "dependencies_parsing_error"
 entry = "main.sw"
 

diff --git a/test/src/e2e_vm_tests/test_programs/disallowed_gm/Forc.toml b/test/src/e2e_vm_tests/test_programs/disallowed_gm/Forc.toml
@@ -1,5 +1,5 @@
 [project]
 author  = "Alexander Hansen"
-license = "MIT"
+license = "Apache-2.0"
 name = "disallowed_opcodes"
 entry = "main.sw"