Merge pull request #326 from nextcloud/chore/noid/reuseLinterDuplicat…

…ionDeprecationWarning Add SPDX header to material implementation classes
nextcloud · Mar 12, 2024 · 7413426 · 7413426
2 parents 30c293a + fbe865d
commit 7413426
Show file tree

Hide file tree

Showing 55 changed files with 214 additions and 33 deletions.
diff --git a/.idea/codeStyles/Project.xml.license b/.idea/codeStyles/Project.xml.license
diff --git a/.idea/codeStyles/codeStyleConfig.xml.license b/.idea/codeStyles/codeStyleConfig.xml.license
diff --git a/.idea/copyright/profiles_settings.xml.license b/.idea/copyright/profiles_settings.xml.license
diff --git a/.reuse/dep5 b/.reuse/dep5
@@ -2,15 +2,3 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: android-common
 Upstream-Contact: Nextcloud Android team <[email protected]>
 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/*
-Copyright: none
-License: MIT
diff --git a/core/.gitignore b/core/.gitignore
@@ -1 +1,4 @@
+# SPDX-FileCopyrightText: 2022-2023 Nextcloud GmbH and Nextcloud contributors
+# SPDX-License-Identifier: MIT
+
 /build
diff --git a/gradle/verification-keyring.keys.license 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
@@ -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
@@ -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
@@ -0,0 +1,2 @@
+# SPDX-FileCopyrightText: 2015-2021 the original authors
+# SPDX-License-Identifier: Apache-2.0
diff --git 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
@@ -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
@@ -1 +1,4 @@
+# SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors
+# SPDX-License-Identifier: MIT
+
 /build
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
		# SPDX-License-Identifier: MIT
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# SPDX-FileCopyrightText: 2015-2021 the original authors
		# SPDX-License-Identifier: Apache-2.0