Skip to content

Commit 465abb1

Browse files
appleguymaicki
appleguy
authored and
maicki
committed
[License] Simplify the Texture license to be pure Apache 2 (removing 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.
1 parent 1d31fc2 commit 465abb1

920 files changed

Lines changed: 3001 additions & 9534 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎ASDK-Licenses/LICENSE‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎ASDK-Licenses/PATENTS‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
## master
22
* Add your own contributions to the next release on the line below this with your name.
3+
- [License] Simplify the Texture license to be pure Apache 2 (removing ASDK-Licenses).[Scott Goodson](https://github.com/appleguy) [#1077](https://github.com/TextureGroup/Texture/pull/1077)
34
- [ASNetworkImageNode] Allow delegate methods to be called on background thread. [Max Wang](https://github.com/wsdwsd0829). [#1007](https://github.com/TextureGroup/Texture/pull/1007)
45
- [ASLayoutTransition] Add support for preserving order after node moves during transitions. (This order defines the z-order as well.) [Kevin Smith](https://github.com/wiseoldduck) [#1006]
56
- [ASDisplayNode] Adds support for multiple interface state delegates. [Garrett Moon](https://github.com/garrettmoon) [#979](https://github.com/TextureGroup/Texture/pull/979)

‎CONTRIBUTING.md‎

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,8 @@ Copy and paste this to the top of your new file(s):
8787
// ASDisplayNode.mm
8888
// Texture
8989
//
90-
// Copyright (c) 2017-present, Pinterest, Inc. All rights reserved.
91-
// Licensed under the Apache License, Version 2.0 (the "License");
92-
// you may not use this file except in compliance with the License.
93-
// You may obtain a copy of the License at
94-
//
95-
// http://www.apache.org/licenses/LICENSE-2.0
90+
// Copyright (c) Pinterest, Inc. All rights reserved.
91+
// Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
9692
//
9793
```
9894

@@ -102,17 +98,9 @@ If you’ve modified an existing file, change the header to:
10298
// ASDisplayNode.mm
10399
// Texture
104100
//
105-
// Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
106-
// This source code is licensed under the BSD-style license found in the
107-
// LICENSE file in the /ASDK-Licenses directory of this source tree. An additional
108-
// grant of patent rights can be found in the PATENTS file in the same directory.
109-
//
110-
// Modifications to this file made after 4/13/2017 are: Copyright (c) 2017-present,
111-
// Pinterest, Inc. Licensed under the Apache License, Version 2.0 (the "License");
112-
// you may not use this file except in compliance with the License.
113-
// You may obtain a copy of the License at
114-
//
115-
// http://www.apache.org/licenses/LICENSE-2.0
101+
// Copyright (c) Facebook, Inc. and its affiliates. All rights reserved.
102+
// Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc. All rights reserved.
103+
// Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
116104
//
117105
```
118106

‎Dangerfile‎

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,8 @@ end
6969

7070
# Ensure new files have proper header
7171
new_source_license_header = <<-HEREDOC
72-
// Copyright (c) 2018-present, Pinterest, Inc. All rights reserved.
73-
// Licensed under the Apache License, Version 2.0 (the "License");
74-
// you may not use this file except in compliance with the License.
75-
// You may obtain a copy of the License at
76-
//
77-
// http://www.apache.org/licenses/LICENSE-2.0
78-
//
72+
// Copyright (c) Pinterest, Inc. All rights reserved.
73+
// Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
7974
HEREDOC
8075

8176
if has_added_source_files
@@ -84,20 +79,11 @@ end
8479

8580
# Ensure modified files have proper header
8681
modified_source_license_header = <<-HEREDOC
87-
// Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
88-
// This source code is licensed under the BSD-style license found in the
89-
// LICENSE file in the /ASDK-Licenses directory of this source tree. An additional
90-
// grant of patent rights can be found in the PATENTS file in the same directory.
91-
//
92-
// Modifications to this file made after 4/13/2017 are: Copyright (c) through the present,
93-
// Pinterest, Inc. Licensed under the Apache License, Version 2.0 (the "License");
94-
// you may not use this file except in compliance with the License.
95-
// You may obtain a copy of the License at
96-
//
97-
// http://www.apache.org/licenses/LICENSE-2.0
98-
//
82+
// Copyright (c) Facebook, Inc. and its affiliates. All rights reserved.
83+
// Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc. All rights reserved.
84+
// Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
9985
HEREDOC
10086

10187
if has_modified_source_files
10288
check_file_header(modified_source_files, [modified_source_license_header, new_source_license_header])
103-
end
89+
end

‎LICENSE‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
1-
The Texture project was created by Pinterest as a continuation, under a
2-
different name and license, of the AsyncDisplayKit codebase originally developed
3-
by Facebook. AsyncDisplayKit was originally released by Facebook under a BSD
4-
license and additional patent grant. Those BSD and patent licenses govern use
5-
of code in Texture contributed prior to 4/13/2017 (the original AsyncDisplayKit
6-
code), and copies of the licenses are included in the /ASDK-Licenses directory
7-
of this source tree for reference.
1+
The Texture project was created by Pinterest as a continuation, under a different
2+
name and license, of the AsyncDisplayKit codebase originally developed by Facebook.
83

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

126
Apache License
137
Version 2.0, January 2004
@@ -184,4 +178,4 @@ Apache License
184178
incurred by, or claims asserted against, such Contributor by reason
185179
of your accepting any such warranty or additional liability.
186180

187-
END OF TERMS AND CONDITIONS
181+
END OF TERMS AND CONDITIONS

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,4 @@ We welcome any contributions. See the [CONTRIBUTING](https://github.com/textureg
4444

4545
## License
4646

47-
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.
47+
The Texture project is available for free use, as described by the [LICENSE](https://github.com/texturegroup/texture/blob/master/LICENSE) (Apache 2.0).

‎Source/ASBlockTypes.h‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,9 @@
22
// ASBlockTypes.h
33
// Texture
44
//
5-
// Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
6-
// This source code is licensed under the BSD-style license found in the
7-
// LICENSE file in the /ASDK-Licenses directory of this source tree. An additional
8-
// grant of patent rights can be found in the PATENTS file in the same directory.
9-
//
10-
// Modifications to this file made after 4/13/2017 are: Copyright (c) 2017-present,
11-
// Pinterest, Inc. Licensed under the Apache License, Version 2.0 (the "License");
12-
// you may not use this file except in compliance with the License.
13-
// You may obtain a copy of the License at
14-
//
15-
// http://www.apache.org/licenses/LICENSE-2.0
5+
// Copyright (c) Facebook, Inc. and its affiliates. All rights reserved.
6+
// Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc. All rights reserved.
7+
// Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
168
//
179

1810
#import <Foundation/Foundation.h>

‎Source/ASButtonNode.h‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,9 @@
22
// ASButtonNode.h
33
// Texture
44
//
5-
// Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
6-
// This source code is licensed under the BSD-style license found in the
7-
// LICENSE file in the /ASDK-Licenses directory of this source tree. An additional
8-
// grant of patent rights can be found in the PATENTS file in the same directory.
9-
//
10-
// Modifications to this file made after 4/13/2017 are: Copyright (c) 2017-present,
11-
// Pinterest, Inc. Licensed under the Apache License, Version 2.0 (the "License");
12-
// you may not use this file except in compliance with the License.
13-
// You may obtain a copy of the License at
14-
//
15-
// http://www.apache.org/licenses/LICENSE-2.0
5+
// Copyright (c) Facebook, Inc. and its affiliates. All rights reserved.
6+
// Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc. All rights reserved.
7+
// Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
168
//
179

1810
#import <AsyncDisplayKit/ASControlNode.h>

‎Source/ASButtonNode.mm‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,9 @@
22
// ASButtonNode.mm
33
// Texture
44
//
5-
// Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
6-
// This source code is licensed under the BSD-style license found in the
7-
// LICENSE file in the /ASDK-Licenses directory of this source tree. An additional
8-
// grant of patent rights can be found in the PATENTS file in the same directory.
9-
//
10-
// Modifications to this file made after 4/13/2017 are: Copyright (c) 2017-present,
11-
// Pinterest, Inc. Licensed under the Apache License, Version 2.0 (the "License");
12-
// you may not use this file except in compliance with the License.
13-
// You may obtain a copy of the License at
14-
//
15-
// http://www.apache.org/licenses/LICENSE-2.0
5+
// Copyright (c) Facebook, Inc. and its affiliates. All rights reserved.
6+
// Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc. All rights reserved.
7+
// Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
168
//
179

1810
#import <AsyncDisplayKit/ASButtonNode.h>

0 commit comments

Comments
 (0)