Skip to content

Commit

Permalink
[License] Simplify the Texture license to be pure Apache 2 (removing …
Browse files Browse the repository at this point in the history
…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.
  • Loading branch information
appleguy committed Aug 21, 2018
1 parent 5f912d1 commit 4467acb
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 95 deletions.
30 changes: 0 additions & 30 deletions ASDK-Licenses/LICENSE

This file was deleted.

33 changes: 0 additions & 33 deletions ASDK-Licenses/PATENTS

This file was deleted.

22 changes: 1 addition & 21 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
```objc
//
// ASDisplayNode.mm
Expand All @@ -96,26 +96,6 @@ Copy and paste this to the top of your new file(s):
//
```

If you’ve modified an existing file, change the header to:
```objc
//
// ASDisplayNode.mm
// Texture
//
// 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 /ASDK-Licenses directory of this source tree. An additional
// grant of patent rights can be found in the PATENTS file in the same directory.
//
// Modifications to this file made after 4/13/2017 are: Copyright (c) 2017-present,
// Pinterest, Inc. Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
```

# Semantic Versioning

Texture follows semantic versioning. We release patch versions for bug fixes, minor versions for new features (and rarely, clear and easy to fix breaking changes), and major versions for any major breaking changes. When we make breaking changes, we also introduce deprecation warnings in a minor version so that our users learn about the upcoming changes and migrate their code in advance.
Expand Down
14 changes: 4 additions & 10 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
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 /ASDK-Licenses directory
of this source tree for reference.
The Texture project was created by Pinterest as a continuation, under a different
name and license, of the AsyncDisplayKit codebase originally developed by Facebook.

All code contributed to Texture after 4/13/2017 is released by Pinterest under
the Apache License, Version 2.0.
All code in Texture is covered by the Apache License, Version 2.0.

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -184,4 +178,4 @@ Apache License
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS
END OF TERMS AND CONDITIONS
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 [LICENSE](https://github.com/texturegroup/texture/blob/master/LICENSE.md) (Apache 2.0).

0 comments on commit 4467acb

Please sign in to comment.