From 7f44ec512e7d150b7312336ed7908ac86441b4cc Mon Sep 17 00:00:00 2001 From: Sophie Alpert Date: Fri, 16 Feb 2018 18:25:02 -0800 Subject: [PATCH] Update to MIT license Summary: Manual changes. Reviewed By: TheSavior, yungsters Differential Revision: D7012152 fbshipit-source-id: de7459be3db13c687868b45059856f125c4f2eb1 --- CONTRIBUTING.md | 2 +- LICENSE | 43 ++++++++++++++++------------------------- PATENTS | 33 ------------------------------- Yoga.podspec | 2 +- YogaKit.podspec | 2 +- gentest/gentest.js | 6 ++---- gradle.properties | 2 +- javascript/package.json | 2 +- 8 files changed, 24 insertions(+), 68 deletions(-) delete mode 100644 PATENTS diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d971c1ea..679644f2 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -31,4 +31,4 @@ outlined on that page and do not file a public issue. ## License By contributing to yoga, you agree that your contributions will be licensed -under its BSD license. +under its MIT license. diff --git a/LICENSE b/LICENSE index 2b3f0e4f..cde61b6c 100644 --- a/LICENSE +++ b/LICENSE @@ -1,30 +1,21 @@ -BSD License +MIT License -For yoga software +Copyright (c) 2014-present, Facebook, Inc. -Copyright (c) 2014-present, Facebook, Inc. All rights reserved. +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: -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - * Neither the name Facebook nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +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. diff --git a/PATENTS b/PATENTS deleted file mode 100644 index 78780735..00000000 --- a/PATENTS +++ /dev/null @@ -1,33 +0,0 @@ -Additional Grant of Patent Rights Version 2 - -"Software" means the yoga software distributed by Facebook, Inc. - -Facebook, Inc. (“Facebook”) hereby grants to each recipient of the Software -(“you”) a perpetual, worldwide, royalty-free, non-exclusive, irrevocable -(subject to the termination provision below) license under any Necessary -Claims, to make, have made, use, sell, offer to sell, import, and otherwise -transfer the Software. For avoidance of doubt, no license is granted under -Facebook's rights in any patent claims that are infringed by (i) modifications -to the Software made by you or any third party or (ii) the Software in -combination with any software or other technology. - -The license granted hereunder will terminate, automatically and without notice, -if you (or any of your subsidiaries, corporate affiliates or agents) initiate -directly or indirectly, or take a direct financial interest in, any Patent -Assertion: (i) against Facebook or any of its subsidiaries or corporate -affiliates, (ii) against any party if such Patent Assertion arises in whole or -in part from any software, technology, product or service of Facebook or any of -its subsidiaries or corporate affiliates, or (iii) against any party relating -to the Software. Notwithstanding the foregoing, if Facebook or any of its -subsidiaries or corporate affiliates files a lawsuit alleging patent -infringement against you in the first instance, and you respond by filing a -patent infringement counterclaim in that lawsuit against that party that is -unrelated to the Software, the license granted hereunder will not terminate -under section (i) of this paragraph due to such counterclaim. - -A "Necessary Claim" is a claim of a patent owned by Facebook that is -necessarily infringed by the Software standing alone. - -A "Patent Assertion" is any lawsuit or other action alleging direct, indirect, -or contributory infringement or inducement to infringe any patent, including a -cross-claim or counterclaim. diff --git a/Yoga.podspec b/Yoga.podspec index 286d8d81..1f096861 100644 --- a/Yoga.podspec +++ b/Yoga.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |spec| spec.name = 'Yoga' spec.version = '1.7.0' - spec.license = { :type => 'BSD', :file => "LICENSE" } + spec.license = { :type => 'MIT', :file => "LICENSE" } spec.homepage = 'https://facebook.github.io/yoga/' spec.documentation_url = 'https://facebook.github.io/yoga/docs/api/c/' diff --git a/YogaKit.podspec b/YogaKit.podspec index e98f0257..085e0b73 100644 --- a/YogaKit.podspec +++ b/YogaKit.podspec @@ -1,7 +1,7 @@ podspec = Pod::Spec.new do |spec| spec.name = 'YogaKit' spec.version = '1.7.0' - spec.license = { :type => 'BSD', :file => "LICENSE" } + spec.license = { :type => 'MIT', :file => "LICENSE" } spec.homepage = 'https://facebook.github.io/yoga/' spec.documentation_url = 'https://facebook.github.io/yoga/docs/api/yogakit/' diff --git a/gentest/gentest.js b/gentest/gentest.js index 57d0939f..34918ba4 100755 --- a/gentest/gentest.js +++ b/gentest/gentest.js @@ -43,11 +43,9 @@ function printTest(e, LTRContainer, RTLContainer, genericContainer) { e.push([ '/**', ' * Copyright (c) 2014-present, Facebook, Inc.', - ' * All rights reserved.', ' *', - ' * This source code is licensed under the BSD-style license found in the', - ' * LICENSE file in the root directory of this source tree. An additional grant', - ' * of patent rights can be found in the PATENTS file in the same directory.', + ' * This source code is licensed under the MIT license found in the', + ' * LICENSE file in the root directory of this source tree.', ' */', '', '// @Generated by gentest/gentest.rb from gentest/fixtures/' + document.title + '.html', diff --git a/gradle.properties b/gradle.properties index 54fc2847..7f2dd230 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ POM_URL=https://github.com/facebook/yoga POM_SCM_URL=https://github.com/facebook/yoga.git POM_SCM_CONNECTION=scm:git:https://github.com/facebook/yoga.git POM_SCM_DEV_CONNECTION=scm:git:git@github.com:facebook/yoga.git -POM_LICENSE_NAME=BSD License +POM_LICENSE_NAME=MIT License POM_LICENSE_URL=https://github.com/facebook/yoga/blob/master/LICENSE POM_LICENSE_DIST=repo POM_DEVELOPER_ID=facebook diff --git a/javascript/package.json b/javascript/package.json index 56d8b4f5..1b42283a 100644 --- a/javascript/package.json +++ b/javascript/package.json @@ -2,7 +2,7 @@ "name": "yoga-layout", "version": "1.9.3", "description": "Yoga is a cross-platform layout engine enabling maximum collaboration within your team by implementing an API many designers are familiar with, and opening it up to developers across different platforms.", - "license": "BSD-3-Clause", + "license": "MIT", "repository": { "type": "git", "url": "git@github.com:facebook/yoga.git"