-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
update to tutteli gradle 5.0.0, make kotlin version configurable
moreover: - add the missing pieces so that we can actually release minimalist, such as developer information
- Loading branch information
Showing
9 changed files
with
45 additions
and
57 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 0 additions & 18 deletions
18
gradle/build-logic/dev/src/main/kotlin/KotlinConfigurationExtensions.kt
This file was deleted.
Oops, something went wrong.
29 changes: 18 additions & 11 deletions
29
gradle/build-logic/dev/src/main/kotlin/build-logic.kotlin-conventions.gradle.kts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,22 +1,29 @@ | ||
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion | ||
import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask | ||
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile | ||
|
||
plugins { | ||
id("build-logic.junit-jacoco-conventions") | ||
// this plugin sets inter alia toolchain and source/targetCompatibility | ||
// but also applies common plugins such as gradle-convention, build-params | ||
id("build-logic.java") | ||
id("build-logic.junit-jacoco-conventions") | ||
// this plugin sets inter alia toolchain and source/targetCompatibility | ||
// but also applies common plugins such as gradle-convention, build-params | ||
id("build-logic.java") | ||
} | ||
|
||
tasks.configureEach<KotlinCompile> { | ||
kotlinOptions { | ||
jvmTarget = buildParameters.defaultJdkVersion.toString() | ||
} | ||
kotlinOptions { | ||
jvmTarget = buildParameters.defaultJdkVersion.toString() | ||
languageVersion | ||
} | ||
} | ||
|
||
tasks.configureEach<KotlinCompilationTask<*>> { | ||
compilerOptions { | ||
// suppress warnings about kotlin 1.4 beeing deprecated | ||
freeCompilerArgs.add("-Xsuppress-version-warnings") | ||
} | ||
compilerOptions { | ||
freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn") | ||
// suppress warnings about used kotlin version being deprecated, we use an older api/language version on purpose | ||
freeCompilerArgs.add("-Xsuppress-version-warnings") | ||
|
||
val kotlinVersion = KotlinVersion.fromVersion(buildParameters.kotlin.version) | ||
languageVersion.set(kotlinVersion) | ||
apiVersion.set(kotlinVersion) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
17 changes: 13 additions & 4 deletions
17
gradle/build-logic/publishing/src/main/kotlin/build-logic.published-kotlin-jvm.gradle.kts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,21 @@ | ||
plugins { | ||
id("build-logic.kotlin-jvm") | ||
id("build-logic.kotlin-jvm") | ||
id("build-logic.dokka") | ||
id("ch.tutteli.gradle.plugins.kotlin.module.info") | ||
id("ch.tutteli.gradle.plugins.publish") | ||
id("ch.tutteli.gradle.plugins.publish") | ||
} | ||
|
||
tutteliPublish { | ||
githubUser.set("tegonal") | ||
resetLicenses("EUPL-1.2") | ||
} | ||
manifestVendor.set("Tegonal Genossenschaft") | ||
|
||
resetLicenses("EUPL-1.2") | ||
addDeveloper { | ||
id = "robstoll_tegonal" | ||
name = "Robert Stoll" | ||
email = "robert.stoll@tegonal.com" | ||
url = "https://tutteli.ch" | ||
organization = "Tegonal Genossenschaft" | ||
organizationUrl = "https://tegonal.com" | ||
} | ||
} |
Empty file.