Merge remote-tracking branch 'upstream/root' into fork

mikbot · Nov 2, 2024 · 82b8da3 · 82b8da3
2 parents 8ce15d4 + edeb818
commit 82b8da3
Show file tree

Hide file tree

Showing 1,669 changed files with 46,354 additions and 46,666 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -28,32 +28,39 @@ jobs:
           mkdir -p ~/.gradle
           echo "org.gradle.jvmargs=-XX:MaxMetaspaceSize=5G" >> ~/.gradle/gradle.properties
 
-      - name: Gradle (Build)
-        uses: gradle/gradle-build-action@v3
+      - name: Gradle (Setup)
+        uses: gradle/actions/setup-gradle@v4
 
-        with:
-          arguments: checkLicenses build
+      - name: Gradle (Build)
+        run: "./gradlew checkLicenses build"
 
         env:
           TOKEN: "${{ secrets.TOKEN }}"
 
-      - name: Upload artifact (Extra Module JARs)
+      - name: Upload artifact (Core JARs)
         uses: actions/upload-artifact@v4
 
         with:
-          name: JARs (Extra Modules)
-          path: extra-modules/*/build/libs/*.jar
+          name: JARs (Core)
+          path: kord-extensions/build/libs/*.jar
 
-      - name: Upload artifact (Main JARs)
+      - name: Upload artifact (Annotation JARs)
         uses: actions/upload-artifact@v4
 
         with:
-          name: JARs (Main)
-          path: kord-extensions/build/libs/*.jar
+          name: JARs (Annotation)
+          path: annotations/**/build/libs/*.jar
 
       - name: Upload artifact (Module JARs)
         uses: actions/upload-artifact@v4
 
         with:
           name: JARs (Modules)
-          path: modules/*/build/libs/*.jar
+          path: modules/**/build/libs/*.jar
+
+      - name: Upload artifact (Parser JARs)
+        uses: actions/upload-artifact@v4
+
+        with:
+          name: JARs (Parser)
+          path: token-parser/build/libs/*.jar
diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml
@@ -36,21 +36,17 @@ jobs:
           global: true
           token: '${{ secrets.GITHUB_TOKEN }}'
 
-      - name: Gradle (Build)
-        uses: gradle/gradle-build-action@v3
+      - name: Gradle (Setup)
+        uses: gradle/actions/setup-gradle@v4
 
-        with:
-          arguments: checkLicenses build
+      - name: Gradle (Build)
+        run: "./gradlew checkLicenses build"
 
         env:
           TOKEN: "${{ secrets.TOKEN }}"
 
-      - name: Disable parallel publish
-
-        run: kotlin .github/disable-parallel.main.kts
-
       - name: Gradle (Publish)
-        uses: gradle/gradle-build-action@v3
+        run: "./gradlew publish"
 
         env:
           ORG_GRADLE_PROJECT_signingKey: "${{ secrets.GPG_KEY }}"
@@ -64,9 +60,6 @@ jobs:
 
           TOKEN: "${{ secrets.TOKEN }}"
 
-        with:
-          arguments: publish --no-parallel
-
       - name: Create release description
         run: kotlin .github/tag.main.kts
 
@@ -85,33 +78,42 @@ jobs:
           name: Release ${{ steps.get_tag.outputs.NAME }}
 
           files: |
-            build/libs/*.jar
-            **/build/libs/*.jar
+            annotations/*/build/libs/*.jar
+            kord-extensions/build/libs/*.jar
+            modules/**/build/libs/*.jar
+            token-parser/build/libs/*.jar
 
       - name: Release webhook
         run: kotlin .github/release.main.kts
 
         env:
           WEBHOOK_URL: ${{ secrets.WEBHOOK_URL }}
 
-      - name: Upload artifact (Extra Module JARs)
+      - name: Upload artifact (Core JARs)
         uses: actions/upload-artifact@v4
 
         with:
-          name: JARs (Extra Modules)
-          path: extra-modules/*/build/libs/*.jar
+          name: JARs (Core)
+          path: kord-extensions/build/libs/*.jar
 
-      - name: Upload artifact (Main JARs)
+      - name: Upload artifact (Annotation JARs)
         uses: actions/upload-artifact@v4
 
         with:
-          name: JARs (Main)
-          path: kord-extensions/build/libs/*.jar
+          name: JARs (Annotation)
+          path: annotations/**/build/libs/*.jar
 
       - name: Upload artifact (Module JARs)
         uses: actions/upload-artifact@v4
 
         with:
           name: JARs (Modules)
-          path: modules/*/build/libs/*.jar
+          path: modules/**/build/libs/*.jar
+
+      - name: Upload artifact (Parser JARs)
+        uses: actions/upload-artifact@v4
+
+        with:
+          name: JARs (Parser)
+          path: token-parser/build/libs/*.jar
 
diff --git a/.gitignore b/.gitignore
@@ -115,12 +115,20 @@ fabric.properties
 
 ### Custom ignores
 
-/data
-*/build
-*/*/build
+/**/build/
+/**/build/**
 
 *.hprof
 .env
 docs/site
 .linkie-cache/
 .kotlin/
+detekt.html
+detekt.md
+**/detekt.html
+**/detekt.md
+
+# Testing Paths
+/test-bot/plugins
+/config
+/data
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/copyright/EUPL_v1_2__ROI_.xml b/.idea/copyright/EUPL_v1_2__ROI_.xml
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
diff --git a/.idea/fileTemplates/JavaFXApplication.java b/.idea/fileTemplates/JavaFXApplication.java
diff --git a/.idea/fileTemplates/internal/AnnotationType.java b/.idea/fileTemplates/internal/AnnotationType.java
diff --git a/.idea/fileTemplates/internal/CSS File.css b/.idea/fileTemplates/internal/CSS File.css
diff --git a/.idea/fileTemplates/internal/Class.java b/.idea/fileTemplates/internal/Class.java
diff --git a/.idea/fileTemplates/internal/Enum.java b/.idea/fileTemplates/internal/Enum.java
diff --git a/.idea/fileTemplates/internal/Gant Script.gant b/.idea/fileTemplates/internal/Gant Script.gant
diff --git a/.idea/fileTemplates/internal/Gradle Build Script with wrapper.gradle b/.idea/fileTemplates/internal/Gradle Build Script with wrapper.gradle
diff --git a/.idea/fileTemplates/internal/Gradle Build Script.gradle b/.idea/fileTemplates/internal/Gradle Build Script.gradle
diff --git a/.idea/fileTemplates/internal/Groovy Annotation.groovy b/.idea/fileTemplates/internal/Groovy Annotation.groovy
diff --git a/.idea/fileTemplates/internal/Groovy Class.groovy b/.idea/fileTemplates/internal/Groovy Class.groovy