Skip to content

Commit 1e07785

Browse files
allevatoallevato
authored
Merge pull request swiftlang#140 from google/licenses
Update licenses to match the rest of the Swift project.
2 parents 7b9a92d + 074b156 commit 1e07785

File tree

127 files changed

+661
-934
lines changed

Some content is hidden

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

127 files changed

+661
-934
lines changed

‎CONTRIBUTORS.txt

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

‎Scripts/format-diff.sh

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
#!/usr/bin/env bash
22
#===----------------------------------------------------------------------===#
33
#
4-
# This source file is part of the Swift Formatter open source project.
4+
# This source file is part of the Swift.org open source project
55
#
6-
# Copyright (c) 2018 Apple Inc. and the Swift Formatter project authors
7-
# Licensed under Apache License v2.0
6+
# Copyright (c) 2014 - 2018 Apple Inc. and the Swift project authors
7+
# Licensed under Apache License v2.0 with Runtime Library Exception
88
#
9-
# See LICENSE.txt for license information
10-
# See CONTRIBUTORS.txt for the list of Swift Formatter project authors
11-
#
12-
# SPDX-License-Identifier: Apache-2.0
9+
# See https://swift.org/LICENSE.txt for license information
10+
# See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
1311
#
1412
#===----------------------------------------------------------------------===#
1513

‎Sources/CCommonMark/include/cmark_export.h

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
//===----------------------------------------------------------------------===//
22
//
3-
// This source file is part of the Swift Formatter open source project.
3+
// This source file is part of the Swift.org open source project
44
//
5-
// Copyright (c) 2018 Apple Inc. and the Swift Formatter project authors
6-
// Licensed under Apache License v2.0
5+
// Copyright (c) 2014 - 2018 Apple Inc. and the Swift project authors
6+
// Licensed under Apache License v2.0 with Runtime Library Exception
77
//
8-
// See LICENSE.txt for license information
9-
// See CONTRIBUTORS.txt for the list of Swift Formatter project authors
10-
//
11-
// SPDX-License-Identifier: Apache-2.0
8+
// See https://swift.org/LICENSE.txt for license information
9+
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
1210
//
1311
//===----------------------------------------------------------------------===//
1412

‎Sources/CCommonMark/include/cmark_version.h

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
//===----------------------------------------------------------------------===//
22
//
3-
// This source file is part of the Swift Formatter open source project.
3+
// This source file is part of the Swift.org open source project
44
//
5-
// Copyright (c) 2018 Apple Inc. and the Swift Formatter project authors
6-
// Licensed under Apache License v2.0
5+
// Copyright (c) 2014 - 2018 Apple Inc. and the Swift project authors
6+
// Licensed under Apache License v2.0 with Runtime Library Exception
77
//
8-
// See LICENSE.txt for license information
9-
// See CONTRIBUTORS.txt for the list of Swift Formatter project authors
10-
//
11-
// SPDX-License-Identifier: Apache-2.0
8+
// See https://swift.org/LICENSE.txt for license information
9+
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
1210
//
1311
//===----------------------------------------------------------------------===//
1412

‎Sources/CCommonMark/include/config.h

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
//===----------------------------------------------------------------------===//
22
//
3-
// This source file is part of the Swift Formatter open source project.
3+
// This source file is part of the Swift.org open source project
44
//
5-
// Copyright (c) 2018 Apple Inc. and the Swift Formatter project authors
6-
// Licensed under Apache License v2.0
5+
// Copyright (c) 2014 - 2018 Apple Inc. and the Swift project authors
6+
// Licensed under Apache License v2.0 with Runtime Library Exception
77
//
8-
// See LICENSE.txt for license information
9-
// See CONTRIBUTORS.txt for the list of Swift Formatter project authors
10-
//
11-
// SPDX-License-Identifier: Apache-2.0
8+
// See https://swift.org/LICENSE.txt for license information
9+
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
1210
//
1311
//===----------------------------------------------------------------------===//
1412

