Merge branch 'root' into mappings-storage-unit

.editorconfig

@@ -0,0 +1,12 @@
+root = true
+
+[*]
+charset = utf-8
+insert_final_newline = true
+indent_style = tab
+trim_trailing_whitespace = true
+max_line_length = 120
+
+[*.yml]
+indent_style = space
+indent_size = 2

.github/dependabot.yml

@@ -0,0 +1,15 @@
+version: 2
+enable-beta-ecosystems: true
+
+updates:
+  - package-ecosystem: "gradle"
+    directory: "/"
+
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+
+    schedule:
+      interval: "weekly"

.github/workflows/ci.yml

@@ -7,19 +7,21 @@ on:
       - "root"
 
   pull_request:
+  merge_group:
 
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
 
       - name: Set up Java
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
 
         with:
-          java-version: 1.14
+          java-version: 17
+          distribution: temurin
 
       - name: Set up Gradle properties
         run: |
@@ -32,21 +34,21 @@ jobs:
           arguments: checkLicenses build
 
       - name: Upload artifact (Extra Module JARs)
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
 
         with:
           name: JARs (Extra Modules)
           path: extra-modules/*/build/libs/*.jar
 
       - name: Upload artifact (Main JARs)
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
 
         with:
           name: JARs (Main)
           path: kord-extensions/build/libs/*.jar
 
       - name: Upload artifact (Module JARs)
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
 
         with:
           name: JARs (Modules)

.github/workflows/publish.yml

@@ -5,18 +5,22 @@ on:
     branches:
       - "root"
 
+permissions:
+  contents: write
+
 jobs:
   publish:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
 
       - name: Set up Java
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
 
         with:
-          java-version: 1.14
+          java-version: 17
+          distribution: temurin
 
       - name: Set up Kotlin
         uses: fwilhe2/setup-kotlin@main
@@ -42,6 +46,7 @@ jobs:
 
         with:
           arguments: checkLicenses build
+          dependency-graph: generate-and-submit
 
       - name: Disable parallel publish
         if: contains(steps.project-version.outputs.version, '-SNAPSHOT')
@@ -64,21 +69,21 @@ jobs:
           arguments: publish --no-parallel
 
       - name: Upload artifact (Extra Module JARs)
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
 
         with:
           name: JARs (Extra Modules)
           path: extra-modules/*/build/libs/*.jar
 
       - name: Upload artifact (Main JARs)
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
 
         with:
           name: JARs (Main)
           path: kord-extensions/build/libs/*.jar
 
       - name: Upload artifact (Module JARs)
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
 
         with:
           name: JARs (Modules)

.github/workflows/tag.yml

@@ -10,13 +10,14 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
 
       - name: Set up Java
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
 
         with:
-          java-version: 1.14
+          java-version: 17
+          distribution: temurin
 
       - name: Set up Kotlin
         uses: fwilhe2/setup-kotlin@main
@@ -29,7 +30,7 @@ jobs:
           echo -e "\nsigning.gnupg.passphrase=${{ secrets.GPG_PASSWORD }}" >> ~/.gradle/gradle.properties
 
       - name: Set up git credentials
-        uses: oleksiyrudenko/gha-git-credentials@v2-latest
+        uses: oleksiyrudenko/gha-git-credentials@v2
 
         with:
           global: true
@@ -82,21 +83,21 @@ jobs:
           WEBHOOK_URL: ${{ secrets.WEBHOOK_URL }}
 
       - name: Upload artifact (Extra Module JARs)
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
 
         with:
           name: JARs (Extra Modules)
           path: extra-modules/*/build/libs/*.jar
 
       - name: Upload artifact (Main JARs)
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
 
         with:
           name: JARs (Main)
           path: kord-extensions/build/libs/*.jar
 
       - name: Upload artifact (Module JARs)
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
 
         with:
           name: JARs (Modules)

annotation-processor/build.gradle.kts

@@ -13,7 +13,6 @@ dependencies {
     implementation(libs.kotlin.stdlib)
 
     implementation(libs.koin.core)
-    implementation(libs.kotlinpoet)
     implementation(libs.ksp)
 
     implementation(project(":annotations"))

annotation-processor/src/main/kotlin/com/kotlindiscord/kord/extensions/modules/annotations/converters/builders/ConverterBuilderClassBuilder.kt

@@ -335,7 +335,8 @@ public class ConverterBuilderClassBuilder : KoinComponent {
                 ConverterType.COALESCING -> before.add("coalescing")
                 ConverterType.CHOICE -> after.add("choice")
 
-                ConverterType.SINGLE -> { /* Don't add anything */
+                ConverterType.SINGLE -> {
+                    /* Don't add anything */
                 }
             }
         }
