Update dependencies

Galarzaa90 · Feb 24, 2025 · 395bfcd · 395bfcd
1 parent 5e6c94e
commit 395bfcd
Show file tree

Hide file tree

Showing 9 changed files with 84 additions and 62 deletions.
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Allan Galarza
+ * Copyright © 2025 Allan Galarza
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,9 +42,9 @@ allprojects {
     }
 }
 
-tasks.dokkaHtmlMultiModule.configure {
-    outputDirectory.set(buildDir.resolve("dokka"))
-
+dependencies {
+    dokka(project(":tibiakt-core:"))
+    dokka(project(":tibiakt-client:"))
 }
 
 sonarqube {

diff --git a/detekt.yml b/detekt.yml
@@ -78,6 +78,7 @@ comments:
     searchInInnerClass: false
     searchInInnerObject: true
     searchInInnerInterface: true
+    ignoreDefaultCompanionObject: true
   UndocumentedPublicFunction:
     active: true
     excludes: [ '**/test/**', '**/builders/**' ]

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 #
-# Copyright © 2023 Allan Galarza
+# Copyright © 2025 Allan Galarza
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,3 +15,4 @@
 #
 kotlin.code.style=official
 org.gradle.jvmargs=-XX:MaxMetaspaceSize=512m
+org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 #
-# Copyright © 2024 Allan Galarza
+# Copyright © 2025 Allan Galarza
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,6 +16,6 @@
 
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Allan Galarza
+ * Copyright © 2025 Allan Galarza
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,20 +25,21 @@ include("tibiakt-server")
 dependencyResolutionManagement {
     versionCatalogs {
         create("libs") {
-            plugin("gradle-versions", "com.github.ben-manes.versions").version("0.51.0")
-            plugin("detekt", "io.gitlab.arturbosch.detekt").version("1.23.6")
-            plugin("dokka", "org.jetbrains.dokka").version("1.9.20")
-            plugin("sonarqube", "org.sonarqube").version("5.1.0.4882")
-            plugin("kover", "org.jetbrains.kotlinx.kover").version("0.8.3")
+            plugin("gradle-versions", "com.github.ben-manes.versions").version("0.52.0")
+            plugin("detekt", "io.gitlab.arturbosch.detekt").version("1.23.8")
+            plugin("dokka", "org.jetbrains.dokka").version("2.0.0")
+            plugin("sonarqube", "org.sonarqube").version("6.0.1.5171")
+            plugin("kover", "org.jetbrains.kotlinx.kover").version("0.9.1")
 
-            version("jsoup", "1.18.1")
+            version("kotlin", "2.1.10")
+
+            version("jsoup", "1.18.3")
             version("kotest", "5.9.1")
-            version("kotlin", "2.0.21")
             version("kotlinLogging", "3.0.5")
-            version("kotlinxDatetime", "0.6.1")
-            version("kotlinxSerialization", "1.7.3")
-            version("ktor", "3.0.1")
-            version("logback", "1.5.12")
+            version("kotlinxDatetime", "0.6.2")
+            version("kotlinxSerialization", "1.8.0")
+            version("ktor", "3.1.4")
+            version("logback", "1.5.16")
 
             library("kotlinx-datetime", "org.jetbrains.kotlinx", "kotlinx-datetime").versionRef("kotlinxDatetime")
             library("kotlinx-serialization-json", "org.jetbrains.kotlinx", "kotlinx-serialization-json").versionRef("kotlinxSerialization")

diff --git a/tibiakt-client/build.gradle.kts b/tibiakt-client/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Allan Galarza
+ * Copyright © 2025 Allan Galarza
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import java.net.URL
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 
 apply("../publish.gradle.kts")
@@ -23,7 +23,7 @@ apply("../publish.gradle.kts")
 plugins {
     kotlin("jvm")
     kotlin("plugin.serialization")
-    id("org.jetbrains.dokka")
+    alias(libs.plugins.dokka)
     id("io.gitlab.arturbosch.detekt")
     id("org.jetbrains.kotlinx.kover")
 }
@@ -43,28 +43,28 @@ dependencies {
     testImplementation(libs.ktor.client.mock)
 }
 
-tasks.withType<org.jetbrains.dokka.gradle.DokkaTaskPartial>().configureEach {
-    dokkaSourceSets {
-        configureEach {
-            includes.from("Module.md")
-            sourceLink {
-                localDirectory.set(file("src/main/kotlin"))
-                remoteUrl.set(URL("https://github.com/Galarzaa90/TibiaKt/blob/main/tibiakt-client/src/main/kotlin"))
-                remoteLineSuffix.set("#L")
-            }
-            externalDocumentationLink {
-                url.set(URL("https://api.ktor.io/"))
-            }
+
+
+dokka {
+    dokkaSourceSets.main {
+        includes.from("Module.md")
+        sourceLink {
+            localDirectory.set(file("src/main/kotlin"))
+            remoteUrl("https://github.com/Galarzaa90/TibiaKt/blob/main/tibiakt-client/src/main/kotlin")
+            remoteLineSuffix.set("#L")
+        }
+        externalDocumentationLinks {
+            uri("https://api.ktor.io/")
         }
     }
 }
 
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
-    kotlinOptions.freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
-}
 
 kotlin {
     explicitApi()
+    compilerOptions {
+        jvmTarget = JvmTarget.JVM_1_8
+    }
 }
 
 detekt {

diff --git a/tibiakt-core/build.gradle.kts b/tibiakt-core/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2024 Allan Galarza
+ * Copyright © 2025 Allan Galarza
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-import java.net.URL
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 
 apply("../publish.gradle.kts")
 
 plugins {
     kotlin("jvm")
     kotlin("plugin.serialization")
-    id("org.jetbrains.dokka")
+    alias(libs.plugins.dokka)
     id("io.gitlab.arturbosch.detekt")
     id("org.jetbrains.kotlinx.kover")
 }
@@ -40,33 +40,33 @@ dependencies {
 }
 
 
-tasks.withType<org.jetbrains.dokka.gradle.DokkaTaskPartial>().configureEach {
-    dokkaSourceSets {
-        configureEach {
-            includes.from("Module.md")
-            sourceLink {
-                localDirectory.set(file("src/main/kotlin"))
-                remoteUrl.set(URL("https://github.com/Galarzaa90/TibiaKt/blob/main/tibiakt-core/src/main/kotlin"))
-                remoteLineSuffix.set("#L")
-            }
-            externalDocumentationLink {
-                url.set(URL("https://api.ktor.io/"))
-            }
+dokka {
+    dokkaSourceSets.main {
+        includes.from("Module.md")
+        sourceLink {
+            localDirectory.set(file("src/main/kotlin"))
+            remoteUrl("https://github.com/Galarzaa90/TibiaKt/blob/main/tibiakt-core/src/main/kotlin")
+            remoteLineSuffix.set("#L")
+        }
+        externalDocumentationLinks {
+            uri("https://api.ktor.io/")
         }
     }
 }
 
+
+
 kotlin {
     explicitApi()
+    compilerOptions {
+        jvmTarget = JvmTarget.JVM_1_8
+    }
 }
 
 detekt {
     config.setFrom(file(rootProject.file("detekt.yml")))
 }
 
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-    kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()
-}
 
 java {
     sourceCompatibility = JavaVersion.VERSION_1_8

diff --git a/tibiakt-server/build.gradle.kts b/tibiakt-server/build.gradle.kts
@@ -1,3 +1,21 @@
+/*
+ * Copyright © 2025 Allan Galarza
+ *
+ * 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 org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 /*
  * Copyright © 2023 Allan Galarza
  *
@@ -46,15 +64,16 @@ tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {
     archiveFileName.set("tibiatk-server-shadow.jar")
 }
 
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-    kotlinOptions.freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
-}
 
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-    kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()
-}
 
 java {
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
 }
+
+kotlin {
+    compilerOptions {
+        jvmTarget = JvmTarget.JVM_1_8
+        freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn")
+    }
+}