From a3d4041190101b33d7efb69d9217d1b3c3cfd8f2 Mon Sep 17 00:00:00 2001 From: Tom Lee Date: Thu, 5 Jan 2023 11:53:16 -0500 Subject: [PATCH 1/2] update license file & generator script --- LICENSE.md | 6 ++---- scripts/generate-license.py | 8 +++++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index a35dd57198a..49e55bb581a 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -3,11 +3,9 @@ Mapbox Navigation for Android version 2.0 Mapbox Navigation Android SDK -Copyright ©2022 Mapbox +Copyright ©2022 - 2023 Mapbox, Inc. All rights reserved. -All rights reserved. - -Mapbox Navigation for Android version 2.0 (“Mapbox Navigation Android SDK“) or higher must be used according to the Mapbox Terms of Service. This license allows developers with a current active Mapbox account to use and modify the Mapbox Navigation Android SDK. Developers may modify the Mapbox Navigation Android SDK code so long as the modifications do not change or interfere with marked portions of the code related to billing, accounting, and data collection. The Mapbox Navigation Android SDK sends limited de-identified location and usage data, which Mapbox uses in accordance with the Mapbox Data Processing Addendum. This license terminates automatically if a user no longer has an active Mapbox account. +The software and files in this repository (collectively, "Software") are licensed under the Mapbox TOS for use only with the relevant Mapbox product(s) listed at www.mapbox.com/pricing. This license allows developers with a current active Mapbox account to use and modify the authorized portions of the Software as needed for use only with the relevant Mapbox product(s) through their Mapbox account in accordance with the Mapbox TOS. This license terminates automatically if a developer no longer has a Mapbox account in good standing or breaches the Mapbox TOS. For the license terms, please see the Mapbox TOS at https://www.mapbox.com/legal/tos/ which incorporates the Mapbox Product Terms at www.mapbox.com/legal/service-terms. If this Software is a SDK, modifications that change or interfere with marked portions of the code related to billing, accounting, or data collection are not authorized and the SDK sends limited de-identified location and usage data which is used in accordance with the Mapbox TOS. [Updated 2023-01] For the full license terms, please see the Mapbox Terms of Service at https://www.mapbox.com/legal/tos/ diff --git a/scripts/generate-license.py b/scripts/generate-license.py index 9580a5417cd..226b2a7c5c9 100644 --- a/scripts/generate-license.py +++ b/scripts/generate-license.py @@ -3,6 +3,7 @@ import os import json +import datetime import codecs path = os.getcwd() @@ -67,12 +68,13 @@ def writeToFile(file, filePath) : ] with codecs.open(licensePath, 'w', encoding='utf-8') as licenseFile: + now = datetime.datetime.now() + licenseFile.write("### License\n") licenseFile.write("Mapbox Navigation for Android version 2.0\n\n") licenseFile.write("Mapbox Navigation Android SDK\n\n") - licenseFile.write("Copyright " + u'©' + "2022 Mapbox\n\n") - licenseFile.write("All rights reserved.\n\n") - licenseFile.write("Mapbox Navigation for Android version 2.0 (" + u"“" + "Mapbox Navigation Android SDK" + u"“" + ") or higher must be used according to the Mapbox Terms of Service. This license allows developers with a current active Mapbox account to use and modify the Mapbox Navigation Android SDK. Developers may modify the Mapbox Navigation Android SDK code so long as the modifications do not change or interfere with marked portions of the code related to billing, accounting, and data collection. The Mapbox Navigation Android SDK sends limited de-identified location and usage data, which Mapbox uses in accordance with the Mapbox Data Processing Addendum. This license terminates automatically if a user no longer has an active Mapbox account.\n\n") + licenseFile.write("Copyright " + u'©' + "2022 - {} Mapbox, Inc. All rights reserved.\n\n".format(now.year)) + licenseFile.write("The software and files in this repository (collectively, \"Software\") are licensed under the Mapbox TOS for use only with the relevant Mapbox product(s) listed at www.mapbox.com/pricing. This license allows developers with a current active Mapbox account to use and modify the authorized portions of the Software as needed for use only with the relevant Mapbox product(s) through their Mapbox account in accordance with the Mapbox TOS. This license terminates automatically if a developer no longer has a Mapbox account in good standing or breaches the Mapbox TOS. For the license terms, please see the Mapbox TOS at https://www.mapbox.com/legal/tos/ which incorporates the Mapbox Product Terms at www.mapbox.com/legal/service-terms. If this Software is a SDK, modifications that change or interfere with marked portions of the code related to billing, accounting, or data collection are not authorized and the SDK sends limited de-identified location and usage data which is used in accordance with the Mapbox TOS. [Updated {}-{:02d}]\n\n".format(now.year, now.month)) licenseFile.write("For the full license terms, please see the Mapbox Terms of Service at https://www.mapbox.com/legal/tos/\n\n") licenseFile.write("---------------------------------------\n") [licenseFile.write(l.text()) for l in staticLicenses] From d64792d9dce5e938fe1d3aa53e03183d249952aa Mon Sep 17 00:00:00 2001 From: Tom Lee Date: Thu, 5 Jan 2023 11:57:46 -0500 Subject: [PATCH 2/2] remove duplicate text --- LICENSE.md | 2 -- scripts/generate-license.py | 1 - 2 files changed, 3 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index 49e55bb581a..c7edbcac4b6 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -7,8 +7,6 @@ Copyright ©2022 - 2023 Mapbox, Inc. All rights reserved. The software and files in this repository (collectively, "Software") are licensed under the Mapbox TOS for use only with the relevant Mapbox product(s) listed at www.mapbox.com/pricing. This license allows developers with a current active Mapbox account to use and modify the authorized portions of the Software as needed for use only with the relevant Mapbox product(s) through their Mapbox account in accordance with the Mapbox TOS. This license terminates automatically if a developer no longer has a Mapbox account in good standing or breaches the Mapbox TOS. For the license terms, please see the Mapbox TOS at https://www.mapbox.com/legal/tos/ which incorporates the Mapbox Product Terms at www.mapbox.com/legal/service-terms. If this Software is a SDK, modifications that change or interfere with marked portions of the code related to billing, accounting, or data collection are not authorized and the SDK sends limited de-identified location and usage data which is used in accordance with the Mapbox TOS. [Updated 2023-01] -For the full license terms, please see the Mapbox Terms of Service at https://www.mapbox.com/legal/tos/ - --------------------------------------- Mapbox Navigation uses portions of the Gradle License Plugin. URL: [https://github.com/jaredsburrows/gradle-license-plugin](https://github.com/jaredsburrows/gradle-license-plugin) diff --git a/scripts/generate-license.py b/scripts/generate-license.py index 226b2a7c5c9..b33b61eef1b 100644 --- a/scripts/generate-license.py +++ b/scripts/generate-license.py @@ -75,7 +75,6 @@ def writeToFile(file, filePath) : licenseFile.write("Mapbox Navigation Android SDK\n\n") licenseFile.write("Copyright " + u'©' + "2022 - {} Mapbox, Inc. All rights reserved.\n\n".format(now.year)) licenseFile.write("The software and files in this repository (collectively, \"Software\") are licensed under the Mapbox TOS for use only with the relevant Mapbox product(s) listed at www.mapbox.com/pricing. This license allows developers with a current active Mapbox account to use and modify the authorized portions of the Software as needed for use only with the relevant Mapbox product(s) through their Mapbox account in accordance with the Mapbox TOS. This license terminates automatically if a developer no longer has a Mapbox account in good standing or breaches the Mapbox TOS. For the license terms, please see the Mapbox TOS at https://www.mapbox.com/legal/tos/ which incorporates the Mapbox Product Terms at www.mapbox.com/legal/service-terms. If this Software is a SDK, modifications that change or interfere with marked portions of the code related to billing, accounting, or data collection are not authorized and the SDK sends limited de-identified location and usage data which is used in accordance with the Mapbox TOS. [Updated {}-{:02d}]\n\n".format(now.year, now.month)) - licenseFile.write("For the full license terms, please see the Mapbox Terms of Service at https://www.mapbox.com/legal/tos/\n\n") licenseFile.write("---------------------------------------\n") [licenseFile.write(l.text()) for l in staticLicenses]