add license to class + dependency updates (#29)

Author: RealYusufIsmail

.github/workflows/auto-assign.yml

@@ -1,6 +1,6 @@
 name: Basic checks
 
-on: [pull_request]
+on: [ pull_request ]
 
 env:
   JAVA_VERSION: 17

.github/workflows/basic-checks.yml

@@ -1,6 +1,6 @@
 name: Code Cov Workflow
 
-on: [push, pull_request]
+on: [ push, pull_request ]
 
 jobs:
   build:

.github/workflows/codecov.yml

@@ -1,68 +1,68 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-# ******** NOTE ********
-
-name: "CodeQL"
+name: Code Analysis
 
 on:
   push:
-    branches: [ master ]
+    branches: [ "main" ]
   pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ master ]
+    branches: [ "main" ]
   schedule:
-    - cron: '36 19 * * 5'
+    - cron: '0 20 * * 4'
+
+env:
+  JAVA_VERSION: 17
 
 jobs:
   analyze:
     name: Analyze
     runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
 
     strategy:
       fail-fast: false
       matrix:
+        # Override automatic language detection by changing the below list
+        # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
         language: [ 'java' ]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
-        # Learn more:
-        # https://docs.github.com/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
+        # Learn more...
+        # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
 
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
-
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
-
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      - name: Set up JDK
+        uses: actions/setup-java@v1
+        with:
+          java-version: ${{ env.JAVA_VERSION }}
+      - name: Checkout repository
+        uses: actions/checkout@v2
+        with:
+          # We must fetch at least the immediate parents so that if this is
+          # a pull request then we can check out the head.
+          fetch-depth: 2
 
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v1
+        with:
+          languages: ${{ matrix.language }}
+          # If you wish to specify custom queries, you can do so here or in a config file.
+          # By default, queries listed here will override any specified in a config file.
+          # Prefix the list here with "+" to use these queries and those in the config file.
+          # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
+      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+      # If this step fails, then you should remove it and run the build manually (see below)
+      #- name: Autobuild
+      #  uses: github/codeql-action/autobuild@v1
 
-    #- run: |
-    #   make bootstrap
-    #   make release
+      # ℹ️ Command-line programs to run using the OS shell.
+      # 📚 https://git.io/JvXDl
 
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+      #    and modify them (or add more) to build your code if your project
+      #    uses a compiled language
+      - run: |
+          ./gradlew build
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v1

.github/workflows/codeql-analysis.yml

@@ -1,6 +1,6 @@
 name: GitGuardian scan
 
-on: [push, pull_request]
+on: [ push, pull_request ]
 
 jobs:
   scanning:
@@ -16,6 +16,6 @@ jobs:
         env:
           GITHUB_PUSH_BEFORE_SHA: ${{ github.event.before }}
           GITHUB_PUSH_BASE_SHA: ${{ github.event.base }}
-          GITHUB_PULL_BASE_SHA:  ${{ github.event.pull_request.base.sha }}
+          GITHUB_PULL_BASE_SHA: ${{ github.event.pull_request.base.sha }}
           GITHUB_DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
           GITGUARDIAN_API_KEY: ${{ secrets.GITGUARDIAN_API_KEY }}

.github/workflows/gitgurdianscan.yml

@@ -1,6 +1,6 @@
 name: Greetings
 
-on: [pull_request, issues]
+on: [ pull_request, issues ]
 
 jobs:
   greeting:
@@ -9,8 +9,8 @@ jobs:
       issues: write
       pull-requests: write
     steps:
-    - uses: actions/first-interaction@v1
-      with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
-        issue-message: 'Hi/Hello Thank you for raising your first issue. Please make sure it is detailed so we know what it is about.'
-        pr-message: 'Hi/Hello thank you for contributing to this project. Can you please run ./gradlew spotlessApply to make sure the code is tidy and clean. Thank you'
+      - uses: actions/first-interaction@v1
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          issue-message: 'Hi/Hello Thank you for raising your first issue. Please make sure it is detailed so we know what it is about.'
+          pr-message: 'Hi/Hello thank you for contributing to this project. Can you please run ./gradlew spotlessApply to make sure the code is tidy and clean. Thank you'

.github/workflows/greetings.yml

