From c2c9cb28b2cfe32e3cac38d7fb4557ca2a6c32db Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Tue, 12 Mar 2024 11:39:22 +0100 Subject: [PATCH 1/2] Add SPDX header to material implementation classes ...to remove duplicated deprecation warning from reuse linter Signed-off-by: Andy Scherzinger --- .reuse/dep5 | 6 +---- gradlew | 3 +++ gradlew.bat | 23 +++++++++++-------- material-color-utilities/.gitignore | 3 +++ material-color-utilities/README.txt | 3 +++ .../src/main/java/blend/Blend.java | 4 ++++ .../src/main/java/contrast/Contrast.java | 6 ++++- .../main/java/dislike/DislikeAnalyzer.java | 6 ++++- .../main/java/dynamiccolor/ContrastCurve.java | 6 ++++- .../main/java/dynamiccolor/DynamicColor.java | 4 ++++ .../dynamiccolor/MaterialDynamicColors.java | 6 ++++- .../main/java/dynamiccolor/ToneDeltaPair.java | 4 ++++ .../main/java/dynamiccolor/TonePolarity.java | 4 ++++ .../src/main/java/hct/Cam16.java | 4 ++++ .../src/main/java/hct/Hct.java | 4 ++++ .../src/main/java/hct/HctSolver.java | 4 ++++ .../src/main/java/hct/ViewingConditions.java | 4 ++++ .../src/main/java/palettes/CorePalette.java | 4 ++++ .../src/main/java/palettes/TonalPalette.java | 4 ++++ .../src/main/java/quantize/PointProvider.java | 4 ++++ .../main/java/quantize/PointProviderLab.java | 4 ++++ .../src/main/java/quantize/Quantizer.java | 4 ++++ .../main/java/quantize/QuantizerCelebi.java | 4 ++++ .../src/main/java/quantize/QuantizerMap.java | 4 ++++ .../main/java/quantize/QuantizerResult.java | 4 ++++ .../main/java/quantize/QuantizerWsmeans.java | 4 ++++ .../src/main/java/quantize/QuantizerWu.java | 4 ++++ .../src/main/java/scheme/DynamicScheme.java | 4 ++++ .../src/main/java/scheme/Scheme.java | 4 ++++ .../src/main/java/scheme/SchemeContent.java | 4 ++++ .../main/java/scheme/SchemeExpressive.java | 4 ++++ .../src/main/java/scheme/SchemeFidelity.java | 6 ++++- .../main/java/scheme/SchemeFruitSalad.java | 4 ++++ .../main/java/scheme/SchemeMonochrome.java | 4 ++++ .../src/main/java/scheme/SchemeNeutral.java | 6 ++++- .../src/main/java/scheme/SchemeRainbow.java | 6 ++++- .../src/main/java/scheme/SchemeTonalSpot.java | 6 ++++- .../src/main/java/scheme/SchemeVibrant.java | 6 ++++- .../src/main/java/scheme/Variant.java | 6 ++++- .../src/main/java/score/Score.java | 4 ++++ .../java/temperature/TemperatureCache.java | 6 ++++- .../src/main/java/utils/ColorUtils.java | 4 ++++ .../src/main/java/utils/MathUtils.java | 4 ++++ .../src/main/java/utils/StringUtils.java | 4 ++++ 44 files changed, 190 insertions(+), 26 deletions(-) diff --git a/.reuse/dep5 b/.reuse/dep5 index 01573f26..6136cff6 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -3,14 +3,10 @@ Upstream-Name: android-common Upstream-Contact: Nextcloud Android team Source: https://github.com/nextcloud/android-common -Files: material-color-utilities/* -Copyright: 2022 Google LLC -License: Apache-2.0 - Files: gradlew gradlew.bat gradle/wrapper/gradle-wrapper.jar Copyright: 2015-2021 the original authors License: Apache-2.0 -Files: gradle/verification-keyring.keys gradle/verification-metadata.xml renovate.json5 */.gitignore .idea/* +Files: gradle/verification-keyring.keys gradle/verification-metadata.xml renovate.json5 */.gitignore .idea/codeStyles/* .idea/copyright/profiles_settings.xml Copyright: none License: MIT \ No newline at end of file diff --git a/gradlew b/gradlew index 1aa94a42..2fb10bd5 100755 --- a/gradlew +++ b/gradlew @@ -1,5 +1,8 @@ #!/bin/sh +# +# SPDX-FileCopyrightText: 2015-2021 the original author or authors. +# SPDX-License-Identifier: Apache-2.0 # # Copyright © 2015-2021 the original authors. # diff --git a/gradlew.bat b/gradlew.bat index 6689b85b..517b1dc4 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,4 +1,7 @@ @rem +@rem SPDX-FileCopyrightText: 2015 the original author or authors. +@rem SPDX-License-Identifier: Apache-2.0 +@rem @rem Copyright 2015 the original author or authors. @rem @rem Licensed under the Apache License, Version 2.0 (the "License"); @@ -43,11 +46,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +60,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/material-color-utilities/.gitignore b/material-color-utilities/.gitignore index 42afabfd..2c643038 100644 --- a/material-color-utilities/.gitignore +++ b/material-color-utilities/.gitignore @@ -1 +1,4 @@ +# SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors +# SPDX-License-Identifier: MIT + /build \ No newline at end of file diff --git a/material-color-utilities/README.txt b/material-color-utilities/README.txt index c010135d..ee38a3c8 100644 --- a/material-color-utilities/README.txt +++ b/material-color-utilities/README.txt @@ -1,2 +1,5 @@ +SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors +SPDX-License-Identifier: MIT + Imported from https://github.com/material-foundation/material-color-utilities with license APACHE-2.0,to be substituted with a Gradle dependency when they publish it. diff --git a/material-color-utilities/src/main/java/blend/Blend.java b/material-color-utilities/src/main/java/blend/Blend.java index 545e2ff1..17a0fdc1 100644 --- a/material-color-utilities/src/main/java/blend/Blend.java +++ b/material-color-utilities/src/main/java/blend/Blend.java @@ -1,3 +1,7 @@ +/* + * SPDX-FileCopyrightText: 2021 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ /* * Copyright 2021 Google LLC * diff --git a/material-color-utilities/src/main/java/contrast/Contrast.java b/material-color-utilities/src/main/java/contrast/Contrast.java index 29cf0768..d43e5fd7 100644 --- a/material-color-utilities/src/main/java/contrast/Contrast.java +++ b/material-color-utilities/src/main/java/contrast/Contrast.java @@ -1,5 +1,9 @@ /* - * Copyright 2022 Google LLC + * SPDX-FileCopyrightText: 2021 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ +/* + * Copyright 2021 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/material-color-utilities/src/main/java/dislike/DislikeAnalyzer.java b/material-color-utilities/src/main/java/dislike/DislikeAnalyzer.java index 96d0578d..e644b3cd 100644 --- a/material-color-utilities/src/main/java/dislike/DislikeAnalyzer.java +++ b/material-color-utilities/src/main/java/dislike/DislikeAnalyzer.java @@ -1,5 +1,9 @@ /* - * Copyright 2022 Google LLC + * SPDX-FileCopyrightText: 2021 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ +/* + * Copyright 2021 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/material-color-utilities/src/main/java/dynamiccolor/ContrastCurve.java b/material-color-utilities/src/main/java/dynamiccolor/ContrastCurve.java index 42a8813e..ff7bcdd0 100644 --- a/material-color-utilities/src/main/java/dynamiccolor/ContrastCurve.java +++ b/material-color-utilities/src/main/java/dynamiccolor/ContrastCurve.java @@ -1,5 +1,9 @@ /* - * Copyright 2023 Google LLC + * SPDX-FileCopyrightText: 2021 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ +/* + * Copyright 2021 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/material-color-utilities/src/main/java/dynamiccolor/DynamicColor.java b/material-color-utilities/src/main/java/dynamiccolor/DynamicColor.java index fbd6ce19..b2eae782 100644 --- a/material-color-utilities/src/main/java/dynamiccolor/DynamicColor.java +++ b/material-color-utilities/src/main/java/dynamiccolor/DynamicColor.java @@ -1,3 +1,7 @@ +/* + * SPDX-FileCopyrightText: 2022 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ /* * Copyright 2022 Google LLC * diff --git a/material-color-utilities/src/main/java/dynamiccolor/MaterialDynamicColors.java b/material-color-utilities/src/main/java/dynamiccolor/MaterialDynamicColors.java index 6ad409cb..5fbf001a 100644 --- a/material-color-utilities/src/main/java/dynamiccolor/MaterialDynamicColors.java +++ b/material-color-utilities/src/main/java/dynamiccolor/MaterialDynamicColors.java @@ -1,5 +1,9 @@ /* - * Copyright 2023 Google LLC + * SPDX-FileCopyrightText: 2021 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ +/* + * Copyright 2021 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/material-color-utilities/src/main/java/dynamiccolor/ToneDeltaPair.java b/material-color-utilities/src/main/java/dynamiccolor/ToneDeltaPair.java index d5040b74..cbb83fa3 100644 --- a/material-color-utilities/src/main/java/dynamiccolor/ToneDeltaPair.java +++ b/material-color-utilities/src/main/java/dynamiccolor/ToneDeltaPair.java @@ -1,3 +1,7 @@ +/* + * SPDX-FileCopyrightText: 2023 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ /* * Copyright 2023 Google LLC * diff --git a/material-color-utilities/src/main/java/dynamiccolor/TonePolarity.java b/material-color-utilities/src/main/java/dynamiccolor/TonePolarity.java index f9e92d3a..e71af79a 100644 --- a/material-color-utilities/src/main/java/dynamiccolor/TonePolarity.java +++ b/material-color-utilities/src/main/java/dynamiccolor/TonePolarity.java @@ -1,3 +1,7 @@ +/* + * SPDX-FileCopyrightText: 2022 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ /* * Copyright 2022 Google LLC * diff --git a/material-color-utilities/src/main/java/hct/Cam16.java b/material-color-utilities/src/main/java/hct/Cam16.java index a23b0b7d..93d5852e 100644 --- a/material-color-utilities/src/main/java/hct/Cam16.java +++ b/material-color-utilities/src/main/java/hct/Cam16.java @@ -1,3 +1,7 @@ +/* + * SPDX-FileCopyrightText: 2021 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ /* * Copyright 2021 Google LLC * diff --git a/material-color-utilities/src/main/java/hct/Hct.java b/material-color-utilities/src/main/java/hct/Hct.java index 93806b9b..eb34353a 100644 --- a/material-color-utilities/src/main/java/hct/Hct.java +++ b/material-color-utilities/src/main/java/hct/Hct.java @@ -1,3 +1,7 @@ +/* + * SPDX-FileCopyrightText: 2021 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ /* * Copyright 2021 Google LLC * diff --git a/material-color-utilities/src/main/java/hct/HctSolver.java b/material-color-utilities/src/main/java/hct/HctSolver.java index 98d6bffc..dd702ce9 100644 --- a/material-color-utilities/src/main/java/hct/HctSolver.java +++ b/material-color-utilities/src/main/java/hct/HctSolver.java @@ -1,3 +1,7 @@ +/* + * SPDX-FileCopyrightText: 2021 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ /* * Copyright 2021 Google LLC * diff --git a/material-color-utilities/src/main/java/hct/ViewingConditions.java b/material-color-utilities/src/main/java/hct/ViewingConditions.java index 3e452de0..3b1a61b4 100644 --- a/material-color-utilities/src/main/java/hct/ViewingConditions.java +++ b/material-color-utilities/src/main/java/hct/ViewingConditions.java @@ -1,3 +1,7 @@ +/* + * SPDX-FileCopyrightText: 2021 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ /* * Copyright 2021 Google LLC * diff --git a/material-color-utilities/src/main/java/palettes/CorePalette.java b/material-color-utilities/src/main/java/palettes/CorePalette.java index 9a47ee79..42e5053b 100644 --- a/material-color-utilities/src/main/java/palettes/CorePalette.java +++ b/material-color-utilities/src/main/java/palettes/CorePalette.java @@ -1,3 +1,7 @@ +/* + * SPDX-FileCopyrightText: 2021 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ /* * Copyright 2021 Google LLC * diff --git a/material-color-utilities/src/main/java/palettes/TonalPalette.java b/material-color-utilities/src/main/java/palettes/TonalPalette.java index 3347c78e..a489bcc8 100644 --- a/material-color-utilities/src/main/java/palettes/TonalPalette.java +++ b/material-color-utilities/src/main/java/palettes/TonalPalette.java @@ -1,3 +1,7 @@ +/* + * SPDX-FileCopyrightText: 2021 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ /* * Copyright 2021 Google LLC * diff --git a/material-color-utilities/src/main/java/quantize/PointProvider.java b/material-color-utilities/src/main/java/quantize/PointProvider.java index 3b4df945..5d634f2c 100644 --- a/material-color-utilities/src/main/java/quantize/PointProvider.java +++ b/material-color-utilities/src/main/java/quantize/PointProvider.java @@ -1,3 +1,7 @@ +/* + * SPDX-FileCopyrightText: 2021 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ /* * Copyright 2021 Google LLC * diff --git a/material-color-utilities/src/main/java/quantize/PointProviderLab.java b/material-color-utilities/src/main/java/quantize/PointProviderLab.java index b990e691..262eb2dc 100644 --- a/material-color-utilities/src/main/java/quantize/PointProviderLab.java +++ b/material-color-utilities/src/main/java/quantize/PointProviderLab.java @@ -1,3 +1,7 @@ +/* + * SPDX-FileCopyrightText: 2021 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ /* * Copyright 2021 Google LLC * diff --git a/material-color-utilities/src/main/java/quantize/Quantizer.java b/material-color-utilities/src/main/java/quantize/Quantizer.java index ab2a0585..77e25bee 100644 --- a/material-color-utilities/src/main/java/quantize/Quantizer.java +++ b/material-color-utilities/src/main/java/quantize/Quantizer.java @@ -1,3 +1,7 @@ +/* + * SPDX-FileCopyrightText: 2021 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ /* * Copyright 2021 Google LLC * diff --git a/material-color-utilities/src/main/java/quantize/QuantizerCelebi.java b/material-color-utilities/src/main/java/quantize/QuantizerCelebi.java index d0520fe2..bbe169ed 100644 --- a/material-color-utilities/src/main/java/quantize/QuantizerCelebi.java +++ b/material-color-utilities/src/main/java/quantize/QuantizerCelebi.java @@ -1,3 +1,7 @@ +/* + * SPDX-FileCopyrightText: 2021 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ /* * Copyright 2021 Google LLC * diff --git a/material-color-utilities/src/main/java/quantize/QuantizerMap.java b/material-color-utilities/src/main/java/quantize/QuantizerMap.java index b2396ccd..ffb1faff 100644 --- a/material-color-utilities/src/main/java/quantize/QuantizerMap.java +++ b/material-color-utilities/src/main/java/quantize/QuantizerMap.java @@ -1,3 +1,7 @@ +/* + * SPDX-FileCopyrightText: 2021 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ /* * Copyright 2021 Google LLC * diff --git a/material-color-utilities/src/main/java/quantize/QuantizerResult.java b/material-color-utilities/src/main/java/quantize/QuantizerResult.java index b9f00993..136a0a97 100644 --- a/material-color-utilities/src/main/java/quantize/QuantizerResult.java +++ b/material-color-utilities/src/main/java/quantize/QuantizerResult.java @@ -1,3 +1,7 @@ +/* + * SPDX-FileCopyrightText: 2021 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ /* * Copyright 2021 Google LLC * diff --git a/material-color-utilities/src/main/java/quantize/QuantizerWsmeans.java b/material-color-utilities/src/main/java/quantize/QuantizerWsmeans.java index ce8705ab..c80b0619 100644 --- a/material-color-utilities/src/main/java/quantize/QuantizerWsmeans.java +++ b/material-color-utilities/src/main/java/quantize/QuantizerWsmeans.java @@ -1,3 +1,7 @@ +/* + * SPDX-FileCopyrightText: 2021 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ /* * Copyright 2021 Google LLC * diff --git a/material-color-utilities/src/main/java/quantize/QuantizerWu.java b/material-color-utilities/src/main/java/quantize/QuantizerWu.java index 1de4785c..27c91d7c 100644 --- a/material-color-utilities/src/main/java/quantize/QuantizerWu.java +++ b/material-color-utilities/src/main/java/quantize/QuantizerWu.java @@ -1,3 +1,7 @@ +/* + * SPDX-FileCopyrightText: 2021 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ /* * Copyright 2021 Google LLC * diff --git a/material-color-utilities/src/main/java/scheme/DynamicScheme.java b/material-color-utilities/src/main/java/scheme/DynamicScheme.java index b42c673a..2e88651b 100644 --- a/material-color-utilities/src/main/java/scheme/DynamicScheme.java +++ b/material-color-utilities/src/main/java/scheme/DynamicScheme.java @@ -1,3 +1,7 @@ +/* + * SPDX-FileCopyrightText: 2022 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ /* * Copyright 2022 Google LLC * diff --git a/material-color-utilities/src/main/java/scheme/Scheme.java b/material-color-utilities/src/main/java/scheme/Scheme.java index d3868613..ded033ef 100644 --- a/material-color-utilities/src/main/java/scheme/Scheme.java +++ b/material-color-utilities/src/main/java/scheme/Scheme.java @@ -1,3 +1,7 @@ +/* + * SPDX-FileCopyrightText: 2021 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ /* * Copyright 2021 Google LLC * diff --git a/material-color-utilities/src/main/java/scheme/SchemeContent.java b/material-color-utilities/src/main/java/scheme/SchemeContent.java index 4aaf17e4..4f4d3f0a 100644 --- a/material-color-utilities/src/main/java/scheme/SchemeContent.java +++ b/material-color-utilities/src/main/java/scheme/SchemeContent.java @@ -1,3 +1,7 @@ +/* + * SPDX-FileCopyrightText: 2022 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ /* * Copyright 2022 Google LLC * diff --git a/material-color-utilities/src/main/java/scheme/SchemeExpressive.java b/material-color-utilities/src/main/java/scheme/SchemeExpressive.java index 652dadda..925412c9 100644 --- a/material-color-utilities/src/main/java/scheme/SchemeExpressive.java +++ b/material-color-utilities/src/main/java/scheme/SchemeExpressive.java @@ -1,3 +1,7 @@ +/* + * SPDX-FileCopyrightText: 2022 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ /* * Copyright 2022 Google LLC * diff --git a/material-color-utilities/src/main/java/scheme/SchemeFidelity.java b/material-color-utilities/src/main/java/scheme/SchemeFidelity.java index c3404083..1d7990ee 100644 --- a/material-color-utilities/src/main/java/scheme/SchemeFidelity.java +++ b/material-color-utilities/src/main/java/scheme/SchemeFidelity.java @@ -1,5 +1,9 @@ /* - * Copyright 2022 Google LLC + * SPDX-FileCopyrightText: 2021 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ +/* + * Copyright 2021 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/material-color-utilities/src/main/java/scheme/SchemeFruitSalad.java b/material-color-utilities/src/main/java/scheme/SchemeFruitSalad.java index b2c5eb41..264aea83 100644 --- a/material-color-utilities/src/main/java/scheme/SchemeFruitSalad.java +++ b/material-color-utilities/src/main/java/scheme/SchemeFruitSalad.java @@ -1,3 +1,7 @@ +/* + * SPDX-FileCopyrightText: 2023 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ /* * Copyright 2023 Google LLC * diff --git a/material-color-utilities/src/main/java/scheme/SchemeMonochrome.java b/material-color-utilities/src/main/java/scheme/SchemeMonochrome.java index 0fb61232..8be7fdaf 100644 --- a/material-color-utilities/src/main/java/scheme/SchemeMonochrome.java +++ b/material-color-utilities/src/main/java/scheme/SchemeMonochrome.java @@ -1,3 +1,7 @@ +/* + * SPDX-FileCopyrightText: 2022 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ /* * Copyright 2022 Google LLC * diff --git a/material-color-utilities/src/main/java/scheme/SchemeNeutral.java b/material-color-utilities/src/main/java/scheme/SchemeNeutral.java index 45bdf27f..ae8127f6 100644 --- a/material-color-utilities/src/main/java/scheme/SchemeNeutral.java +++ b/material-color-utilities/src/main/java/scheme/SchemeNeutral.java @@ -1,5 +1,9 @@ /* - * Copyright 2022 Google LLC + * SPDX-FileCopyrightText: 2021 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ +/* + * Copyright 2021 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/material-color-utilities/src/main/java/scheme/SchemeRainbow.java b/material-color-utilities/src/main/java/scheme/SchemeRainbow.java index 0fd25310..732bf42d 100644 --- a/material-color-utilities/src/main/java/scheme/SchemeRainbow.java +++ b/material-color-utilities/src/main/java/scheme/SchemeRainbow.java @@ -1,5 +1,9 @@ /* - * Copyright 2023 Google LLC + * SPDX-FileCopyrightText: 2021 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ +/* + * Copyright 2021 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/material-color-utilities/src/main/java/scheme/SchemeTonalSpot.java b/material-color-utilities/src/main/java/scheme/SchemeTonalSpot.java index 0856f207..01791a88 100644 --- a/material-color-utilities/src/main/java/scheme/SchemeTonalSpot.java +++ b/material-color-utilities/src/main/java/scheme/SchemeTonalSpot.java @@ -1,5 +1,9 @@ /* - * Copyright 2022 Google LLC + * SPDX-FileCopyrightText: 2021 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ +/* + * Copyright 2021 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/material-color-utilities/src/main/java/scheme/SchemeVibrant.java b/material-color-utilities/src/main/java/scheme/SchemeVibrant.java index 380f4812..128bc4cc 100644 --- a/material-color-utilities/src/main/java/scheme/SchemeVibrant.java +++ b/material-color-utilities/src/main/java/scheme/SchemeVibrant.java @@ -1,5 +1,9 @@ /* - * Copyright 2022 Google LLC + * SPDX-FileCopyrightText: 2021 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ +/* + * Copyright 2021 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/material-color-utilities/src/main/java/scheme/Variant.java b/material-color-utilities/src/main/java/scheme/Variant.java index 3782948e..712d9c85 100644 --- a/material-color-utilities/src/main/java/scheme/Variant.java +++ b/material-color-utilities/src/main/java/scheme/Variant.java @@ -1,5 +1,9 @@ /* - * Copyright 2022 Google LLC + * SPDX-FileCopyrightText: 2021 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ +/* + * Copyright 2021 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/material-color-utilities/src/main/java/score/Score.java b/material-color-utilities/src/main/java/score/Score.java index f0776c9d..d74ba3fc 100644 --- a/material-color-utilities/src/main/java/score/Score.java +++ b/material-color-utilities/src/main/java/score/Score.java @@ -1,3 +1,7 @@ +/* + * SPDX-FileCopyrightText: 2021 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ /* * Copyright 2021 Google LLC * diff --git a/material-color-utilities/src/main/java/temperature/TemperatureCache.java b/material-color-utilities/src/main/java/temperature/TemperatureCache.java index f082acc1..873e6aa1 100644 --- a/material-color-utilities/src/main/java/temperature/TemperatureCache.java +++ b/material-color-utilities/src/main/java/temperature/TemperatureCache.java @@ -1,5 +1,9 @@ /* - * Copyright 2022 Google LLC + * SPDX-FileCopyrightText: 2021 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ +/* + * Copyright 2021 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/material-color-utilities/src/main/java/utils/ColorUtils.java b/material-color-utilities/src/main/java/utils/ColorUtils.java index 27430ad8..90febb38 100644 --- a/material-color-utilities/src/main/java/utils/ColorUtils.java +++ b/material-color-utilities/src/main/java/utils/ColorUtils.java @@ -1,3 +1,7 @@ +/* + * SPDX-FileCopyrightText: 2021 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ /* * Copyright 2021 Google LLC * diff --git a/material-color-utilities/src/main/java/utils/MathUtils.java b/material-color-utilities/src/main/java/utils/MathUtils.java index a1de2349..e2b636a6 100644 --- a/material-color-utilities/src/main/java/utils/MathUtils.java +++ b/material-color-utilities/src/main/java/utils/MathUtils.java @@ -1,3 +1,7 @@ +/* + * SPDX-FileCopyrightText: 2021 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ /* * Copyright 2021 Google LLC * diff --git a/material-color-utilities/src/main/java/utils/StringUtils.java b/material-color-utilities/src/main/java/utils/StringUtils.java index 75aa5b1b..76345ce0 100644 --- a/material-color-utilities/src/main/java/utils/StringUtils.java +++ b/material-color-utilities/src/main/java/utils/StringUtils.java @@ -1,3 +1,7 @@ +/* + * SPDX-FileCopyrightText: 2021 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ /* * Copyright 2021 Google LLC * From fbe865dc9cb3ca29880bdc17e6601075b6a85823 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Tue, 12 Mar 2024 11:55:23 +0100 Subject: [PATCH 2/2] Move SPDX infos from dep5 declaration to individual files Signed-off-by: Andy Scherzinger --- .idea/codeStyles/Project.xml.license | 2 ++ .idea/codeStyles/codeStyleConfig.xml.license | 2 ++ .idea/copyright/profiles_settings.xml.license | 2 ++ .reuse/dep5 | 8 -------- core/.gitignore | 3 +++ gradle/verification-keyring.keys.license | 2 ++ gradle/verification-keyring.license | 2 ++ gradle/verification-metadata.xml.license | 2 ++ gradle/wrapper/gradle-wrapper.jar.license | 2 ++ renovate.json5.license | 2 ++ sample/.gitignore | 3 +++ ui/.gitignore | 3 +++ 12 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 .idea/codeStyles/Project.xml.license create mode 100644 .idea/codeStyles/codeStyleConfig.xml.license create mode 100644 .idea/copyright/profiles_settings.xml.license create mode 100644 gradle/verification-keyring.keys.license create mode 100644 gradle/verification-keyring.license create mode 100644 gradle/verification-metadata.xml.license create mode 100644 gradle/wrapper/gradle-wrapper.jar.license create mode 100644 renovate.json5.license diff --git a/.idea/codeStyles/Project.xml.license b/.idea/codeStyles/Project.xml.license new file mode 100644 index 00000000..db241970 --- /dev/null +++ b/.idea/codeStyles/Project.xml.license @@ -0,0 +1,2 @@ +# SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors +# SPDX-License-Identifier: MIT diff --git a/.idea/codeStyles/codeStyleConfig.xml.license b/.idea/codeStyles/codeStyleConfig.xml.license new file mode 100644 index 00000000..db241970 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml.license @@ -0,0 +1,2 @@ +# SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors +# SPDX-License-Identifier: MIT diff --git a/.idea/copyright/profiles_settings.xml.license b/.idea/copyright/profiles_settings.xml.license new file mode 100644 index 00000000..db241970 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml.license @@ -0,0 +1,2 @@ +# SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors +# SPDX-License-Identifier: MIT diff --git a/.reuse/dep5 b/.reuse/dep5 index 6136cff6..5bbdf919 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -2,11 +2,3 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: android-common Upstream-Contact: Nextcloud Android team Source: https://github.com/nextcloud/android-common - -Files: gradlew gradlew.bat gradle/wrapper/gradle-wrapper.jar -Copyright: 2015-2021 the original authors -License: Apache-2.0 - -Files: gradle/verification-keyring.keys gradle/verification-metadata.xml renovate.json5 */.gitignore .idea/codeStyles/* .idea/copyright/profiles_settings.xml -Copyright: none -License: MIT \ No newline at end of file diff --git a/core/.gitignore b/core/.gitignore index 42afabfd..772b9eb5 100644 --- a/core/.gitignore +++ b/core/.gitignore @@ -1 +1,4 @@ +# SPDX-FileCopyrightText: 2022-2023 Nextcloud GmbH and Nextcloud contributors +# SPDX-License-Identifier: MIT + /build \ No newline at end of file diff --git a/gradle/verification-keyring.keys.license b/gradle/verification-keyring.keys.license new file mode 100644 index 00000000..8039e18f --- /dev/null +++ b/gradle/verification-keyring.keys.license @@ -0,0 +1,2 @@ +# SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors +# SPDX-License-Identifier: MIT diff --git a/gradle/verification-keyring.license b/gradle/verification-keyring.license new file mode 100644 index 00000000..8039e18f --- /dev/null +++ b/gradle/verification-keyring.license @@ -0,0 +1,2 @@ +# SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors +# SPDX-License-Identifier: MIT diff --git a/gradle/verification-metadata.xml.license b/gradle/verification-metadata.xml.license new file mode 100644 index 00000000..8039e18f --- /dev/null +++ b/gradle/verification-metadata.xml.license @@ -0,0 +1,2 @@ +# SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors +# SPDX-License-Identifier: MIT diff --git a/gradle/wrapper/gradle-wrapper.jar.license b/gradle/wrapper/gradle-wrapper.jar.license new file mode 100644 index 00000000..3f0600eb --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.jar.license @@ -0,0 +1,2 @@ +# SPDX-FileCopyrightText: 2015-2021 the original authors +# SPDX-License-Identifier: Apache-2.0 diff --git a/renovate.json5.license b/renovate.json5.license new file mode 100644 index 00000000..8039e18f --- /dev/null +++ b/renovate.json5.license @@ -0,0 +1,2 @@ +# SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors +# SPDX-License-Identifier: MIT diff --git a/sample/.gitignore b/sample/.gitignore index 42afabfd..772b9eb5 100644 --- a/sample/.gitignore +++ b/sample/.gitignore @@ -1 +1,4 @@ +# SPDX-FileCopyrightText: 2022-2023 Nextcloud GmbH and Nextcloud contributors +# SPDX-License-Identifier: MIT + /build \ No newline at end of file diff --git a/ui/.gitignore b/ui/.gitignore index 42afabfd..772b9eb5 100644 --- a/ui/.gitignore +++ b/ui/.gitignore @@ -1 +1,4 @@ +# SPDX-FileCopyrightText: 2022-2023 Nextcloud GmbH and Nextcloud contributors +# SPDX-License-Identifier: MIT + /build \ No newline at end of file