diff options
| author | Vadim Mishenev <vad-mishenev@yandex.ru> | 2023-07-21 15:19:17 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-21 15:19:17 +0300 |
| commit | f5393dd740eaf533fe9ff51003b175ef1c1418fe (patch) | |
| tree | 1c81e3a76c338c6281abdb946ae835e1d8a15225 /build-logic | |
| parent | 99062cbf5e332b3883c502da612d97f83eee9bff (diff) | |
| download | dokka-f5393dd740eaf533fe9ff51003b175ef1c1418fe.tar.gz dokka-f5393dd740eaf533fe9ff51003b175ef1c1418fe.tar.bz2 dokka-f5393dd740eaf533fe9ff51003b175ef1c1418fe.zip | |
Update Kotlin to 1.9.0 (#3074)
* Update Kotlin Gradle Plugin to 1.9.0
* Update Android Gradle Plugin to 4.2.2
* Introduce convention plugin for Gradle runner
https://github.com/gradle/gradle/issues/8301
* Fix unit test `common, jvm and macos source sets with kotlin multiplatform`
* Update compiler to 1.9.0
* Update integration test
* Add empty target for WASM integration test to avoid single target project
See https://github.com/Kotlin/dokka/issues/3038
* Remove unused `plugins.shadow` from toml
Diffstat (limited to 'build-logic')
| -rw-r--r-- | build-logic/build.gradle.kts | 4 | ||||
| -rw-r--r-- | build-logic/src/main/kotlin/org/jetbrains/conventions/gradle-plugin.gradle.kts | 9 |
2 files changed, 13 insertions, 0 deletions
diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts index 5272534d..efb2e4af 100644 --- a/build-logic/build.gradle.kts +++ b/build-logic/build.gradle.kts @@ -1,3 +1,5 @@ +import org.gradle.kotlin.dsl.support.expectedKotlinDslPluginsVersion + plugins { `kotlin-dsl` } @@ -12,6 +14,8 @@ dependencies { implementation(libs.gradlePlugin.dokka) implementation(libs.gradlePlugin.kotlin) implementation(libs.gradlePlugin.shadow) + implementation("org.gradle.kotlin:gradle-kotlin-dsl-plugins:$expectedKotlinDslPluginsVersion") + implementation(libs.gradlePlugin.gradlePublish) // workaround for accessing version-catalog in convention plugins // https://github.com/gradle/gradle/issues/15383#issuecomment-779893192 diff --git a/build-logic/src/main/kotlin/org/jetbrains/conventions/gradle-plugin.gradle.kts b/build-logic/src/main/kotlin/org/jetbrains/conventions/gradle-plugin.gradle.kts new file mode 100644 index 00000000..0adaabaa --- /dev/null +++ b/build-logic/src/main/kotlin/org/jetbrains/conventions/gradle-plugin.gradle.kts @@ -0,0 +1,9 @@ +package org.jetbrains.conventions + +plugins { + id("org.gradle.kotlin.kotlin-dsl") + id("org.jetbrains.conventions.maven-publish") + id("com.gradle.plugin-publish") + id("org.jetbrains.conventions.base-java") + kotlin("jvm") +} |