‎Sources/CommonMark/BlockContent.swift

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
//===----------------------------------------------------------------------===//
22
//
3-
// This source file is part of the Swift Formatter open source project.
3+
// This source file is part of the Swift.org open source project
44
//
5-
// Copyright (c) 2018 Apple Inc. and the Swift Formatter project authors
6-
// Licensed under Apache License v2.0
5+
// Copyright (c) 2014 - 2018 Apple Inc. and the Swift project authors
6+
// Licensed under Apache License v2.0 with Runtime Library Exception
77
//
8-
// See LICENSE.txt for license information
9-
// See CONTRIBUTORS.txt for the list of Swift Formatter project authors
10-
//
11-
// SPDX-License-Identifier: Apache-2.0
8+
// See https://swift.org/LICENSE.txt for license information
9+
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
1210
//
1311
//===----------------------------------------------------------------------===//
1412

‎Sources/CommonMark/BlockQuoteNode.swift

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
//===----------------------------------------------------------------------===//
22
//
3-
// This source file is part of the Swift Formatter open source project.
3+
// This source file is part of the Swift.org open source project
44
//
5-
// Copyright (c) 2018 Apple Inc. and the Swift Formatter project authors
6-
// Licensed under Apache License v2.0
5+
// Copyright (c) 2014 - 2018 Apple Inc. and the Swift project authors
6+
// Licensed under Apache License v2.0 with Runtime Library Exception
77
//
8-
// See LICENSE.txt for license information
9-
// See CONTRIBUTORS.txt for the list of Swift Formatter project authors
10-
//
11-
// SPDX-License-Identifier: Apache-2.0
8+
// See https://swift.org/LICENSE.txt for license information
9+
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
1210
//
1311
//===----------------------------------------------------------------------===//
1412

‎Sources/CommonMark/CMarkInterop.swift

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
//===----------------------------------------------------------------------===//
22
//
3-
// This source file is part of the Swift Formatter open source project.
3+
// This source file is part of the Swift.org open source project
44
//
5-
// Copyright (c) 2018 Apple Inc. and the Swift Formatter project authors
6-
// Licensed under Apache License v2.0
5+
// Copyright (c) 2014 - 2018 Apple Inc. and the Swift project authors
6+
// Licensed under Apache License v2.0 with Runtime Library Exception
77
//
8-
// See LICENSE.txt for license information
9-
// See CONTRIBUTORS.txt for the list of Swift Formatter project authors
10-
//
11-
// SPDX-License-Identifier: Apache-2.0
8+
// See https://swift.org/LICENSE.txt for license information
9+
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
1210
//
1311
//===----------------------------------------------------------------------===//
1412

‎Sources/CommonMark/CodeBlockNode.swift

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
//===----------------------------------------------------------------------===//
22
//
3-
// This source file is part of the Swift Formatter open source project.
3+
// This source file is part of the Swift.org open source project
44
//
5-
// Copyright (c) 2018 Apple Inc. and the Swift Formatter project authors
6-
// Licensed under Apache License v2.0
5+
// Copyright (c) 2014 - 2018 Apple Inc. and the Swift project authors
6+
// Licensed under Apache License v2.0 with Runtime Library Exception
77
//
8-
// See LICENSE.txt for license information
9-
// See CONTRIBUTORS.txt for the list of Swift Formatter project authors
10-
//
11-
// SPDX-License-Identifier: Apache-2.0
8+
// See https://swift.org/LICENSE.txt for license information
9+
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
1210
//
1311
//===----------------------------------------------------------------------===//
1412

‎Sources/CommonMark/EmphasisNode.swift

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
//===----------------------------------------------------------------------===//
22
//
3-
// This source file is part of the Swift Formatter open source project.
3+
// This source file is part of the Swift.org open source project
44
//
5-
// Copyright (c) 2018 Apple Inc. and the Swift Formatter project authors
6-
// Licensed under Apache License v2.0
5+
// Copyright (c) 2014 - 2018 Apple Inc. and the Swift project authors
6+
// Licensed under Apache License v2.0 with Runtime Library Exception
77
//
8-
// See LICENSE.txt for license information
9-
// See CONTRIBUTORS.txt for the list of Swift Formatter project authors
10-
//
11-
// SPDX-License-Identifier: Apache-2.0
8+
// See https://swift.org/LICENSE.txt for license information
9+
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
1210
//
1311
//===----------------------------------------------------------------------===//
1412

0 commit comments

Comments
 (0)