Issue #12 Review Licensing changes
Move dual-licensing to COPYING.md. Add MIT License to LICENSE-MIT.md Issue #12 Review Licensing changes Fix cocoapods warning on LICENSE file
This commit is contained in:
parent
445eafa4b3
commit
29d2629413
|
@ -0,0 +1,15 @@
|
|||
# License
|
||||
|
||||
Licensed under either of
|
||||
|
||||
* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
|
||||
* MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
|
||||
|
||||
at your option.
|
||||
|
||||
## Contribution
|
||||
|
||||
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.
|
13
LICENSE-MIT
13
LICENSE-MIT
|
@ -1,6 +1,7 @@
|
|||
MIT License
|
||||
The MIT License (MIT)
|
||||
|
||||
Copyright (c) 2020 Electric Coin Company
|
||||
Copyright (c) 2017 CikeQiu
|
||||
Copyright (c) 2020-2021 The Electric Coin Company
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
|
@ -9,13 +10,13 @@ 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 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.
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
|
@ -9,7 +9,7 @@
|
|||
DESC
|
||||
|
||||
s.homepage = "https://github.com/zcash-hackworks/MnemonicSwift"
|
||||
s.license = { :type => "MIT", :file => "LICENSE" }
|
||||
s.license = { :type => "dual", :file => "COPYING.md" }
|
||||
s.author = { "Francisco Gindre" => "francisco.gindre@gmail.com" }
|
||||
s.source = { :git => "https://github.com/zcash-hackworks/MnemonicSwift.git", :tag => s.version }
|
||||
s.source_files = "MnemonicSwift/**/*.swift",
|
||||
|
|
17
README.md
17
README.md
|
@ -55,8 +55,7 @@ github "zcash-hackworks/MnemonicSwift"
|
|||
print("Deterministic Seed String: \(deterministicSeedString)")
|
||||
```
|
||||
|
||||
## Contributions
|
||||
|
||||
## Setting up the project as contributor
|
||||
|
||||
To get set up:
|
||||
```shell
|
||||
|
@ -67,4 +66,16 @@ $ open MnemonicSwift.xcodeproj
|
|||
|
||||
## License
|
||||
|
||||
MIT
|
||||
Licensed under either of
|
||||
|
||||
* Apache License, Version 2.0, ([LICENSE-APACHE](./LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
|
||||
* MIT license ([LICENSE-MIT](./LICENSE-MIT) or http://opensource.org/licenses/MIT)
|
||||
|
||||
at your option.
|
||||
|
||||
### Contribution
|
||||
|
||||
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.
|
||||
|
|
Loading…
Reference in New Issue