Explorar o código

Update license file to reflect that Solang is Apache-2.0 only

Solang like any Hyperledger project is Apache-2.0 only.

Signed-off-by: Sean Young <sean@mess.org>
Sean Young %!s(int64=4) %!d(string=hai) anos
pai
achega
9d35806f37
Modificáronse 4 ficheiros con 6 adicións e 24 borrados
  1. 1 1
      Cargo.toml
  2. 0 0
      LICENSE
  3. 0 23
      LICENSE-MIT
  4. 5 0
      README.md

+ 1 - 1
Cargo.toml

@@ -4,7 +4,7 @@ version = "0.1.7"
 authors = ["Sean Young <sean@mess.org>"]
 authors = ["Sean Young <sean@mess.org>"]
 homepage = "https://github.com/hyperledger-labs/solang"
 homepage = "https://github.com/hyperledger-labs/solang"
 documentation = "https://solang.readthedocs.io/"
 documentation = "https://solang.readthedocs.io/"
-license = "Apache-2.0 OR MIT"
+license = "Apache-2.0"
 build = "build.rs"
 build = "build.rs"
 description = "Solang Solidity Compiler"
 description = "Solang Solidity Compiler"
 keywords = [ "solidity", "compiler", "ewasm", "llvm", "substrate" ]
 keywords = [ "solidity", "compiler", "ewasm", "llvm", "substrate" ]

+ 0 - 0
LICENSE-APACHE → LICENSE


+ 0 - 23
LICENSE-MIT

@@ -1,23 +0,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.

+ 5 - 0
README.md

@@ -3,6 +3,7 @@
 [![Rocket.Chat](https://open.rocket.chat/images/join-chat.svg)](https://chat.hyperledger.org/channel/solang)
 [![Rocket.Chat](https://open.rocket.chat/images/join-chat.svg)](https://chat.hyperledger.org/channel/solang)
 [![CI](https://github.com/hyperledger-labs/solang/workflows/test/badge.svg)](https://github.com/hyperledger-labs/solang/actions)
 [![CI](https://github.com/hyperledger-labs/solang/workflows/test/badge.svg)](https://github.com/hyperledger-labs/solang/actions)
 [![Documentation Status](https://readthedocs.org/projects/solang/badge/?version=latest)](https://solang.readthedocs.io/en/latest/?badge=latest)
 [![Documentation Status](https://readthedocs.org/projects/solang/badge/?version=latest)](https://solang.readthedocs.io/en/latest/?badge=latest)
+[![license](https://img.shields.io/github/license/hyperledger-labs/solang.svg)](LICENSE)
 [![LoC](https://tokei.rs/b1/github/hyperledger-labs/solang?category=lines)](https://github.com/hyperledger-labs/solang)
 [![LoC](https://tokei.rs/b1/github/hyperledger-labs/solang?category=lines)](https://github.com/hyperledger-labs/solang)
 
 
 [<img align="right" width="640" src="docs/web3_foundation_grants_badge_black.svg" alt="Funded by the web3 foundation">](https://github.com/w3f/Web3-collaboration/blob/master/grants/accepted_grant_applications.md#wave-4)
 [<img align="right" width="640" src="docs/web3_foundation_grants_badge_black.svg" alt="Funded by the web3 foundation">](https://github.com/w3f/Web3-collaboration/blob/master/grants/accepted_grant_applications.md#wave-4)
@@ -55,3 +56,7 @@ docker run --rm -it -v $(pwd):/sources hyperledgerlabs/solang -v -o /sources  --
 You will have a file called flipper.contact. You can use this directly in
 You will have a file called flipper.contact. You can use this directly in
 the [Polkadot UI](https://substrate.dev/substrate-contracts-workshop/#/0/deploying-your-contract?id=putting-your-code-on-the-blockchain), as if your smart
 the [Polkadot UI](https://substrate.dev/substrate-contracts-workshop/#/0/deploying-your-contract?id=putting-your-code-on-the-blockchain), as if your smart
 contract was written using ink!.
 contract was written using ink!.
+
+## License
+
+[Apache 2.0](LICENSE)