From ef6f303cb479452b36a8f9a321869ec0f335ae49 Mon Sep 17 00:00:00 2001 From: Teodor Grigor Date: Wed, 21 Feb 2024 06:22:31 +0200 Subject: [PATCH 1/2] Fix inconsistent JVM target compatibility in tests --- .idea/misc.xml | 1 - build.gradle.kts | 43 ++++++++++++++++++++++++++++++- demo/build.gradle.kts | 11 -------- sudoklify-common/build.gradle.kts | 15 +---------- sudoklify-core/build.gradle.kts | 15 +---------- sudoklify-ktx/build.gradle.kts | 15 +---------- sudoklify-seeds/build.gradle.kts | 15 +---------- 7 files changed, 46 insertions(+), 69 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 4fcdb7f..a430733 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,3 @@ - diff --git a/build.gradle.kts b/build.gradle.kts index efc21d5..b7493d0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,11 +3,14 @@ import com.diffplug.gradle.spotless.SpotlessPlugin 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.jetbrains.dokka.gradle.DokkaPlugin @@ -15,7 +18,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { alias(libs.plugins.jetbrains.kotlin.jvm) - alias(libs.plugins.winds) + alias(libs.plugins.teogor.winds) alias(libs.plugins.vanniktech.maven) alias(libs.plugins.jetbrains.dokka) alias(libs.plugins.spotless) @@ -33,6 +36,24 @@ val excludedProjects = listOf( "demo", ) +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 { buildFeatures { mavenPublish = true @@ -59,6 +80,13 @@ winds { ), ) + issueManagement( + IssueManagement.Git( + owner = "teogor", + repo = "sudoklify", + ), + ) + version = createVersion(1, 0, 0) { alphaRelease(4) } @@ -68,6 +96,8 @@ winds { addLicense(LicenseType.APACHE_2_0) addDeveloper(TeogorDeveloper()) + + addContributor(TeogorContributor()) } docsGenerator { @@ -107,6 +137,17 @@ data class TeogorDeveloper( override val organizationUrl: String = "https://github.com/teogor", ) : Developer +data class TeogorContributor( + override val name: String = "Teodor Grigor", + override val email: String = "open-source@teogor.dev", + override val url: String = "https://teogor.dev", + override val roles: List = listOf("Code Owner", "Developer", "Designer", "Maintainer"), + override val timezone: String = "UTC+2", + override val organization: String = "Teogor", + override val organizationUrl: String = "https://github.com/teogor", + override val properties: Map = emptyMap(), +) : Contributor + subprojects { apply() configure { diff --git a/demo/build.gradle.kts b/demo/build.gradle.kts index 1076bf5..d5fea0b 100644 --- a/demo/build.gradle.kts +++ b/demo/build.gradle.kts @@ -25,17 +25,6 @@ application { mainClass.set("MainKt") } -val javaVersion = JavaVersion.VERSION_11 -java { - sourceCompatibility = javaVersion - targetCompatibility = javaVersion -} - -val compileKotlin: KotlinCompile by tasks -compileKotlin.kotlinOptions { - jvmTarget = javaVersion.toString() -} - dependencies { implementation(project(mapOf("path" to ":sudoklify-common"))) implementation(project(mapOf("path" to ":sudoklify-core"))) diff --git a/sudoklify-common/build.gradle.kts b/sudoklify-common/build.gradle.kts index 3659a87..96e6135 100644 --- a/sudoklify-common/build.gradle.kts +++ b/sudoklify-common/build.gradle.kts @@ -14,22 +14,9 @@ * limitations under the License. */ -import org.jetbrains.kotlin.gradle.tasks.KotlinCompile - plugins { alias(libs.plugins.jetbrains.kotlin.jvm) - alias(libs.plugins.winds) -} - -val javaVersion = JavaVersion.VERSION_11 -java { - sourceCompatibility = javaVersion - targetCompatibility = javaVersion -} - -val compileKotlin: KotlinCompile by tasks -compileKotlin.kotlinOptions { - jvmTarget = javaVersion.toString() + alias(libs.plugins.teogor.winds) } winds { diff --git a/sudoklify-core/build.gradle.kts b/sudoklify-core/build.gradle.kts index 8a4982f..752d56d 100644 --- a/sudoklify-core/build.gradle.kts +++ b/sudoklify-core/build.gradle.kts @@ -14,22 +14,9 @@ * limitations under the License. */ -import org.jetbrains.kotlin.gradle.tasks.KotlinCompile - plugins { alias(libs.plugins.jetbrains.kotlin.jvm) - alias(libs.plugins.winds) -} - -val javaVersion = JavaVersion.VERSION_11 -java { - sourceCompatibility = javaVersion - targetCompatibility = javaVersion -} - -val compileKotlin: KotlinCompile by tasks -compileKotlin.kotlinOptions { - jvmTarget = javaVersion.toString() + alias(libs.plugins.teogor.winds) } winds { diff --git a/sudoklify-ktx/build.gradle.kts b/sudoklify-ktx/build.gradle.kts index 7d04de7..661caf3 100644 --- a/sudoklify-ktx/build.gradle.kts +++ b/sudoklify-ktx/build.gradle.kts @@ -14,22 +14,9 @@ * limitations under the License. */ -import org.jetbrains.kotlin.gradle.tasks.KotlinCompile - plugins { alias(libs.plugins.jetbrains.kotlin.jvm) - alias(libs.plugins.winds) -} - -val javaVersion = JavaVersion.VERSION_11 -java { - sourceCompatibility = javaVersion - targetCompatibility = javaVersion -} - -val compileKotlin: KotlinCompile by tasks -compileKotlin.kotlinOptions { - jvmTarget = javaVersion.toString() + alias(libs.plugins.teogor.winds) } winds { diff --git a/sudoklify-seeds/build.gradle.kts b/sudoklify-seeds/build.gradle.kts index a43f805..eac3065 100644 --- a/sudoklify-seeds/build.gradle.kts +++ b/sudoklify-seeds/build.gradle.kts @@ -14,22 +14,9 @@ * limitations under the License. */ -import org.jetbrains.kotlin.gradle.tasks.KotlinCompile - plugins { alias(libs.plugins.jetbrains.kotlin.jvm) - alias(libs.plugins.winds) -} - -val javaVersion = JavaVersion.VERSION_11 -java { - sourceCompatibility = javaVersion - targetCompatibility = javaVersion -} - -val compileKotlin: KotlinCompile by tasks -compileKotlin.kotlinOptions { - jvmTarget = javaVersion.toString() + alias(libs.plugins.teogor.winds) } winds { From a56af23cf0bf37b0e9b459718d5e398978663453 Mon Sep 17 00:00:00 2001 From: Teodor Grigor Date: Wed, 21 Feb 2024 06:22:46 +0200 Subject: [PATCH 2/2] Updated `winds` plugin deps --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2fe0807..621518d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,7 +8,7 @@ kotlin-jvm = "1.9.22" vanniktech-maven = "0.27.0" spotless = "6.25.0" junit = "5.10.1" -winds = "1.0.0-beta01" +teogor-winds = "1.0.0-beta02" [libraries] gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" } @@ -22,4 +22,4 @@ jetbrains-dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" } jetbrains-kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin-jvm" } spotless = { id = "com.diffplug.spotless", version.ref = "spotless" } vanniktech-maven = { id = "com.vanniktech.maven.publish", version.ref = "vanniktech-maven" } -winds = { id = "dev.teogor.winds", version.ref = "winds" } +teogor-winds = { id = "dev.teogor.winds", version.ref = "teogor-winds" }