@@ -378,23 +379,3 @@ public fun builderClass(body: ConverterBuilderClassBuilder.() -> Unit): Converte
 
     return builder
 }
-
-/** @suppress TODO: Remove this later, it's for testing **/
-public fun main() {
-    println(
-        builderClass {
-            name = "enum"
-            converterClass = "EnumConverter"
-            argumentType = "E"
-
-            builderGeneric = "E: Enum<E>"
-
-            builderArg("public var getter: suspend (String) -> E?")
-
-            builderField("public lateinit var typeName: String")
-            builderField("public var bundle: String? = null")
-
-            types(ConverterType.COALESCING)
-        }.result
-    )
-}

annotation-processor/src/main/kotlin/com/kotlindiscord/kord/extensions/modules/annotations/converters/builders/ConverterBuilderFunctionBuilder.kt

@@ -138,21 +138,3 @@ public fun builderFunction(body: ConverterBuilderFunctionBuilder.() -> Unit): St
 
     return builder.build()
 }
-
-/** @suppress TODO: Remove this later, it's for testing **/
-public fun main() {
-    println(
-        builderFunction {
-            functionGeneric = "E: Enum<E>"
-            builderGeneric = "E: Enum<E>"
-
-            argumentType = "E"
-            converterType = "SingleConverter"
-
-            name = "enum"
-            builderType = "EnumConverterBuilder"
-
-            builderArg("getter = { getEnum(it) }")
-        }
-    )
-}

buildSrc/build.gradle.kts

@@ -8,14 +8,15 @@ repositories {
 }
 
 dependencies {
-    implementation(kotlin("gradle-plugin", version = "1.8.20"))
-    implementation(kotlin("serialization", version = "1.8.20"))
+    implementation(kotlin("gradle-plugin", version = "1.9.10"))
+    implementation(kotlin("serialization", version = "1.9.10"))
 
     implementation("gradle.plugin.org.cadixdev.gradle", "licenser", "0.6.1")
+	implementation("com.github.ben-manes", "gradle-versions-plugin", "0.47.0")
     implementation("com.github.jakemarsden", "git-hooks-gradle-plugin", "0.0.2")
-    implementation("com.google.devtools.ksp", "com.google.devtools.ksp.gradle.plugin", "1.8.20-1.0.11")
-    implementation("io.gitlab.arturbosch.detekt", "detekt-gradle-plugin", "1.22.0")
-    implementation("org.jetbrains.dokka", "dokka-gradle-plugin", "1.8.10")
+    implementation("com.google.devtools.ksp", "com.google.devtools.ksp.gradle.plugin", "1.9.10-1.0.13")
+    implementation("io.gitlab.arturbosch.detekt", "detekt-gradle-plugin", "1.23.1")
+    implementation("org.jetbrains.dokka", "dokka-gradle-plugin", "1.9.0")
 
     implementation(gradleApi())
     implementation(localGroovy())

buildSrc/src/main/kotlin/kordex-module.gradle.kts

@@ -4,6 +4,7 @@ plugins {
     kotlin("jvm")
     kotlin("plugin.serialization")
 
+	id("com.github.ben-manes.versions")
     id("io.gitlab.arturbosch.detekt")
     id("org.cadixdev.licenser")
 }
@@ -60,7 +61,7 @@ tasks {
 
 detekt {
     buildUponDefaultConfig = true
-    config = files("$rootDir/detekt.yml")
+    config.from(files("$rootDir/detekt.yml"))
 
     autoCorrect = true
 }

buildSrc/src/main/kotlin/ksp-module.gradle.kts

@@ -18,17 +18,17 @@ idea { // We use this instead of sourceSets b/c we're all IJ users and this fixe
     module {
         // Not using += due to https://github.com/gradle/gradle/issues/8749
         sourceDirs = sourceDirs +
-            file("$buildDir/generated/ksp/main/kotlin")
+            file("${layout.buildDirectory}/generated/ksp/main/kotlin")
 
         testSources.setFrom(
-            testSources.from + file("$buildDir/generated/ksp/test/kotlin")
+            testSources.from + file("${layout.buildDirectory}/generated/ksp/test/kotlin")
         )
 
 //        testSourceDirs = testSourceDirs +
 //            file("$buildDir/generated/ksp/test/kotlin")
 
         generatedSourceDirs = generatedSourceDirs +
-            file("$buildDir/generated/ksp/main/kotlin") +
-            file("$buildDir/generated/ksp/test/kotlin")
+            file("${layout.buildDirectory}/generated/ksp/main/kotlin") +
+            file("${layout.buildDirectory}/generated/ksp/test/kotlin")
     }
 }