Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
// plugins we use in all gradle projects
id("build-logic.build-params")
id("com.github.vlsi.gradle-extensions")
// enable to analyse task dependencies
// plugins we use in all gradle projects
id("build-logic.build-params")
id("com.github.vlsi.gradle-extensions")
// enable to analyse task dependencies
// id("com.dorongold.task-tree")
}
66 changes: 33 additions & 33 deletions gradle/build-logic/build-parameters/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,47 +1,47 @@
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion

plugins {
id("build-logic.kotlin-dsl-gradle-plugin")
id("build-logic.kotlin-dsl-gradle-plugin")
alias(buildLibs.plugins.build.parameters)
}

buildParameters {
pluginId("build-logic.build-params")
pluginId("build-logic.build-params")

// Other plugins can contribute parameters, so below list is not exhaustive, hence we disable the validation
enableValidation.set(false)
// Other plugins can contribute parameters, so below list is not exhaustive, hence we disable the validation
enableValidation.set(false)

val defaultJdkVersion = 11
integer("defaultJdkVersion") {
defaultValue.set(defaultJdkVersion)
mandatory.set(true)
description.set("Default jdk version for source and target compatibility")
}
val defaultJdkVersion = 11
integer("defaultJdkVersion") {
defaultValue.set(defaultJdkVersion)
mandatory.set(true)
description.set("Default jdk version for source and target compatibility")
}

group("kotlin") {
string("version") {
fromEnvironment()
string("version") {
fromEnvironment()
// we use enumEntries which is only available since 1.9, thus min requirement 1.9
defaultValue.set(KotlinVersion.KOTLIN_1_9.version)
description.set("kotlin version used for apiVersion and languageVersion")
}
bool("werror") {
defaultValue.set(true)
description.set("Treat kotlinc warnings as errors")
}
}


group("java") {
integer("version") {
fromEnvironment()
defaultValue.set(defaultJdkVersion)
description.set("Java version used for java.toolchain")
}
bool("werror") {
defaultValue.set(true)
description.set("Treat javac, javadoc, warnings as errors")
}
}
defaultValue.set(KotlinVersion.KOTLIN_1_9.version)
description.set("kotlin version used for apiVersion and languageVersion")
}
bool("werror") {
defaultValue.set(true)
description.set("Treat kotlinc warnings as errors")
}
}


group("java") {
integer("version") {
fromEnvironment()
defaultValue.set(defaultJdkVersion)
description.set("Java version used for java.toolchain")
}
bool("werror") {
defaultValue.set(true)
description.set("Treat javac, javadoc, warnings as errors")
}
}

}
4 changes: 2 additions & 2 deletions gradle/build-logic/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
`embedded-kotlin` apply false
`embedded-kotlin` apply false
}

allprojects {
group = "com.tegonal.variist.build-logic"
group = "com.tegonal.variist.build-logic"
}
4 changes: 2 additions & 2 deletions gradle/build-logic/dev/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
plugins {
id("build-logic.kotlin-dsl-gradle-plugin")
id("build-logic.kotlin-dsl-gradle-plugin")
}

dependencies {
api(projects.basics)
api(projects.basics)

api(buildLibs.kotlin)
api(buildLibs.bundles.dokka)
Expand Down
6 changes: 3 additions & 3 deletions gradle/build-logic/dev/src/main/kotlin/DokkaExtensions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import org.jetbrains.dokka.base.DokkaBaseConfiguration
import org.jetbrains.dokka.gradle.AbstractDokkaTask

fun AbstractDokkaTask.configurePlugins() {
pluginConfiguration<DokkaBase, DokkaBaseConfiguration> {
footerMessage = "Variist &copy; Copyright <a href=\"https://tegonal.com\">Tegonal Genossenschaft</a>"
}
pluginConfiguration<DokkaBase, DokkaBaseConfiguration> {
footerMessage = "Variist &copy; Copyright <a href=\"https://tegonal.com\">Tegonal Genossenschaft</a>"
}
}
40 changes: 20 additions & 20 deletions gradle/build-logic/dev/src/main/kotlin/build-logic.java.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
plugins {
id("java-base")
id("build-logic.gradle-conventions")
id("java-base")
id("build-logic.gradle-conventions")
}

java {
toolchain {
// reading JAVA_VERSION from env to enable jdk17 build in CI
languageVersion.set(JavaLanguageVersion.of(buildParameters.java.version))
}
consistentResolution {
useCompileClasspathVersions()
}
toolchain {
// reading JAVA_VERSION from env to enable jdk17 build in CI
languageVersion.set(JavaLanguageVersion.of(buildParameters.java.version))
}
consistentResolution {
useCompileClasspathVersions()
}
}


tasks.configureEach<JavaCompile> {
inputs.property("java.version", System.getProperty("java.version"))
inputs.property("java.vm.version", System.getProperty("java.vm.version"))
sourceCompatibility = buildParameters.defaultJdkVersion.toString()
targetCompatibility = buildParameters.defaultJdkVersion.toString()
options.apply {
encoding = "UTF-8"
compilerArgs.add("-Xlint:deprecation")
if (buildParameters.java.werror) {
compilerArgs.add("-Werror")
}
}
inputs.property("java.version", System.getProperty("java.version"))
inputs.property("java.vm.version", System.getProperty("java.vm.version"))
sourceCompatibility = buildParameters.defaultJdkVersion.toString()
targetCompatibility = buildParameters.defaultJdkVersion.toString()
options.apply {
encoding = "UTF-8"
compilerArgs.add("-Xlint:deprecation")
if (buildParameters.java.werror) {
compilerArgs.add("-Werror")
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ plugins {
}

tasks.configureEach<KotlinCompile> {
compilerOptions{
compilerOptions {
jvmTarget.set(JvmTarget.fromTarget(buildParameters.defaultJdkVersion.toString()))
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
plugins {
kotlin("jvm")
id("build-logic.kotlin-conventions")
kotlin("jvm")
id("build-logic.kotlin-conventions")
}

dependencies {
testImplementation("org.jetbrains.kotlin:kotlin-test-junit5")
testImplementation("org.jetbrains.kotlin:kotlin-test-junit5")
}
6 changes: 3 additions & 3 deletions gradle/build-logic/publishing/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
plugins {
id("build-logic.kotlin-dsl-gradle-plugin")
id("build-logic.kotlin-dsl-gradle-plugin")
}

dependencies {
api(projects.basics)
api(projects.dev)
api(projects.basics)
api(projects.dev)

api(buildLibs.bundles.dokka)
api(buildLibs.tutteli.dokka)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,27 @@ import ch.tutteli.gradle.plugins.dokka.GhPages
import org.jetbrains.dokka.gradle.AbstractDokkaLeafTask

plugins {
id("build-logic.gradle-conventions")
id("ch.tutteli.gradle.plugins.dokka")
id("build-logic.gradle-conventions")
id("ch.tutteli.gradle.plugins.dokka")
}

val kdocDir = rootProject.projectDir.resolve("misc/kdoc")

tutteliDokka {
githubUser.set("tegonal")
githubUser.set("tegonal")
writeTo.set(GhPages)
}

tasks.configureEach<AbstractDokkaLeafTask> {
moduleName.set("Variist")
dokkaSourceSets.configureEach {
dokkaSourceSets.configureEach {
reportUndocumented.set(true)
jdkVersion.set(buildParameters.defaultJdkVersion)
includes.from(kdocDir.resolve("packages.md"))
jdkVersion.set(buildParameters.defaultJdkVersion)
includes.from(kdocDir.resolve("packages.md"))
perPackageOption {
matchingRegex.set("com\\.tegonal\\.variist\\.export\\..*")
suppress.set(true)
}
}
configurePlugins()
}
configurePlugins()
}
10 changes: 5 additions & 5 deletions gradle/build-logic/settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
rootProject.name = "build-logic"

pluginManagement {
includeBuild("../build-logic-conventions")
includeBuild("../build-logic-conventions")
}

dependencyResolutionManagement {
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
repositories {
gradlePluginPortal()
}
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
repositories {
gradlePluginPortal()
}
versionCatalogs {
create("libs") {
from(files("../libs.versions.toml"))
Expand Down
10 changes: 5 additions & 5 deletions gradle/code-generation/settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
rootProject.name = "code-generation"

pluginManagement {
includeBuild("../build-logic-conventions")
includeBuild("../build-logic-conventions")
}

dependencyResolutionManagement {
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
repositories {
gradlePluginPortal()
}
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
repositories {
gradlePluginPortal()
}
versionCatalogs {
create("libs") {
from(files("../libs.versions.toml"))
Expand Down