Merge pull request #6 from teogor/env/migrate-to-java-17

Migrate to Java 17

api/build.gradle.kts

@@ -13,24 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
   `kotlin-dsl`
 
-  alias(libs.plugins.winds)
-}
-
-val javaVersion = JavaVersion.VERSION_11
-java {
-  sourceCompatibility = javaVersion
-  targetCompatibility = javaVersion
-}
-
-val compileKotlin: KotlinCompile by tasks
-compileKotlin.kotlinOptions {
-  languageVersion = "1.8"
-  jvmTarget = javaVersion.toString()
+  alias(libs.plugins.teogor.winds)
 }
 
 dependencies {

build.gradle.kts

@@ -2,14 +2,18 @@ import com.diffplug.spotless.LineEnding
 import com.vanniktech.maven.publish.SonatypeHost
 import dev.teogor.winds.api.MavenPublish
 import dev.teogor.winds.api.getValue
+import dev.teogor.winds.api.model.Contributor
+import dev.teogor.winds.api.model.DependencyType
 import dev.teogor.winds.api.model.Developer
+import dev.teogor.winds.api.model.IssueManagement
 import dev.teogor.winds.api.model.LicenseType
 import dev.teogor.winds.api.model.createVersion
 import dev.teogor.winds.api.provider.Scm
+import dev.teogor.winds.gradle.tasks.impl.subprojectChildrens
 import dev.teogor.winds.gradle.utils.afterWindsPluginConfiguration
 import dev.teogor.winds.gradle.utils.attachTo
-import org.gradle.internal.classpath.Instrumented.systemProperties
 import org.jetbrains.dokka.gradle.DokkaPlugin
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 buildscript {
   repositories {
@@ -20,20 +24,32 @@ buildscript {
 
 // Lists all plugins used throughout the project without applying them.
 plugins {
-  alias(libs.plugins.kotlin.jvm) apply false
+  alias(libs.plugins.kotlin.jvm) apply true
   alias(libs.plugins.kotlin.serialization) apply false
 
-  alias(libs.plugins.winds) apply true
+  alias(libs.plugins.teogor.winds) apply true
   alias(libs.plugins.vanniktech.maven) apply true
   alias(libs.plugins.dokka) apply true
   alias(libs.plugins.spotless) apply true
   alias(libs.plugins.api.validator) apply true
 }
 
-// Explicitly set the group and version for all subprojects
-subprojects {
-  group = "dev.teogor.querent"
-  version = "1.0.0-alpha01"
+subprojectChildrens {
+  val javaVersion = JavaVersion.VERSION_17
+  java {
+    sourceCompatibility = javaVersion
+    targetCompatibility = javaVersion
+  }
+
+  val compileKotlin: KotlinCompile by tasks
+  compileKotlin.kotlinOptions {
+    jvmTarget = javaVersion.toString()
+  }
+
+  val compileTestKotlin: KotlinCompile by tasks
+  compileTestKotlin.kotlinOptions {
+    jvmTarget = javaVersion.toString()
+  }
 }
 
 winds {
@@ -60,10 +76,6 @@ winds {
       alphaRelease(1)
     }
 
-    // TODO winds
-    //  required by dokka
-    project.version = version!!.toString()
-
     inceptionYear = 2023
 
     sourceControlManagement(
@@ -86,6 +98,9 @@ winds {
 }
 
 afterWindsPluginConfiguration { winds ->
+  group = winds.mavenPublish.groupId ?: "undefined"
+  version = winds.mavenPublish.version ?: "undefined"
+
   if (!plugins.hasPlugin("com.gradle.plugin-publish")) {
     val mavenPublish: MavenPublish by winds
     if (mavenPublish.canBePublished) {

gradle-plugin/build.gradle.kts

@@ -14,27 +14,13 @@
  * limitations under the License.
  */
 
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
   `kotlin-dsl`
   alias(libs.plugins.gradle.publish)
   alias(libs.plugins.build.config)
   alias(libs.plugins.kotlin.serialization)
 
-  alias(libs.plugins.winds)
-}
-
-val javaVersion = JavaVersion.VERSION_11
-java {
-  sourceCompatibility = javaVersion
-  targetCompatibility = javaVersion
-}
-
-val compileKotlin: KotlinCompile by tasks
-compileKotlin.kotlinOptions {
-  languageVersion = "1.8"
-  jvmTarget = javaVersion.toString()
+  alias(libs.plugins.teogor.winds)
 }
 
 dependencies {
@@ -79,6 +65,8 @@ winds {
 buildConfig {
   packageName("dev.teogor.querent")
 
-  buildConfigField("String", "NAME", "\"${group}\"")
-  buildConfigField("String", "VERSION", "\"${version}\"")
+  afterEvaluate {
+    buildConfigField("String", "NAME", "\"${group}\"")
+    buildConfigField("String", "VERSION", "\"${version}\"")
+  }
 }

gradle/libs.versions.toml

@@ -14,7 +14,7 @@ kotlinx-serialization-json = "1.5.1"
 ksp = "1.9.0-1.0.13"
 spotless = "6.20.0"
 vanniktech-maven-plugin = "0.25.3"
-winds = "1.0.0-alpha03"
+teogor-winds = "1.0.0-beta02"
 xenoglot-bom = "1.0.0-alpha01"
 
 [libraries]
@@ -45,6 +45,6 @@ kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
 vanniktech-maven = { id = "com.vanniktech.maven.publish", version.ref = "vanniktech-maven-plugin" }
-winds = { id = "dev.teogor.winds", version.ref = "winds" }
+teogor-winds = { id = "dev.teogor.winds", version.ref = "teogor-winds" }
 
 [bundles]