@@ -1,3 +1,21 @@
+/*
+ * Copyright 2022 Programming Org and other Programming Org contributors
+ *
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * you may not use this file except in compliance with the License.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 import nu.studer.gradle.jooq.JooqEdition
 
 buildscript {
@@ -8,7 +26,7 @@ buildscript {
 
 plugins {
     id 'java'
-    id "com.diffplug.spotless" version "6.6.1"
+    id "com.diffplug.spotless" version "6.8.0"
     id "application"
     id "nu.studer.jooq" version "6.0.1"
 }
@@ -26,16 +44,12 @@ sourceCompatibility = 17
 targetCompatibility = 17
 
 dependencies {
-    implementation group: 'net.dv8tion', name: 'JDA', version: '5.0.0-alpha.12'
+    implementation group: 'net.dv8tion', name: 'JDA', version: '5.0.0-alpha.17'
     //Logger
     implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.11'
     implementation group: 'ch.qos.logback', name: 'logback-core', version: '1.2.11'
     //config
     implementation group: 'io.github.yusufsdiscordbot', name: 'config', version: '1.0.4'
-    //json
-    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.13.3'
-    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: '2.13.3'
-    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.13.3'
     //database
     implementation group: 'com.zaxxer', name: 'HikariCP', version: '5.0.0'
     implementation group: 'org.postgresql', name: 'postgresql', version: '42.4.0'
@@ -44,20 +58,18 @@ dependencies {
     implementation group: 'org.jooq', name: 'jooq-codegen', version: '3.16.6'
     implementation group: 'org.jooq', name: 'jooq-meta', version: '3.16.6'
     //test
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.9.0'
     //jooq
     jooqGenerator "org.postgresql:postgresql:42.4.0"
 }
 
 apply plugin: 'jacoco' // code coverage reports
 
-
 test {
     useJUnitPlatform()
     finalizedBy jacocoTestReport // report is always generated after tests run
 }
 
-
 jacocoTestReport {
     group = "Reporting"
     description = "Generate Jacoco coverage reports after running tests."
@@ -95,6 +107,26 @@ spotless {
         //No need to do spotless on generated code
         targetExclude("src/main/jooq/**")
         eclipse('4.21.0').configFile("${rootProject.rootDir}/meta/formatting/google-style-eclipse.xml")
+
+        licenseHeader("""/*
+ * Copyright 2022 Programming Org and other Programming Org contributors
+ *
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * you may not use this file except in compliance with the License.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */ """)
+
     }
 }
 
@@ -114,45 +146,13 @@ jar {
     archiveVersion.set("")
 }
 
-/**
- * This task downloads all dependencies (with transitive dependencies) and puts them into the libraries folder.
- * Used instead of shadowJar to hopefully optimize build times.
- * Run the application jar with the downloaded library files in the classpath.
- */
-task downloadDependencies {
-    doLast {
-        logger.info("===== Downloading dependencies =====")
-        logger.info("  ---       Cleaning up...     ---")
-        // delete superseded library jars
-        Set<String> newFiles = sourceSets.main.runtimeClasspath.getFiles().stream().map(File::getName).toList()
-        fileTree("libraries").files.stream().filter(file -> !newFiles.contains(file.getName())).forEach(file -> {
-            logger.info("  -> Deleting leftover file: ${file.getName()}...")
-            file.delete()
-        })
-        logger.info("  ---     Cleanup complete.    ---")
-
-        logger.info("\n  ---  Copying dependencies... ---")
-        copy {
-            from(sourceSets.main.runtimeClasspath) {
-                include "*.jar"
-            }
-            into 'libraries/'
-            eachFile {
-                logger.info("  -> Copying ${it.name}...")
-            }
-        }
-        logger.info("  ---    Dependencies copied.  ---")
-        logger.info("===== Dependencies downloaded ======")
-    }
-}
 
 def props = new Properties()
 //if the file exists, load the properties
 if (file(".env").exists()) {
     file(".env").withInputStream { props.load(it) }
 }
 
-
 //create the build directory so no errors happen with the workflow
 task createBuildDir {
     doLast {
@@ -209,7 +209,4 @@ jooq {
             }
         }
     }
-}
-
-
-check.dependsOn jacocoTestReport
+}

.github/workflows/stale.yml

@@ -1,3 +1,21 @@
+/*
+ * Copyright 2022 Programming Org and other Programming Org contributors
+ *
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * you may not use this file except in compliance with the License.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */ 
 package io.github.org.programming;
 
 import io.github.org.programming.bot.ProgrammingBot;