code improvements

buildSrc/src/main/kotlin/org/mjdev/gradle/extensions/JavaVersionExt.kt

@@ -0,0 +1,13 @@
+/*
+ *  Copyright (c) Milan Jurkulák 2024.
+ *  Contact:
+ *  e: mimoccc@gmail.com
+ *  e: mj@mjdev.org
+ *  w: https://mjdev.org
+ */
+
+package org.mjdev.gradle.extensions
+
+import org.gradle.api.JavaVersion
+
+fun JavaVersion.asInt(): Int = toString().toIntOrNull() ?: 17

buildSrc/src/main/kotlin/org/mjdev/gradle/plugin/AppPlugin.kt

@@ -28,6 +28,7 @@ import org.jmailen.gradle.kotlinter.KotlinterExtension
 import org.jmailen.gradle.kotlinter.KotlinterPlugin
 import org.mjdev.gradle.base.BasePlugin
 import org.mjdev.gradle.plugin.config.AppConfig
+import org.mjdev.gradle.extensions.asInt
 
 @Suppress("UnstableApiUsage")
 class AppPlugin : BasePlugin() {
@@ -204,7 +205,7 @@ class AppPlugin : BasePlugin() {
                     reportUndocumented.set(true)
                     skipEmptyPackages.set(false)
                     platform.set(Platform.jvm)
-                    jdkVersion.set(17)
+                    jdkVersion.set(projectJavaVersion.asInt())
                     noStdlibLink.set(false)
                     noJdkLink.set(false)
                     noAndroidSdkLink.set(false)

buildSrc/src/main/kotlin/org/mjdev/gradle/plugin/LibPlugin.kt

@@ -21,6 +21,7 @@ import org.jmailen.gradle.kotlinter.KotlinterExtension
 import org.jmailen.gradle.kotlinter.KotlinterPlugin
 import org.mjdev.gradle.base.BasePlugin
 import org.mjdev.gradle.plugin.config.LibConfig
+import org.mjdev.gradle.extensions.asInt
 
 @Suppress("UnstableApiUsage")
 class LibPlugin : BasePlugin() {
@@ -144,7 +145,7 @@ class LibPlugin : BasePlugin() {
                     reportUndocumented.set(true)
                     skipEmptyPackages.set(false)
                     platform.set(Platform.jvm)
-                    jdkVersion.set(17)
+                    jdkVersion.set(projectJavaVersion.asInt())
                     noStdlibLink.set(false)
                     noJdkLink.set(false)
                     noAndroidSdkLink.set(false)

buildSrc/src/main/kotlin/org/mjdev/gradle/plugin/config/AppConfig.kt

@@ -12,6 +12,6 @@ open class AppConfig {
     open var autoCorrectCode = false
     open var createDocumentation = false
 
-    open var documentationDir = "documentation"
+    open var documentationDir = "documentation/app"
     open var detectConfigFile = "config/detekt.ym"
 }

buildSrc/src/main/kotlin/org/mjdev/gradle/plugin/config/LibConfig.kt

@@ -12,6 +12,6 @@ open class LibConfig {
     open var autoCorrectCode = false
     open var createDocumentation = false
 
-    open var documentationDir = "documentation"
+    open var documentationDir = "documentation/lib"
     open var detectConfigFile = "config/detekt.ym"
 }

config/version.prop

@@ -1,5 +1,5 @@
 #
-#  Copyright (c) Milan Jurkulák 2024.
+#  Copyright (c) Milan Jurkul�k 2024.
 #  Contact:
 #  e: mimoccc@gmail.com
 #  e: mj@mjdev.org
@@ -7,4 +7,4 @@
 #
 majorVersion=1
 minorVersion=2
-patchVersion=4
+patchVersion=5