Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses). #1077

Merged
merged 6 commits into from
Aug 28, 2018

Conversation

appleguy
Copy link
Member

@appleguy appleguy commented Aug 20, 2018

With permission of the Facebook Open Source team, we are simplifying the Texture license, so that clients can rely on the terms of the Apache 2 license for all code in the Texture project.

This means that code originally forked from AsyncDisplayKit will be re-licensed from "BSD 3-clause + PATENTS v2" to Apache 2 (which includes a built-in patents grant).

Summarizing the change:

  • The ASDK-Licenses directory is deleted, which removes the AsyncDisplayKit-only BSD license and expands the scope of Texture's original Apache 2 license.
  • The header comments are simplified, but maintain the Facebook copyright on the original AsyncDisplayKit source files
  • See the header comments before and after

There may be a bit of iteration to get everything right since this is such a large change. @JoelMarcey is the Facebook representative who is authorized to review this change.

Copy link

@JoelMarcey JoelMarcey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Generally looks good. Just a couple of questions inline.

CONTRIBUTING.md Outdated
@@ -81,7 +81,7 @@ Before submitting a pull request, please make sure the following is done…
6. If you haven't already, sign the CLA.

**Copyright Notice for files**
Copy and paste this to the top of your new file(s):
Ensure this license header is included on all files in the repository, including new ones:

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So no license mentions in the headers of code files?

README.md Outdated
@@ -44,4 +44,4 @@ We welcome any contributions. See the [CONTRIBUTING](https://github.com/textureg

## License

The Texture project was created by Pinterest as a continuation, under a different name and license, of the AsyncDisplayKit codebase originally developed by Facebook. AsyncDisplayKit was originally released by Facebook under a BSD license and additional patent grant. Those BSD and patent licenses govern use of code in Texture contributed prior to 4/13/2017 (the original AsyncDisplayKit code), and copies of the licenses are included in the root directory of this source tree for reference. All code contributed to Texture after 4/13/2017 is released by Pinterest under an Apache 2.0 license.
The Texture project is available for free use, as described by the Apache 2.0 license. Texture is based on code from the AsyncDisplayKit project originally developed by Facebook. Although AsyncDisplayKit was originally released by Facebook under a BSD license and additional "PATENTS v2" grant, the entire Texture codebase is now under a unified Apache 2 license with approval from Facebook to remove the PATENTS v2 file (including for the AsyncDisplayKit fork from 4/13/17).

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure we need the second sentence any longer. I think you can remove all references to the old license.

…ASDK-Licenses)

With permission of the Facebook Open Source team, we are simplifying the Texture
license so that clients can rely on the Apache 2 terms that most of Texture is
already covered by. This means that code originally forked from AsyncDisplayKit
will be re-licensed from "BSD 3-clause + PATENTS v2" to Apache 2 without a
PATENTS file.

After getting confirmation that the updates to these core files look good, we'll
propagate this new license header to all files (in this same PR) and get sign-off
from all parties before landing.
Copy link
Member

@Adlai-Holler Adlai-Holler left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

WOW I have been waiting for this diff for so long!! I know we all have. It's even more beautiful than I'd imagined 💖

@Adlai-Holler
Copy link
Member

Good branch name 😁

Copy link
Contributor

@maicki maicki left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is huge ❤️

Copy link
Member

@nguyenhuy nguyenhuy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😱 ❤️

@JoelMarcey
Copy link

I am just clarifying a couple more things, but we are close to being able to merge this.

Copy link

@JoelMarcey JoelMarcey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are a few more updates that will need to be made to the license headers. We are starting to clarify those changes now.

@ghost
Copy link

ghost commented Aug 23, 2018

1 Warning
⚠️ This is a big PR, please consider splitting it up to ease code review.

Generated by 🚫 Danger

@ghost
Copy link

ghost commented Aug 23, 2018

🚫 CI failed with log

@TextureGroup TextureGroup deleted a comment from nguyenhuy Aug 23, 2018
Copy link

@JoelMarcey JoelMarcey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is good to go from our end now!

ship it at your convenience

@maicki
Copy link
Contributor

maicki commented Aug 28, 2018

@JoelMarcey Thanks for letting us know - will merge now.

@maicki maicki merged commit 465abb1 into master Aug 28, 2018
@Adlai-Holler Adlai-Holler deleted the FreeAsInSpeech branch September 12, 2018 19:13
mikezucc pushed a commit to mikezucc/Texture that referenced this pull request Oct 2, 2018
…ASDK-Licenses). (TextureGroup#1077)

* [License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses)

With permission of the Facebook Open Source team, we are simplifying the Texture
license so that clients can rely on the Apache 2 terms that most of Texture is
already covered by. This means that code originally forked from AsyncDisplayKit
will be re-licensed from "BSD 3-clause + PATENTS v2" to Apache 2 without a
PATENTS file.

After getting confirmation that the updates to these core files look good, we'll
propagate this new license header to all files (in this same PR) and get sign-off
from all parties before landing.

* [License] Update all Texture source files to be pure Apache 2.

* Changelog entry for Apache 2 license update.

* Revert "[License] Update all Texture source files to be pure Apache 2."

This reverts commit ffa0fbb.

* [License] Update all Texture source files to be pure Apache 2, maintaining copyrights.

* [License] Update CONTRIBUTING, README, Podspec & Dangerfile.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants