Skip to content

Build and release fixes #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 2, 2022
Merged

Build and release fixes #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0a32eb4
make buildSrc use the same jvm and Kotlin versions as main project
aSemy Jun 2, 2022
2035c42
bump qoomon git versioning,
aSemy Jun 2, 2022
338726f
allow 'tags on branches'
aSemy Jun 2, 2022
78ec46f
rm unneeded project-report plugin from buildSrc
aSemy Jun 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import buildsrc.config.excludeGeneratedGradleDsl
plugins {
base
idea
id("me.qoomon.git-versioning") version "5.1.5"
id("me.qoomon.git-versioning")
id("org.jetbrains.kotlinx.kover")
}

Expand All @@ -12,6 +12,7 @@ project.group = "dev.adamko.kxstsgen"
project.version = "0.0.0-SNAPSHOT"
gitVersioning.apply {
refs {
considerTagsOnBranches = true
branch(".+") { version = "\${ref}-SNAPSHOT" }
tag("v(?<version>.*)") { version = "\${ref.version}" }
}
Expand Down
23 changes: 14 additions & 9 deletions buildSrc/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
idea
`kotlin-dsl`
kotlin("jvm") version "1.6.20"
`project-report`
kotlin("jvm") version "1.6.21"
}


Expand All @@ -23,17 +22,17 @@ dependencies {
implementation(libs.kotlinx.knit.gradlePlugin)

implementation(libs.gradleNodePlugin)

implementation(libs.qoomonGitVersioning)
}

val gradleJvmTarget = "11"
val gradleKotlinTarget = "1.6"

tasks.withType<KotlinCompile>().configureEach {

kotlinOptions {
jvmTarget = gradleJvmTarget
apiVersion = gradleKotlinTarget
languageVersion = gradleKotlinTarget
jvmTarget = libs.versions.jvmTarget.get()
apiVersion = libs.versions.kotlinTarget.get()
languageVersion = libs.versions.kotlinTarget.get()
}

kotlinOptions.freeCompilerArgs += listOf(
Expand All @@ -45,11 +44,17 @@ tasks.withType<KotlinCompile>().configureEach {

kotlin {
jvmToolchain {
(this as JavaToolchainSpec).languageVersion.set(JavaLanguageVersion.of(gradleJvmTarget))
(this as JavaToolchainSpec).languageVersion.set(
libs.versions.jvmTarget.map {
JavaLanguageVersion.of(
it.substringAfter(".")
)
}
)
}

kotlinDslPluginOptions {
jvmTarget.set(gradleJvmTarget)
jvmTarget.set(libs.versions.jvmTarget)
}
}

Expand Down
6 changes: 6 additions & 0 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ classgraph = "4.8.143"

gradleNodePlugin = "3.3.0"

#qoomonGitVersioning = "6.1.1" // bugged: https://github.com/qoomon/gradle-git-versioning-plugin/issues/76
qoomonGitVersioning = "5.2.0"

[libraries]

kotlin-bom = { group = "org.jetbrains.kotlin", name = "kotlin-bom", version.ref = "kotlin" }
Expand Down Expand Up @@ -68,6 +71,9 @@ kotlinx-knit = { group = "org.jetbrains.kotlinx", name = "kotlinx-knit", version
kotlinx-knit-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-knit-test", version.ref = "kotlinx-knit" }
kotlinx-knit-gradlePlugin = { group = "org.jetbrains.kotlinx", name = "kotlinx-knit", version.ref = "kotlinx-knit" }


qoomonGitVersioning = { group = "me.qoomon", name = "gradle-git-versioning-plugin", version.ref = "qoomonGitVersioning" }

[bundles]

[plugins]