diff --git a/.buildscript/configure-maven-publish.gradle b/.buildscript/configure-maven-publish.gradle deleted file mode 100644 index ca8b4d062..000000000 --- a/.buildscript/configure-maven-publish.gradle +++ /dev/null @@ -1,10 +0,0 @@ -apply plugin: 'com.vanniktech.maven.publish' -// track all runtime classpath dependencies for anything we ship -apply plugin: 'dependency-guard' - -group = GROUP -version = VERSION_NAME - -mavenPublish { - sonatypeHost = "S01" -} diff --git a/internal-testing-utils/build.gradle.kts b/internal-testing-utils/build.gradle.kts index d97b03a20..7f0cd8e3e 100644 --- a/internal-testing-utils/build.gradle.kts +++ b/internal-testing-utils/build.gradle.kts @@ -1,9 +1,8 @@ plugins { `kotlin-jvm` + published } -apply(from = rootProject.file(".buildscript/configure-maven-publish.gradle")) - dependencies { implementation(libs.kotlin.jdk8) diff --git a/trace-encoder/build.gradle.kts b/trace-encoder/build.gradle.kts index 4e480e640..95fdb86d6 100644 --- a/trace-encoder/build.gradle.kts +++ b/trace-encoder/build.gradle.kts @@ -1,11 +1,9 @@ plugins { `kotlin-jvm` id("com.google.devtools.ksp") - id("com.vanniktech.maven.publish") + published } -apply(from = rootProject.file(".buildscript/configure-maven-publish.gradle")) - dependencies { compileOnly(libs.jetbrains.annotations) compileOnly(libs.squareup.moshi.codegen) diff --git a/workflow-config/config-android/build.gradle.kts b/workflow-config/config-android/build.gradle.kts index 344f2f66c..e1f3cc7dd 100644 --- a/workflow-config/config-android/build.gradle.kts +++ b/workflow-config/config-android/build.gradle.kts @@ -2,7 +2,7 @@ plugins { id("com.android.library") `kotlin-android` `android-defaults` - id("org.jetbrains.dokka") + published } android { @@ -16,8 +16,6 @@ android { } } -apply(from = rootProject.file(".buildscript/configure-maven-publish.gradle")) - dependencies { api(project(":workflow-runtime")) } diff --git a/workflow-config/config-jvm/build.gradle.kts b/workflow-config/config-jvm/build.gradle.kts index ee2854f44..04276f236 100644 --- a/workflow-config/config-jvm/build.gradle.kts +++ b/workflow-config/config-jvm/build.gradle.kts @@ -1,7 +1,7 @@ plugins { `java-library` `kotlin-jvm` - id("org.jetbrains.dokka") + published } tasks.withType { @@ -18,8 +18,6 @@ tasks.withType { } } -apply(from = rootProject.file(".buildscript/configure-maven-publish.gradle")) - dependencies { api(project(":workflow-runtime")) } diff --git a/workflow-core/build.gradle.kts b/workflow-core/build.gradle.kts index 6a29d177e..ed9b091fe 100644 --- a/workflow-core/build.gradle.kts +++ b/workflow-core/build.gradle.kts @@ -1,10 +1,8 @@ plugins { `kotlin-multiplatform` - id("org.jetbrains.dokka") + published } -apply(from = rootProject.file(".buildscript/configure-maven-publish.gradle")) - kotlin { jvm { withJava() } ios() diff --git a/workflow-runtime/build.gradle.kts b/workflow-runtime/build.gradle.kts index a4ffd5cae..57f66e1cc 100644 --- a/workflow-runtime/build.gradle.kts +++ b/workflow-runtime/build.gradle.kts @@ -3,12 +3,10 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { `kotlin-multiplatform` - id("org.jetbrains.dokka") + published id("org.jetbrains.kotlinx.benchmark") } -apply(from = rootProject.file(".buildscript/configure-maven-publish.gradle")) - kotlin { jvm { compilations { diff --git a/workflow-rx2/build.gradle.kts b/workflow-rx2/build.gradle.kts index ae46d0b76..17f5b5734 100644 --- a/workflow-rx2/build.gradle.kts +++ b/workflow-rx2/build.gradle.kts @@ -1,10 +1,8 @@ plugins { `kotlin-jvm` - id("org.jetbrains.dokka") + published } -apply(from = rootProject.file(".buildscript/configure-maven-publish.gradle")) - dependencies { compileOnly(libs.jetbrains.annotations) diff --git a/workflow-testing/build.gradle.kts b/workflow-testing/build.gradle.kts index bf27df068..3695eda76 100644 --- a/workflow-testing/build.gradle.kts +++ b/workflow-testing/build.gradle.kts @@ -3,7 +3,7 @@ plugins { `java-library` `kotlin-jvm` - id("org.jetbrains.dokka") + published } tasks.withType { @@ -20,8 +20,6 @@ tasks.withType { } } -apply(from = rootProject.file(".buildscript/configure-maven-publish.gradle")) - dependencies { compileOnly(libs.jetbrains.annotations) diff --git a/workflow-tracing/build.gradle.kts b/workflow-tracing/build.gradle.kts index 48db367eb..d56e21a10 100644 --- a/workflow-tracing/build.gradle.kts +++ b/workflow-tracing/build.gradle.kts @@ -1,10 +1,8 @@ plugins { `kotlin-jvm` - id("com.vanniktech.maven.publish") + published } -apply(from = rootProject.file(".buildscript/configure-maven-publish.gradle")) - dependencies { compileOnly(libs.jetbrains.annotations) diff --git a/workflow-ui/compose-tooling/build.gradle.kts b/workflow-ui/compose-tooling/build.gradle.kts index b79804999..f7ffc1e37 100644 --- a/workflow-ui/compose-tooling/build.gradle.kts +++ b/workflow-ui/compose-tooling/build.gradle.kts @@ -5,11 +5,9 @@ plugins { `kotlin-android` `android-defaults` `android-ui-tests` - id("org.jetbrains.dokka") + published } -apply(from = rootProject.file(".buildscript/configure-maven-publish.gradle")) - android { buildFeatures.compose = true composeOptions { diff --git a/workflow-ui/compose/build.gradle.kts b/workflow-ui/compose/build.gradle.kts index 76b27c43e..ee921395c 100644 --- a/workflow-ui/compose/build.gradle.kts +++ b/workflow-ui/compose/build.gradle.kts @@ -5,11 +5,9 @@ plugins { `kotlin-android` `android-defaults` `android-ui-tests` - id("org.jetbrains.dokka") + published } -apply(from = rootProject.file(".buildscript/configure-maven-publish.gradle")) - android { buildFeatures.compose = true composeOptions { diff --git a/workflow-ui/container-android/build.gradle.kts b/workflow-ui/container-android/build.gradle.kts index 4e2971650..b9454149b 100644 --- a/workflow-ui/container-android/build.gradle.kts +++ b/workflow-ui/container-android/build.gradle.kts @@ -3,11 +3,9 @@ plugins { `kotlin-android` `android-defaults` `android-ui-tests` - id("org.jetbrains.dokka") + published } -apply(from = rootProject.file(".buildscript/configure-maven-publish.gradle")) - dependencies { api(project(":workflow-core")) api(project(":workflow-ui:core-android")) diff --git a/workflow-ui/container-common/build.gradle.kts b/workflow-ui/container-common/build.gradle.kts index 75559f140..2318dc47c 100644 --- a/workflow-ui/container-common/build.gradle.kts +++ b/workflow-ui/container-common/build.gradle.kts @@ -1,10 +1,8 @@ plugins { `kotlin-jvm` - id("org.jetbrains.dokka") + published } -apply(from = rootProject.file(".buildscript/configure-maven-publish.gradle")) - dependencies { api(project(":workflow-ui:core-common")) api(libs.kotlin.jdk6) diff --git a/workflow-ui/core-android/build.gradle.kts b/workflow-ui/core-android/build.gradle.kts index af416385c..5109281da 100644 --- a/workflow-ui/core-android/build.gradle.kts +++ b/workflow-ui/core-android/build.gradle.kts @@ -3,11 +3,9 @@ plugins { `kotlin-android` `android-defaults` `android-ui-tests` - id("org.jetbrains.dokka") + published } -apply(from = rootProject.file(".buildscript/configure-maven-publish.gradle")) - dependencies { compileOnly(libs.androidx.viewbinding) diff --git a/workflow-ui/core-common/build.gradle.kts b/workflow-ui/core-common/build.gradle.kts index 95a3dbd21..62dd1f10b 100644 --- a/workflow-ui/core-common/build.gradle.kts +++ b/workflow-ui/core-common/build.gradle.kts @@ -1,10 +1,8 @@ plugins { `kotlin-jvm` - id("org.jetbrains.dokka") + published } -apply(from = rootProject.file(".buildscript/configure-maven-publish.gradle")) - dependencies { api(libs.kotlin.jdk6) api(libs.squareup.okio) diff --git a/workflow-ui/radiography/build.gradle.kts b/workflow-ui/radiography/build.gradle.kts index 49a8eaad2..3fc4861bb 100644 --- a/workflow-ui/radiography/build.gradle.kts +++ b/workflow-ui/radiography/build.gradle.kts @@ -3,11 +3,9 @@ plugins { `kotlin-android` `android-defaults` `android-ui-tests` - id("org.jetbrains.dokka") + published } -apply(from = rootProject.file(".buildscript/configure-maven-publish.gradle")) - android { // See https://github.com/Kotlin/kotlinx.coroutines/issues/1064#issuecomment-479412940 packagingOptions.exclude("**/*.kotlin_*")