Modernization

.gitattributes

@@ -0,0 +1,2 @@
+*.bat eol=crlf
+*.sh eol=lf

build.gradle.kts

@@ -1,41 +1,36 @@
+import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
+
 plugins {
     kotlin("jvm") apply false
-    id("com.gradle.plugin-publish") version "0.21.0" apply false
-    id("org.jetbrains.dokka") version "1.4.32"
+    id("com.gradle.plugin-publish") version "1.2.1" apply false
+    id("org.jetbrains.dokka")
     id("org.asciidoctor.jvm.convert") version "3.2.0"
 }
 
 
-allprojects {
-    repositories {
-        mavenCentral()
-    }
-}
-
-
 subprojects {
 
-    plugins.withType<JavaGradlePluginPlugin> {
-        dependencies {
-            "compileOnly"(kotlin("stdlib-jdk8"))
-        }
-
-        with(the<GradlePluginDevelopmentExtension>()) {
-            isAutomatedPublishing = true
-        }
+    plugins.withType<JavaPlugin> {
 
-        with(the<JavaPluginExtension>()) {
+        configure<JavaPluginExtension> {
             withSourcesJar()
             withJavadocJar()
-
-            sourceCompatibility = JavaVersion.VERSION_1_8
-            targetCompatibility = JavaVersion.VERSION_1_8
         }
     }
 
 
     plugins.withId("org.jetbrains.kotlin.jvm") {
 
+        configure<KotlinJvmProjectExtension> {
+
+            jvmToolchain(11)
+
+            compilerOptions {
+                freeCompilerArgs.add("-Xjvm-default=all")
+            }
+        }
+
+
         configurations.all {
             resolutionStrategy.eachDependency {
                 if (requested.group == "org.jetbrains.kotlin") {
@@ -45,19 +40,17 @@ subprojects {
         }
 
         dependencies {
-            "testImplementation"(kotlin("stdlib-jdk8"))
+            "compileOnly"(kotlin("stdlib"))
+
+            "testImplementation"(kotlin("stdlib"))
             "testImplementation"(kotlin("reflect"))
 
-            "testImplementation"("com.willowtreeapps.assertk:assertk-jvm:0.23")
-            "testImplementation"("io.mockk:mockk:1.10.0")
-            "testImplementation"("org.spekframework.spek2:spek-dsl-jvm:2.0.9")
-            "testRuntimeOnly"("org.spekframework.spek2:spek-runner-junit5:2.0.9")
+            "testImplementation"(libs.assertk)
+            "testImplementation"(libs.mockk)
+            "testImplementation"(libs.spek.dsl)
+            "testRuntimeOnly"(libs.spek.runner)
         }
 
-        tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-            kotlinOptions.jvmTarget = "1.8"
-            kotlinOptions.freeCompilerArgs = listOf("-Xjvm-default=enable")
-        }
 
         tasks.withType<Test> {
             // always execute tests
@@ -83,8 +76,9 @@ subprojects {
 
     plugins.withId("org.jetbrains.dokka") {
 
+        val dokkaVersion: String by extra
         dependencies {
-            "dokkaJavadocPlugin"("org.jetbrains.dokka:kotlin-as-java-plugin:1.4.32")
+            "dokkaJavadocPlugin"("org.jetbrains.dokka:kotlin-as-java-plugin:$dokkaVersion")
         }
 
         tasks.withType<Jar>().matching { it.name == "javadocJar" || it.name == "publishPluginJavaDocsJar" }
@@ -127,16 +121,19 @@ subprojects {
     }
 
 
-    plugins.withId("com.gradle.plugin-publish") {
+    plugins.withType<JavaGradlePluginPlugin>() {
 
         val githubUrl = project.extra["github.url"] as String
 
-        with(the<com.gradle.publish.PluginBundleExtension>()) {
+        @Suppress("UnstableApiUsage")
+        with(the<GradlePluginDevelopmentExtension>()) {
+            website.set(githubUrl)
+            vcsUrl.set(githubUrl)
+            isAutomatedPublishing = true
 
-            website = githubUrl
-            vcsUrl = githubUrl
-            description = "A suite of Gradle plugins for building, publishing and managing Helm charts."
-            tags = listOf("helm")
+            plugins.all {
+                tags.add("helm")
+            }
         }
     }
 }

gradle.properties

@@ -4,3 +4,5 @@ version=1.7.0
 test.maxParallelForks=4
 
 github.url=https://github.com/unbroken-dome/gradle-helm-plugin
+
+dokkaVersion=1.8.20

gradle/libs.versions.toml

@@ -0,0 +1,33 @@
+[versions]
+
+jackson = "2.15.2"
+okhttp = "4.10.0"
+plugin-utils = "0.5.0"
+
+
+# Test libraries
+
+spek = "2.0.19"
+
+
+[libraries]
+
+jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version = "2.15.2" }
+jackson-dataformat-yaml = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml", version = "2.15.2" }
+json = { module = "org.json:json", version = "20230618" }
+jsonpath = { module = "com.jayway.jsonpath:json-path", version = "2.8.0" }
+okhttp-core = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
+okhttp-tls = { module = "com.squareup.okhttp3:okhttp-tls", version.ref = "okhttp" }
+plugin-utils = { module = "org.unbroken-dome.gradle-plugin-utils:gradle-plugin-utils", version.ref = "plugin-utils" }
+snakeyaml = { module = "org.yaml:snakeyaml", version = "2.1" }
+
+
+
+# Test libraries
+
+assertk = { module = "com.willowtreeapps.assertk:assertk-jvm", version = "0.26.1" }
+mockk = { module = "io.mockk:mockk", version = "1.13.7" }
+okhttp-mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "okhttp" }
+plugin-testutils = { module = "org.unbroken-dome.gradle-plugin-utils:gradle-plugin-test-utils", version.ref = "plugin-utils" }
+spek-dsl = { module = "org.spekframework.spek2:spek-dsl-jvm", version.ref = "spek" }
+spek-runner = { module = "org.spekframework.spek2:spek-runner-junit5", version.ref = "spek" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists