From ecaac92079af8be7824c3fb71f5748c9348eb33d Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Sat, 2 Mar 2024 18:36:04 +0100 Subject: [PATCH 1/2] Add SPDX header to github actions Signed-off-by: Andy Scherzinger --- .github/workflows/autoApproveDependabot.yml | 3 +++ .github/workflows/gradle-wrapper-validation.yml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/autoApproveDependabot.yml b/.github/workflows/autoApproveDependabot.yml index b07e9064..6db28e7c 100644 --- a/.github/workflows/autoApproveDependabot.yml +++ b/.github/workflows/autoApproveDependabot.yml @@ -1,3 +1,6 @@ + * SPDX-FileCopyrightText: 2020-2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-FileCopyrightText: 2020 Tobias Kaminsky + * SPDX-License-Identifier: GPL-3.0-or-later name: Dependabot on: pull_request_target diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml index 87c26f04..f89f53f6 100644 --- a/.github/workflows/gradle-wrapper-validation.yml +++ b/.github/workflows/gradle-wrapper-validation.yml @@ -1,3 +1,6 @@ + * SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-FileCopyrightText: 2022 Unpublished + * SPDX-License-Identifier: GPL-3.0-or-later name: "Validate Gradle Wrapper" on: From 83154de6ec85555288683a3956dea05fd20e995f Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Sat, 2 Mar 2024 18:51:23 +0100 Subject: [PATCH 2/2] Add SPDX header for top level files Signed-off-by: Andy Scherzinger --- .editorconfig | 48 +++++++++++++++++++++++++++++++++++++++++++++++ .gitignore | 2 ++ README.md | 4 ++++ build.gradle | 7 +++++++ gradle.properties | 2 ++ settings.gradle | 6 ++++++ 6 files changed, 69 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..d183e960 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,48 @@ +# .editorconfig + +# see http://EditorConfig.org + +# SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors +# SPDX-License-Identifier: GPL-3.0-or-later + +# This is the file in the root of the project. +# For sub folders you can have other files that override only some settings. +# For these, this settings should be false. +root=true + +[*] +max_line_length=120 +# use spaces, not tabs. +indent_style=space +indent_size=4 + +[*.yml] +max_line_length=150 + +charset=utf-8 + +# Trimming is good for consistency +trim_trailing_whitespace=true +# I've seen cases where a missing new_line was ignored on *nix systems. +# Never again with this setting! +insert_final_newline=true + +[*.properties] +# Exception for Java properties files should be encoded latin1 (aka iso8859-1) +charset=latin1 + +[*.{cmd,bat}] +# batch files on Windows should stay with CRLF +end_of_line=crlf + +[*.md] +trim_trailing_whitespace=false + +[.drone.yml] +indent_size=2 + +[*.{kt,kts}] +# IDE does not follow this Ktlint rule strictly, but the default ordering is pretty good anyway, so let's ditch it +ktlint_standard_import-ordering = disabled +ij_kotlin_allow_trailing_comma = false +ij_kotlin_allow_trailing_comma_on_call_site = false diff --git a/.gitignore b/.gitignore index 71e3caa9..07d6b6aa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +# SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors +# SPDX-License-Identifier: GPL-3.0-or-later # built application files *.apk *.ap_ diff --git a/README.md b/README.md index 4f3de655..b3ab2ba4 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,7 @@ + # Nextcloud Single Sign On Logo Nextcloud Single Sign On [![Codacy Badge](https://app.codacy.com/project/badge/Grade/3fe63bb2932243f08dc362fa49c5275b)](https://app.codacy.com/gh/nextcloud/Android-SingleSignOn/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade) diff --git a/build.gradle b/build.gradle index a32c6ddf..3dfd1ec2 100644 --- a/build.gradle +++ b/build.gradle @@ -1,3 +1,10 @@ +/* + * Nextcloud Android Single-Sign-On Library + * + * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: GPL-3.0-or-later + */ + buildscript { ext { kotlin_version = '1.9.22' diff --git a/gradle.properties b/gradle.properties index 4f2cc294..f5677d94 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,5 @@ +# SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors +# SPDX-License-Identifier: GPL-3.0-or-later org.gradle.dependency.verification.console=verbose android.useAndroidX=true android.nonTransitiveRClass=false diff --git a/settings.gradle b/settings.gradle index 98eeb8a8..75a767ac 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,8 @@ +/* + * Nextcloud Android Single-Sign-On Library + * + * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: GPL-3.0-or-later + */ include ':lib' include ':sample'