fix extension creation (#15)

.github/workflows/ci.yml

@@ -19,7 +19,7 @@ jobs:
     steps:
       - uses: actions/[email protected]
         with:
-          fetch-depth: '0'  # https://github.com/shipkit/shipkit-auto-version#fetch-depth-on-ci
+          fetch-depth: "0" # https://github.com/shipkit/shipkit-auto-version#fetch-depth-on-ci
       - name: Gradle wrapper validation
         uses: gradle/[email protected]
 
@@ -30,7 +30,7 @@ jobs:
     steps:
       - uses: actions/[email protected]
         with:
-          fetch-depth: '0'  # https://github.com/shipkit/shipkit-auto-version#fetch-depth-on-ci
+          fetch-depth: "0" # https://github.com/shipkit/shipkit-auto-version#fetch-depth-on-ci
       - name: Run build
         run: .\gradlew.bat build --continue
 
@@ -41,7 +41,7 @@ jobs:
     steps:
       - uses: actions/[email protected]
         with:
-          fetch-depth: '0'  # https://github.com/shipkit/shipkit-auto-version#fetch-depth-on-ci
+          fetch-depth: "0" # https://github.com/shipkit/shipkit-auto-version#fetch-depth-on-ci
       - name: Make gradlew Executable
         run: chmod +x ./gradlew
       - name: Run build

.github/workflows/mega-linter.yml

@@ -3,6 +3,8 @@
 # More info at https://megalinter.github.io
 name: MegaLinter
 
+# cSpell:words megalinter stefanzweifel
+
 on:
   # Trigger mega-linter at every push. Action will also be visible from Pull Requests to master
   push: # Comment this line to trigger action only on pull-requests (not recommended if you don't pay for GH Actions)

.mega-linter.yml

@@ -6,7 +6,7 @@ DEFAULT_BRANCH: main # Usually master or main
 # ENABLE: # If you use ENABLE variable, all other languages/formats/tooling-formats will be disabled by default
 # ENABLE_LINTERS: # If you use ENABLE_LINTERS variable, all other linters will be disabled by default
 # DISABLE:
-  # - COPYPASTE # Uncomment to disable checks of excessive copy-pastes
-  # - SPELL # Uncomment to disable checks of spelling mistakes
+# - COPYPASTE # Uncomment to disable checks of excessive copy-pastes
+# - SPELL # Uncomment to disable checks of spelling mistakes
 SHOW_ELAPSED_TIME: true
 FILEIO_REPORTER: false

README.md

@@ -40,7 +40,7 @@ The `dev.mythicdrops.gradle.project.base` plugin will configure the following wh
 
 - Applies the [`nebula.project`](https://github.com/nebula-plugins/nebula-project-plugin) Gradle plugin
 - Applies the [`com.adarshr.test-logger`](https://github.com/radarsh/gradle-test-logger-plugin) Gradle plugin
-    - Configures the `com.adarshr.test-logger` plugin to use
+  - Configures the `com.adarshr.test-logger` plugin to use
       the [Mocha theme](https://github.com/radarsh/gradle-test-logger-plugin#mocha-theme)
 - Configures all test tasks to use JUnit Jupiter
 
@@ -87,7 +87,7 @@ has the `java` plugin applied:
 - Configures the project to compile targeting JDK 16
 - Configures the project to pass the `-parameters` javac flag when compiling
 - Applies the [`jacoco`](https://docs.gradle.org/current/userguide/jacoco_plugin.html) Gradle plugin
-    - Configures the `jacoco` plugin to use JaCoCo 0.8.7
+  - Configures the `jacoco` plugin to use JaCoCo 0.8.7
 - Configures tests to be finalized by running a JaCoCo code coverage report
 
 #### Usage
@@ -109,7 +109,7 @@ also has the `org.jetbrains.kotlin.jvm` plugin applied:
 - Configures the project to pass the `-parameters` javac flag when compiling
 - Applies the [`detekt`](https://detekt.github.io/detekt/gradle.html) Gradle plugin
 - Applies the [`ktlint`](https://github.com/JLLeitschuh/ktlint-gradle) Gradle plugin
-    - Configures the `ktlint` plugin to use KTLint 0.43.0
+  - Configures the `ktlint` plugin to use KTLint 0.43.0
 - Applies the [`dokka`](https://github.com/Kotlin/dokka) Gradle plugin
 - Configures Javadoc JARs to include dokka output
 

renovate.json

@@ -1,5 +1,3 @@
 {
-  "extends": [
-    "config:base"
-  ]
+  "extends": ["config:base"]
 }

src/main/kotlin/dev/mythicdrops/gradle/ExtensionContainers.kt

@@ -0,0 +1,9 @@
+package dev.mythicdrops.gradle
+
+import dev.mythicdrops.gradle.conventions.MythicDropsJavaExtension
+import org.gradle.api.plugins.ExtensionContainer
+import org.gradle.kotlin.dsl.create
+import org.gradle.kotlin.dsl.findByType
+
+fun ExtensionContainer.findOrCreateMythicDropsJavaExtension(): MythicDropsJavaExtension =
+    findByType() ?: create("mythicDropsJava")

src/main/kotlin/dev/mythicdrops/gradle/conventions/MythicDropsJavaExtension.kt

@@ -0,0 +1,12 @@
+package dev.mythicdrops.gradle.conventions
+
+import org.gradle.api.JavaVersion
+
+/**
+ * Configuration for selecting which version of Java to compile for.
+ *
+ * @property javaVersion Version of Java to compile for (e.g., Java 16/17)
+ */
+open class MythicDropsJavaExtension {
+    var javaVersion: String = JavaVersion.VERSION_16.majorVersion
+}

src/main/kotlin/dev/mythicdrops/gradle/conventions/MythicDropsJavaPlugin.kt

@@ -1,5 +1,6 @@
 package dev.mythicdrops.gradle.conventions
 
+import dev.mythicdrops.gradle.findOrCreateMythicDropsJavaExtension
 import org.gradle.api.Project
 import org.gradle.api.plugins.JavaPluginExtension
 import org.gradle.api.tasks.compile.JavaCompile
@@ -15,23 +16,13 @@ import org.gradle.testing.jacoco.tasks.JacocoReport
  * Plugin that configures Java for JDK 16 and enables JaCoCo.
  */
 open class MythicDropsJavaPlugin : DependentPlugin("Java", "java") {
-    companion object {
-        /**
-         * Version of Java supported by the plugin.
-         */
-        const val JAVA_VERSION = 16
-
-        /**
-         * Version of Java supported by the plugin.
-         */
-        val javaLanguageVersion = JavaLanguageVersion.of(JAVA_VERSION)
-    }
-
     override fun configureProject(target: Project) {
+        val javaExtension = target.extensions.findOrCreateMythicDropsJavaExtension()
+
         // target JDK 16
         target.configure<JavaPluginExtension> {
             toolchain {
-                languageVersion.set(javaLanguageVersion)
+                languageVersion.set(JavaLanguageVersion.of(javaExtension.javaVersion))
             }
         }
 

src/main/kotlin/dev/mythicdrops/gradle/conventions/MythicDropsKotlinJvmPlugin.kt

@@ -1,8 +1,10 @@
 package dev.mythicdrops.gradle.conventions
 
+import dev.mythicdrops.gradle.findOrCreateMythicDropsJavaExtension
 import io.gitlab.arturbosch.detekt.DetektPlugin
 import org.gradle.api.Project
 import org.gradle.api.tasks.bundling.Jar
+import org.gradle.jvm.toolchain.JavaLanguageVersion
 import org.gradle.jvm.toolchain.JavaToolchainSpec
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.getByName
@@ -19,6 +21,8 @@ import org.jlleitschuh.gradle.ktlint.KtlintPlugin
  */
 open class MythicDropsKotlinJvmPlugin : DependentPlugin("Kotlin JVM", "org.jetbrains.kotlin.jvm") {
     override fun configureProject(target: Project) {
+        val javaExtension = target.extensions.findOrCreateMythicDropsJavaExtension()
+
         // apply plugins
         target.pluginManager.apply(DetektPlugin::class.java)
         target.pluginManager.apply(DokkaPlugin::class.java)
@@ -27,7 +31,7 @@ open class MythicDropsKotlinJvmPlugin : DependentPlugin("Kotlin JVM", "org.jetbr
         // configure kotlin to use JDK 16
         target.configure<KotlinJvmProjectExtension> {
             jvmToolchain {
-                (this as JavaToolchainSpec).languageVersion.set(MythicDropsJavaPlugin.javaLanguageVersion)
+                (this as JavaToolchainSpec).languageVersion.set(JavaLanguageVersion.of(javaExtension.javaVersion))
             }
         }
 

version.properties

@@ -1 +1 @@
-version=2.1.*
+version=2.2.*