From befca8b8a5f1a3cdb61471f0c3c0a393751465a2 Mon Sep 17 00:00:00 2001 From: project516 <138796702+Project516@users.noreply.github.com> Date: Mon, 23 Feb 2026 17:57:36 +0000 Subject: [PATCH 1/2] fix files with reuse errors, add reuse github workflow, update test scripts to exit if gradle build fails --- .gitattributes | 4 + .github/dependabot.yml | 4 + .github/workflows/gradle.yml | 9 +- .github/workflows/javadoc.yml | 4 + .github/workflows/release.yml | 4 + .github/workflows/reuse.yaml | 12 ++ .gitignore | 4 + LICENSES/CC0-1.0.txt | 121 ++++++++++++++++++ README.md | 6 + REUSE.toml | 12 +- app/build.gradle | 4 + debian-package/DEBIAN/postinst | 5 + debian-package/usr/games/numberguessinggame | 5 + .../share/games/numberguessinggame/.gitignore | 4 + fedora-package/SOURCES/.gitignore | 4 + gradle.properties | 4 + gradle/libs.versions.toml | 4 + settings.gradle | 4 + test-gui.sh | 2 +- test.sh | 2 +- 20 files changed, 201 insertions(+), 17 deletions(-) create mode 100644 .github/workflows/reuse.yaml create mode 100644 LICENSES/CC0-1.0.txt diff --git a/.gitattributes b/.gitattributes index f91f646..0dfd96a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2026 Project516 <138796702+Project516@users.noreply.github.com> +# +# SPDX-License-Identifier: GPL-3.0-or-later + # # https://help.github.com/articles/dealing-with-line-endings/ # diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 9af0acf..b6c6d81 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2026 Project516 <138796702+Project516@users.noreply.github.com> +# +# SPDX-License-Identifier: GPL-3.0-or-later + version: 2 updates: - package-ecosystem: "gradle" diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index ff7b3bd..60e7db2 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -1,9 +1,6 @@ -# This workflow uses actions that are not certified by GitHub. -# They are provided by a third-party and are governed by -# separate terms of service, privacy policy, and support -# documentation. -# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time -# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle +# SPDX-FileCopyrightText: 2026 Project516 <138796702+Project516@users.noreply.github.com> +# +# SPDX-License-Identifier: GPL-3.0-or-later name: Java CI with Gradle diff --git a/.github/workflows/javadoc.yml b/.github/workflows/javadoc.yml index d093e95..8abbd68 100644 --- a/.github/workflows/javadoc.yml +++ b/.github/workflows/javadoc.yml @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2026 Project516 <138796702+Project516@users.noreply.github.com> +# +# SPDX-License-Identifier: GPL-3.0-or-later + name: Generate JavaDoc and deploy to GitHub Pages on: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 26c2b64..2f8eff3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2026 Project516 <138796702+Project516@users.noreply.github.com> +# +# SPDX-License-Identifier: GPL-3.0-or-later + name: Build and Upload Release Assets on: diff --git a/.github/workflows/reuse.yaml b/.github/workflows/reuse.yaml new file mode 100644 index 0000000..19ddc1f --- /dev/null +++ b/.github/workflows/reuse.yaml @@ -0,0 +1,12 @@ +# SPDX-FileCopyrightText: 2020 Free Software Foundation Europe e.V. +# SPDX-License-Identifier: CC0-1.0 +name: REUSE compliance check +on: [push, pull_request] + +jobs: + test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v5 + - name: REUSE Compliance Check + uses: fsfe/reuse-action@v6 \ No newline at end of file diff --git a/.gitignore b/.gitignore index 2effbd3..d5d7cfa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2026 Project516 <138796702+Project516@users.noreply.github.com> +# +# SPDX-License-Identifier: GPL-3.0-or-later + .gradle **/build/ !**/src/**/build/ diff --git a/LICENSES/CC0-1.0.txt b/LICENSES/CC0-1.0.txt new file mode 100644 index 0000000..0e259d4 --- /dev/null +++ b/LICENSES/CC0-1.0.txt @@ -0,0 +1,121 @@ +Creative Commons Legal Code + +CC0 1.0 Universal + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS + PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM + THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED + HEREUNDER. + +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator +and subsequent owner(s) (each and all, an "owner") of an original work of +authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for +the purpose of contributing to a commons of creative, cultural and +scientific works ("Commons") that the public can reliably and without fear +of later claims of infringement build upon, modify, incorporate in other +works, reuse and redistribute as freely as possible in any form whatsoever +and for any purposes, including without limitation commercial purposes. +These owners may contribute to the Commons to promote the ideal of a free +culture and the further production of creative, cultural and scientific +works, or to gain reputation or greater distribution for their Work in +part through the use and efforts of others. + +For these and/or other purposes and motivations, and without any +expectation of additional consideration or compensation, the person +associating CC0 with a Work (the "Affirmer"), to the extent that he or she +is an owner of Copyright and Related Rights in the Work, voluntarily +elects to apply CC0 to the Work and publicly distribute the Work under its +terms, with knowledge of his or her Copyright and Related Rights in the +Work and the meaning and intended legal effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be +protected by copyright and related or neighboring rights ("Copyright and +Related Rights"). Copyright and Related Rights include, but are not +limited to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, + communicate, and translate a Work; + ii. moral rights retained by the original author(s) and/or performer(s); +iii. publicity and privacy rights pertaining to a person's image or + likeness depicted in a Work; + iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below; + v. rights protecting the extraction, dissemination, use and reuse of data + in a Work; + vi. database rights (such as those arising under Directive 96/9/EC of the + European Parliament and of the Council of 11 March 1996 on the legal + protection of databases, and under any national implementation + thereof, including any amended or successor version of such + directive); and +vii. other similar, equivalent or corresponding rights throughout the + world based on applicable law or treaty, and any national + implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention +of, applicable law, Affirmer hereby overtly, fully, permanently, +irrevocably and unconditionally waives, abandons, and surrenders all of +Affirmer's Copyright and Related Rights and associated claims and causes +of action, whether now known or unknown (including existing as well as +future claims and causes of action), in the Work (i) in all territories +worldwide, (ii) for the maximum duration provided by applicable law or +treaty (including future time extensions), (iii) in any current or future +medium and for any number of copies, and (iv) for any purpose whatsoever, +including without limitation commercial, advertising or promotional +purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each +member of the public at large and to the detriment of Affirmer's heirs and +successors, fully intending that such Waiver shall not be subject to +revocation, rescission, cancellation, termination, or any other legal or +equitable action to disrupt the quiet enjoyment of the Work by the public +as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason +be judged legally invalid or ineffective under applicable law, then the +Waiver shall be preserved to the maximum extent permitted taking into +account Affirmer's express Statement of Purpose. In addition, to the +extent the Waiver is so judged Affirmer hereby grants to each affected +person a royalty-free, non transferable, non sublicensable, non exclusive, +irrevocable and unconditional license to exercise Affirmer's Copyright and +Related Rights in the Work (i) in all territories worldwide, (ii) for the +maximum duration provided by applicable law or treaty (including future +time extensions), (iii) in any current or future medium and for any number +of copies, and (iv) for any purpose whatsoever, including without +limitation commercial, advertising or promotional purposes (the +"License"). The License shall be deemed effective as of the date CC0 was +applied by Affirmer to the Work. Should any part of the License for any +reason be judged legally invalid or ineffective under applicable law, such +partial invalidity or ineffectiveness shall not invalidate the remainder +of the License, and in such case Affirmer hereby affirms that he or she +will not (i) exercise any of his or her remaining Copyright and Related +Rights in the Work or (ii) assert any associated claims and causes of +action with respect to the Work, in either case contrary to Affirmer's +express Statement of Purpose. + +4. Limitations and Disclaimers. + + a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. + b. Affirmer offers the Work as-is and makes no representations or + warranties of any kind concerning the Work, express, implied, + statutory or otherwise, including without limitation warranties of + title, merchantability, fitness for a particular purpose, non + infringement, or the absence of latent or other defects, accuracy, or + the present or absence of errors, whether or not discoverable, all to + the greatest extent permissible under applicable law. + c. Affirmer disclaims responsibility for clearing rights of other persons + that may apply to the Work or any use thereof, including without + limitation any person's Copyright and Related Rights in the Work. + Further, Affirmer disclaims responsibility for obtaining any necessary + consents, permissions or other rights required for any use of the + Work. + d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to + this CC0 or use of the Work. diff --git a/README.md b/README.md index 829a2e2..c38589d 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,9 @@ + + # Number Guessing Game A simple number guessing game where you try to guess a randomly generated number. The game features both a user-friendly graphical user interface (GUI) and a classic console mode. diff --git a/REUSE.toml b/REUSE.toml index 2ba7137..9bd01be 100644 --- a/REUSE.toml +++ b/REUSE.toml @@ -4,25 +4,19 @@ SPDX-PackageSupplier = "Project516 <138796702+Project516@users.noreply.github.co SPDX-PackageDownloadLocation = "https://github.com/Project516/NumberGuessingGame" [[annotations]] -path = [".gitattributes", ".gitignore", ".idea/**", ".vscode/**", "gradle.properties", "renovate.json", "settings.gradle", "app/build.gradle", "gradle/libs.versions.toml"] +path = [".idea/**", ".vscode/**", "renovate.json"] precedence = "aggregate" SPDX-FileCopyrightText = "2025 Project516 <138796702+Project516@users.noreply.github.com>" SPDX-License-Identifier = "GPL-3.0-or-later" [[annotations]] -path = ".github/**" +path = ["app/src/main/resources/version.txt"] precedence = "aggregate" SPDX-FileCopyrightText = "2025 Project516 <138796702+Project516@users.noreply.github.com>" SPDX-License-Identifier = "GPL-3.0-or-later" [[annotations]] -path = ["README.md", "app/src/main/resources/version.txt"] -precedence = "aggregate" -SPDX-FileCopyrightText = "2025 Project516 <138796702+Project516@users.noreply.github.com>" -SPDX-License-Identifier = "GPL-3.0-or-later" - -[[annotations]] -path = ["debian-package/DEBIAN/**", "debian-package/usr/share/games/numberguessinggame/.gitignore", "debian-package/usr/games/numberguessinggame"] +path = ["debian-package/DEBIAN/control"] precedence = "aggregate" SPDX-FileCopyrightText = "2025 Project516 <138796702+Project516@users.noreply.github.com>" SPDX-License-Identifier = "GPL-3.0-or-later" diff --git a/app/build.gradle b/app/build.gradle index 7b220b6..0adf404 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2026 Project516 <138796702+Project516@users.noreply.github.com> +// +// SPDX-License-Identifier: GPL-3.0-or-later + plugins { id 'application' diff --git a/debian-package/DEBIAN/postinst b/debian-package/DEBIAN/postinst index 6e208a7..71fefd1 100755 --- a/debian-package/DEBIAN/postinst +++ b/debian-package/DEBIAN/postinst @@ -1,4 +1,9 @@ #!/bin/sh + +# SPDX-FileCopyrightText: 2026 Project516 <138796702+Project516@users.noreply.github.com> +# +# SPDX-License-Identifier: GPL-3.0-or-later + set -e # Make the game executable diff --git a/debian-package/usr/games/numberguessinggame b/debian-package/usr/games/numberguessinggame index 5a4bac3..7334064 100755 --- a/debian-package/usr/games/numberguessinggame +++ b/debian-package/usr/games/numberguessinggame @@ -1,4 +1,9 @@ #!/bin/sh + +# SPDX-FileCopyrightText: 2026 Project516 <138796702+Project516@users.noreply.github.com> +# +# SPDX-License-Identifier: GPL-3.0-or-later + # Wrapper script to launch Number Guessing Game java -jar /usr/share/games/numberguessinggame/game.jar --console "$@" diff --git a/debian-package/usr/share/games/numberguessinggame/.gitignore b/debian-package/usr/share/games/numberguessinggame/.gitignore index 4ad43f9..f4070de 100644 --- a/debian-package/usr/share/games/numberguessinggame/.gitignore +++ b/debian-package/usr/share/games/numberguessinggame/.gitignore @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2026 Project516 <138796702+Project516@users.noreply.github.com> +# +# SPDX-License-Identifier: GPL-3.0-or-later + # Ignore all files in this directory (they are generated during build) * # But not this file diff --git a/fedora-package/SOURCES/.gitignore b/fedora-package/SOURCES/.gitignore index d2d3f64..2bb2d37 100644 --- a/fedora-package/SOURCES/.gitignore +++ b/fedora-package/SOURCES/.gitignore @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2026 Project516 <138796702+Project516@users.noreply.github.com> +# +# SPDX-License-Identifier: GPL-3.0-or-later + # Ignore all build artifacts in this directory * # But keep this .gitignore file diff --git a/gradle.properties b/gradle.properties index 175c8c8..32bfb0a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2026 Project516 <138796702+Project516@users.noreply.github.com> +# +# SPDX-License-Identifier: GPL-3.0-or-later + org.gradle.configuration-cache=true org.gradle.parallel=true org.gradle.caching=true diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c513b58..cd2e0ab 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2026 Project516 <138796702+Project516@users.noreply.github.com> +# +# SPDX-License-Identifier: GPL-3.0-or-later + [versions] guava = "33.5.0-jre" diff --git a/settings.gradle b/settings.gradle index 25c2de5..039e043 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2026 Project516 <138796702+Project516@users.noreply.github.com> +// +// SPDX-License-Identifier: GPL-3.0-or-later + plugins { // Apply the foojay-resolver plugin to allow automatic download of JDKs id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0' diff --git a/test-gui.sh b/test-gui.sh index 242532e..5fccae4 100644 --- a/test-gui.sh +++ b/test-gui.sh @@ -8,7 +8,7 @@ # This script builds the project and runs the graphical version of the game # Build the project using Gradle -./gradlew build +./gradlew build || exit 1 # Run the game in GUI mode (default - opens a window) java -jar app/build/libs/app-all.jar diff --git a/test.sh b/test.sh index 6f77703..36afe02 100755 --- a/test.sh +++ b/test.sh @@ -8,7 +8,7 @@ # This script builds the project and runs the console version of the game # Build the project using Gradle -./gradlew build +./gradlew build || exit 1 # Run the game in console mode (text-based interface) java -jar app/build/libs/app-all.jar --console From b899480bdc2cc2c7a33b23ee880360c3af084e5a Mon Sep 17 00:00:00 2001 From: project516 <138796702+Project516@users.noreply.github.com> Date: Mon, 23 Feb 2026 12:10:52 -0600 Subject: [PATCH 2/2] Potential fix for code scanning alert no. 1: Workflow does not contain permissions Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> --- .github/workflows/reuse.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/reuse.yaml b/.github/workflows/reuse.yaml index 19ddc1f..26a5e52 100644 --- a/.github/workflows/reuse.yaml +++ b/.github/workflows/reuse.yaml @@ -2,6 +2,8 @@ # SPDX-License-Identifier: CC0-1.0 name: REUSE compliance check on: [push, pull_request] +permissions: + contents: read jobs: test: