Merge branch 'master' into master

hasnainmakada-99 · Jan 25, 2024 · ea52319 · ea52319
2 parents 7b8dc5f + cd2bedd
commit ea52319
Show file tree

Hide file tree

Showing 75 changed files with 990 additions and 319 deletions.
diff --git a/.github/ISSUE_TEMPLATE/Bug-for-application.yaml b/.github/ISSUE_TEMPLATE/Bug-for-application.yaml
@@ -34,12 +34,13 @@ body:
     attributes:
       label: Operating System / Environment
       description: Please select the operating system / Environment you are using.
+      multiple: true
       options:
-        - Windows 🪟
-        - MacOS 🍏
-        - Linux 🐧
-        - Docker 🐋
-        - Other
+        - "Windows 🪟"
+        - "MacOS 🍏"
+        - "Linux 🐧"
+        - "Docker 🐋"
+        - "Other"
     validations:
       required: true
   - type: textarea
@@ -56,3 +57,18 @@ body:
       description: Add any other context about the problem here.
     validations:
       required: false
+  - type: dropdown
+    id: assignee
+    attributes:
+      label: Do you want to work on this issue?
+      multiple: false
+      options:
+        - "Yes"
+        - "No"
+      default: 0
+    validations:
+      required: false
+  - type: markdown
+    attributes:
+      value: |
+        You can also join our [Discord community](https://discord.gg/DeT4jXPfkG) for any help or support.
diff --git a/.github/ISSUE_TEMPLATE/Bug-for-website.yaml b/.github/ISSUE_TEMPLATE/Bug-for-website.yaml
@@ -33,25 +33,27 @@ body:
     id: os
     attributes:
       label: Operating System
-      description: Please select the operating system that you have used.
+      description: Please select the operating system that you are using.
+      multiple: true
       options:
-        - Windows 🪟
-        - MacOS 🍏
-        - Linux 🐧
-        - Other
+        - "Windows 🪟"
+        - "MacOS 🍏"
+        - "Linux 🐧"
+        - "Other"
     validations:
       required: true
   - type: dropdown
     id: browser
     attributes:
       label: Browser
-      description: Please select the browser you are using
+      description: Please select the browser that you are using.
+      multiple: true
       options:
-        - Microsoft Edge
-        - Google Chrome
-        - Safari
-        - Brave
-        - Other
+        - "Microsoft Edge"
+        - "Google Chrome"
+        - "Safari"
+        - "Brave"
+        - "Other"
     validations:
       required: true
   - type: textarea
@@ -68,3 +70,18 @@ body:
       description: Add any other context about the problem here.
     validations:
       required: false
+  - type: dropdown
+    id: assignee
+    attributes:
+      label: Do you want to work on this issue?
+      multiple: false
+      options:
+        - "Yes"
+        - "No"
+      default: 0
+    validations:
+      required: false
+  - type: markdown
+    attributes:
+      value: |
+        You can also join our [Discord community](https://discord.gg/DeT4jXPfkG) for any help or support.
diff --git a/.github/ISSUE_TEMPLATE/documentation.yaml b/.github/ISSUE_TEMPLATE/documentation.yaml
@@ -7,7 +7,7 @@ body:
     attributes:
       label: Category of documentation update
       description: |
-        What category does this change fall under? For example, Typo error, New category addition, Rephrasing the sentences, fixing broken links, etc. 
+        What category does this change fall under? For example, Typo, New category addition, Rephrasing the sentences, fixing broken links, etc.
     validations:
       required: true
   - type: textarea
@@ -23,3 +23,18 @@ body:
       description: Add any other context about the change in the documentation here.
     validations:
       required: false
+  - type: dropdown
+    id: assignee
+    attributes:
+      label: Do you want to work on this issue?
+      multiple: false
+      options:
+        - "Yes"
+        - "No"
+      default: 0
+    validations:
+      required: false
+  - type: markdown
+    attributes:
+      value: |
+        You can also join our [Discord community](https://discord.gg/DeT4jXPfkG) for any help or support.
diff --git a/.github/ISSUE_TEMPLATE/feature-request-application.yaml b/.github/ISSUE_TEMPLATE/feature-request-application.yaml
@@ -32,3 +32,18 @@ body:
       description: Add any other context about the feature here.
     validations:
       required: false
+  - type: dropdown
+    id: assignee
+    attributes:
+      label: Do you want to work on this issue?
+      multiple: false
+      options:
+        - "Yes"
+        - "No"
+      default: 0
+    validations:
+      required: false
+  - type: markdown
+    attributes:
+      value: |
+        You can also join our [Discord community](https://discord.gg/DeT4jXPfkG) for any help or support.
diff --git a/.github/ISSUE_TEMPLATE/feature-request-website.yaml b/.github/ISSUE_TEMPLATE/feature-request-website.yaml
@@ -32,3 +32,18 @@ body:
       description: Add any other context about the feature here.
     validations:
       required: false
+  - type: dropdown
+    id: assignee
+    attributes:
+      label: Do you want to work on this issue?
+      multiple: false
+      options:
+        - "Yes"
+        - "No"
+      default: 0
+    validations:
+      required: false
+  - type: markdown
+    attributes:
+      value: |
+        You can also join our [Discord community](https://discord.gg/DeT4jXPfkG) for any help or support.
diff --git a/.github/ISSUE_TEMPLATE/other.yml b/.github/ISSUE_TEMPLATE/other.yml
@@ -17,3 +17,18 @@ body:
       description: Add any other context about the issue here.
     validations:
       required: false
+  - type: dropdown
+    id: assignee
+    attributes:
+      label: Do you want to work on this issue?
+      multiple: false
+      options:
+        - "Yes"
+        - "No"
+      default: 0
+    validations:
+      required: false
+  - type: markdown
+    attributes:
+      value: |
+        You can also join our [Discord community](https://discord.gg/DeT4jXPfkG) for any help or support.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -10,8 +10,7 @@ updates:
     schedule:
       interval: 'daily'
     commit-message:
-      prefix: '[npm] '
-      include: 'scope'
+      prefix: 'chore(npm)'
     labels:
       - 'dependencies 📦️'
       - 'npm 📦️'
@@ -23,8 +22,7 @@ updates:
     schedule:
       interval: 'daily'
     commit-message:
-      prefix: '[maven] '
-      include: 'scope'
+      prefix: 'chore(maven)'
     labels:
       - 'dependencies 📦️'
       - 'maven 📦️'
@@ -37,10 +35,22 @@ updates:
       # Check for updates to GitHub Actions every weekday
       interval: 'daily'
     commit-message:
-      prefix: '[ci] '
-      include: 'scope'
+      prefix: 'chore(ci)'
     labels:
       - 'dependencies 📦️'
-      - 'Workflows'
+      - 'CI/CD 🔁'
     reviewers:
       - SaptarshiSarkar12
+
+  - package-ecosystem: 'docker'
+    directory: '/'
+    schedule:
+      # Check for updates to Docker every day
+      interval: 'daily'
+    commit-message:
+      prefix: 'chore(docker)'
+    labels:
+        - 'dependencies 📦️'
+        - 'docker 🐋️'
+    reviewers:
+      - SaptarshiSarkar12
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -6,7 +6,7 @@
 - changed-files:
   - any-glob-to-any-file: ['CLI/src/**', 'GUI/src/**', 'Core/src/*']
 
-"Workflows":
+"CI/CD 🔁":
 - changed-files:
   - any-glob-to-any-file: ['.github/workflows/**']
 
@@ -29,4 +29,4 @@
 
 "docker 🐋":
 - changed-files:
-  - any-glob-to-any-file: ['Docker/**']
+  - any-glob-to-any-file: ['Docker/**', 'docker-compose.yml']
diff --git a/.github/linters/sun_checks.xml b/.github/linters/sun_checks.xml
@@ -7,6 +7,7 @@
         <property name="fileNamePattern" value="module\-info\.java$"/>
     </module>
     <module name="TreeWalker">
+        <module name="PackageName"/>
         <module name="IllegalImport"/>
         <module name="RedundantImport"/>
         <module name="UnusedImports"/>
@@ -42,6 +43,7 @@
         <module name="SimplifyBooleanReturn"/>
         <module name="StringLiteralEquality"/>
         <module name="UnnecessarySemicolonAfterTypeMemberDeclaration"/>
+        <module name="UnnecessarySemicolonInTryWithResources"/>
         <module name="UnusedLocalVariable"/>
         <module name="ArrayTypeStyle"/>
         <module name="CommentsIndentation"/>

diff --git a/.github/release.yml b/.github/release.yml
@@ -7,42 +7,64 @@ changelog:
         labels:
           - "Website 🌐"
           - "documentation 📝"
+          - "dependencies 📦️"
+          - "docker 🐋"
     - title: Bug 🪲 Fixes in Application
       labels:
         - "bug 🐛"
       exclude:
         labels:
           - "Website 🌐"
           - "documentation 📝"
+          - "dependencies 📦️"
+          - "docker 🐋"
     - title: New Features ✨ in Website
       labels:
         - "feature ✨"
       exclude:
         labels:
           - "App 💻"
           - "documentation 📝"
+          - "dependencies 📦️"
+          - "docker 🐋"
     - title: Bug 🪲 Fixes in Website
       labels:
         - "bug 🐛"
       exclude:
         labels:
           - "App 💻"
           - "documentation 📝"
+          - "dependencies 📦️"
+          - "docker 🐋"
     - title: Documentation 📝 Changes
       labels:
         - "documentation 📝"
       exclude:
         labels:
           - "App 💻"
           - "Website 🌐"
-    - title: Docker 🐋 Changes
+          - "dependencies 📦️"
+          - "docker 🐋"
+    - title: New Features ✨ in Docker 🐋
       labels:
         - "docker 🐋"
+        - "feature ✨"
       exclude:
         labels:
           - "App 💻"
           - "documentation 📝"
           - "Website 🌐"
+          - "dependencies 📦️"
+    - title: Bug 🪲 Fixes in Docker 🐋
+      labels:
+          - "docker 🐋"
+          - "bug 🐛"
+      exclude:
+          labels:
+          - "App 💻"
+          - "documentation 📝"
+          - "Website 🌐"
+          - "dependencies 📦️"
     - title: Dependency 📦️ Changes
       labels:
         - "dependencies 📦️"

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -8,7 +8,7 @@ on:
       - "*.txt"
   pull_request:
     paths-ignore:
-      - "Website/**"      
+      - "Website/**"
       - "*.md"
       - "*.txt"
   workflow_dispatch:
@@ -19,7 +19,7 @@ on:
           type: boolean
 
 concurrency:
-  group: ${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -115,17 +115,17 @@ jobs:
       with:
         name: ${{ matrix.os }}-${{ matrix.mode }}-Build-Files
         path: ${{ matrix.os }}-${{ matrix.mode }}.tar
-        
+
   generate-metadata-and-create-release:
     name: Artifacts Metadata & Release
     runs-on: ubuntu-latest
     needs: build-Drifty
     steps:
     - uses: actions/checkout@v4
-    - name: Get Drifty version from .version file
+    - name: Get Drifty version from version.json file
       run: echo "VERSION=$(jq .version version.json | sed -r 's/"//g')" >> $GITHUB_ENV
     - name: Set Drifty version in pom.xml
-      run: mvn versions:set -DnewVersion=$VERSION
+      run: mvn versions:set -D newVersion=$VERSION -D generateBackupPoms=false
     - name: Download Build artifacts
       uses: actions/download-artifact@v4
     - name: Make OS specific build directories