From 5576bc67974ec6c1a1d7773b71cc1144af4c7d97 Mon Sep 17 00:00:00 2001 From: "Kartikaya Gupta (kats)" Date: Mon, 27 Jan 2025 12:36:33 -0500 Subject: [PATCH] Normalize plugin application syntax GitOrigin-RevId: 83aa8560df9c914640751b7062d3824555a730a2 --- build.gradle.kts | 34 ++++++------------- detektive/build.gradle.kts | 4 +-- gradle/libs.versions.toml | 33 ++++++------------ misk-action-scopes/build.gradle.kts | 4 +-- misk-actions/build.gradle.kts | 4 +-- misk-admin/build.gradle.kts | 6 ++-- misk-api/build.gradle.kts | 4 +-- misk-aws-dynamodb/build.gradle.kts | 4 +-- misk-aws/build.gradle.kts | 4 +-- misk-aws2-dynamodb/build.gradle.kts | 4 +-- misk-backoff/build.gradle.kts | 4 +-- misk-bom/build.gradle.kts | 2 +- misk-clustering-dynamodb/build.gradle.kts | 4 +-- misk-clustering/build.gradle.kts | 4 +-- misk-config/build.gradle.kts | 4 +-- misk-core/build.gradle.kts | 4 +-- misk-cron/build.gradle.kts | 4 +-- misk-crypto/build.gradle.kts | 4 +-- misk-datadog/build.gradle.kts | 4 +-- misk-events-core/build.gradle.kts | 4 +-- misk-events/build.gradle.kts | 4 +-- misk-exceptions-dynamodb/build.gradle.kts | 4 +-- misk-feature/build.gradle.kts | 4 +-- misk-gcp/build.gradle.kts | 4 +-- misk-grpc-reflect/build.gradle.kts | 6 ++-- misk-grpc-tests/build.gradle.kts | 8 ++--- misk-hibernate-testing/build.gradle.kts | 4 +-- misk-hibernate/build.gradle.kts | 8 ++--- misk-hotwire/build.gradle.kts | 4 +-- misk-inject/build.gradle.kts | 4 +-- .../misk-inject-guice7-test/build.gradle.kts | 2 +- misk-jdbc/build.gradle.kts | 4 +-- misk-jobqueue/build.gradle.kts | 4 +-- misk-jooq/build.gradle.kts | 8 ++--- misk-launchdarkly-core/build.gradle.kts | 4 +-- misk-launchdarkly/build.gradle.kts | 4 +-- misk-lease/build.gradle.kts | 4 +-- misk-metrics-digester/build.gradle.kts | 4 +-- misk-metrics/build.gradle.kts | 4 +-- misk-policy/build.gradle.kts | 4 +-- misk-prometheus/build.gradle.kts | 4 +-- misk-proto/build.gradle.kts | 6 ++-- .../build.gradle.kts | 4 +-- .../build.gradle.kts | 4 +-- .../build.gradle.kts | 4 +-- misk-redis/build.gradle.kts | 4 +-- .../build.gradle.kts | 4 +-- misk-service/build.gradle.kts | 4 +-- misk-slack/build.gradle.kts | 4 +-- misk-sqldelight-testing/build.gradle.kts | 4 +-- misk-sqldelight/build.gradle.kts | 4 +-- misk-tailwind/build.gradle.kts | 4 +-- misk-testing-api/build.gradle.kts | 4 +-- misk-testing/build.gradle.kts | 4 +-- misk-transactional-jobqueue/build.gradle.kts | 4 +-- misk-warmup/build.gradle.kts | 4 +-- misk/build.gradle.kts | 6 ++-- samples/exemplar/build.gradle.kts | 4 +-- samples/exemplarchat/build.gradle.kts | 4 +-- settings.gradle.kts | 3 -- wisp/wisp-aws-environment/build.gradle.kts | 4 +-- wisp/wisp-client/build.gradle.kts | 4 +-- wisp/wisp-config/build.gradle.kts | 4 +-- wisp/wisp-containers-testing/build.gradle.kts | 4 +-- wisp/wisp-deployment-testing/build.gradle.kts | 4 +-- wisp/wisp-deployment/build.gradle.kts | 4 +-- wisp/wisp-feature-testing/build.gradle.kts | 4 +-- wisp/wisp-feature/build.gradle.kts | 4 +-- wisp/wisp-launchdarkly/build.gradle.kts | 4 +-- wisp/wisp-lease-testing/build.gradle.kts | 4 +-- wisp/wisp-lease/build.gradle.kts | 4 +-- wisp/wisp-logging-testing/build.gradle.kts | 4 +-- wisp/wisp-logging/build.gradle.kts | 4 +-- wisp/wisp-moshi/build.gradle.kts | 4 +-- .../bucket4j/build.gradle.kts | 4 +-- wisp/wisp-rate-limiting/build.gradle.kts | 4 +-- .../build.gradle.kts | 4 +-- wisp/wisp-resource-loader/build.gradle.kts | 4 +-- wisp/wisp-sampling/build.gradle.kts | 4 +-- wisp/wisp-ssl/build.gradle.kts | 4 +-- wisp/wisp-task/build.gradle.kts | 4 +-- wisp/wisp-time-testing/build.gradle.kts | 4 +-- wisp/wisp-token-testing/build.gradle.kts | 4 +-- wisp/wisp-token/build.gradle.kts | 4 +-- wisp/wisp-tracing/build.gradle.kts | 4 +-- 85 files changed, 193 insertions(+), 221 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 4626aada0b1..b3047685bef 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,34 +13,20 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import java.io.IOException import java.net.Socket -buildscript { - repositories { - mavenCentral() - gradlePluginPortal() - } - - dependencies { - classpath(platform(libs.kotlinBom)) - classpath(libs.detektGradlePlugin) - classpath(libs.dokkaGradlePlugin) - // TODO remove Flyway when Misk SchemaMigratorGradlePlugin merges - classpath(libs.flywayGradlePlugin) - classpath(libs.jgit) - classpath(libs.jooqGradlePlugin) - classpath(libs.kotlinAllOpenPlugin) - classpath(libs.kotlinGradlePlugin) - classpath(libs.kotlinNoArgPlugin) - classpath(libs.mysql) - classpath(libs.protobufGradlePlugin) - classpath(libs.sqldelightGradlePlugin) - classpath(libs.wireGradlePlugin) - } -} - plugins { alias(libs.plugins.dependencyAnalysis) alias(libs.plugins.binaryCompatibilityValidator) + alias(libs.plugins.detekt) apply false + alias(libs.plugins.dokka) apply false + alias(libs.plugins.flyway) apply false + alias(libs.plugins.jooq) apply false + alias(libs.plugins.kotlinAllOpen) apply false + alias(libs.plugins.kotlinJpa) apply false + alias(libs.plugins.kotlinJvm) apply false alias(libs.plugins.mavenPublishBase) apply false + alias(libs.plugins.protobuf) apply false + alias(libs.plugins.sqldelight) apply false + alias(libs.plugins.wire) apply false } dependencyAnalysis { diff --git a/detektive/build.gradle.kts b/detektive/build.gradle.kts index 83f6390c6a8..7f103f51ff9 100644 --- a/detektive/build.gradle.kts +++ b/detektive/build.gradle.kts @@ -2,8 +2,8 @@ import com.vanniktech.maven.publish.JavadocJar import com.vanniktech.maven.publish.KotlinJvm plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublishBase) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish.base") } dependencies { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0127d813b95..b58d6807e68 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,7 +7,6 @@ datadog = "1.45.2" dependencyAnalysisPlugin = "2.7.0" detekt = "1.23.7" docker = "3.4.1" -flyway = "11.2.0" googleAuth = "1.31.0" googleHttp = "1.45.3" hoplite = "2.7.5" @@ -21,7 +20,6 @@ micrometer = "1.12.13" netty = "4.1.117.Final" okHttp = "5.0.0-alpha.14" protobuf = "3.25.6" -protobufPlugin = "0.9.4" retrofit = "2.11.0" sqldelight = "2.0.2" wire = "5.2.1" @@ -54,7 +52,6 @@ concurrencyLimitsCore = { module = "com.netflix.concurrency-limits:concurrency-l cronUtils = { module = "com.cronutils:cron-utils", version = "9.2.1" } datasourceProxy = { module = "net.ttddyy:datasource-proxy", version = "1.10.1" } detektApi = { module = "io.gitlab.arturbosch.detekt:detekt-api", version.ref = "detekt" } -detektGradlePlugin = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt" } detektParser = { module = "io.gitlab.arturbosch.detekt:detekt-parser", version.ref = "detekt" } detektPsiUtils = { module = "io.gitlab.arturbosch.detekt:detekt-psi-utils", version.ref = "detekt" } detektTest = { module = "io.gitlab.arturbosch.detekt:detekt-test", version.ref = "detekt" } @@ -63,10 +60,8 @@ dockerApi = { module = "com.github.docker-java:docker-java-api", version.ref = " dockerCore = { module = "com.github.docker-java:docker-java-core", version.ref = "docker" } dockerTransportCore = { module = "com.github.docker-java:docker-java-transport", version.ref = "docker" } dockerTransportHttpClient = { module = "com.github.docker-java:docker-java-transport-httpclient5", version.ref = "docker" } -dokkaGradlePlugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version = "2.0.0" } errorproneAnnotations = { module = "com.google.errorprone:error_prone_annotations", version = "2.36.0" } findbugsJsr305 = { module = "com.google.code.findbugs:jsr305", version = "3.0.2" } -flywayGradlePlugin = { module = "org.flywaydb:flyway-gradle-plugin", version.ref = "flyway" } gax = { module = "com.google.api:gax", version = "2.59.1" } gcpCloudCore = { module = "com.google.cloud:google-cloud-core", version = "2.49.1" } gcpDatastore = { module = "com.google.cloud:google-cloud-datastore", version = "2.25.4" } @@ -134,10 +129,8 @@ jettyUnixSocket = { module = "org.eclipse.jetty:jetty-unixsocket-server" } jettyUtil = { module = "org.eclipse.jetty:jetty-util" } jettyWebsocketApi = { module = "org.eclipse.jetty.websocket:websocket-jetty-api" } jettyWebsocketServer = { module = "org.eclipse.jetty.websocket:websocket-jetty-server" } -jgit = { module = "org.eclipse.jgit:org.eclipse.jgit", version = "5.13.3.202401111512-r" } jnrUnixsocket = { module = "com.github.jnr:jnr-unixsocket", version = "0.38.23" } jooq = { module = "org.jooq:jooq", version = "3.18.25" } -jooqGradlePlugin = { module = "nu.studer:gradle-jooq-plugin", version = "9.0" } jsqlparser = { module = "com.github.jsqlparser:jsqlparser", version = "5.1" } junitApi = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" } junitEngine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" } @@ -148,11 +141,9 @@ kotestAssertionsShared = { module = "io.kotest:kotest-assertions-shared", versio kotestCommon = { module = "io.kotest:kotest-common", version.ref = "kotest" } kotestFrameworkApi = { module = "io.kotest:kotest-framework-api", version.ref = "kotest" } kotestJunitRunnerJvm = { module = "io.kotest:kotest-runner-junit5-jvm", version.ref = "kotest" } -kotlinAllOpenPlugin = { module = "org.jetbrains.kotlin:kotlin-allopen", version.ref = "kotlin" } kotlinBom = { module = "org.jetbrains.kotlin:kotlin-bom", version.ref = "kotlin" } kotlinCompilerEmbeddable = { module = "org.jetbrains.kotlin:kotlin-compiler-embeddable", version.ref = "kotlin" } kotlinGradleBom = { module = "org.jetbrains.kotlin:kotlin-gradle-plugins-bom", version.ref = "kotlin" } -kotlinGradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } kotlinNoArgPlugin = { module = "org.jetbrains.kotlin:kotlin-noarg", version.ref = "kotlin" } kotlinReflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" } kotlinRetry = { module = "com.michael-bull.kotlin-retry:kotlin-retry", version = "1.0.9" } @@ -169,7 +160,6 @@ launchDarkly = { module = "com.launchdarkly:launchdarkly-java-server-sdk", versi logbackClassic = { module = "ch.qos.logback:logback-classic", version = "1.5.6" } logbackCore = { module = "ch.qos.logback:logback-core", version = "1.5.6" } loggingApi = { module = "io.github.microutils:kotlin-logging", version = "3.0.5" } -mavenPublishGradlePlugin = { module = "com.vanniktech:gradle-maven-publish-plugin", version.ref = "mavenPublish" } micrometerCore = { module = "io.micrometer:micrometer-core", version.ref = "micrometer" } micrometerRegistryPrometheus = { module = "io.micrometer:micrometer-registry-prometheus", version.ref = "micrometer" } mockitoCore = { module = "org.mockito:mockito-core", version = "5.15.2" } @@ -196,7 +186,6 @@ prometheusClientBom = { module = "io.prometheus:simpleclient_bom", version = "0. prometheusClientCommon = { module = "io.prometheus:simpleclient_common" } prometheusHotspot = { module = "io.prometheus:simpleclient_hotspot" } prometheusHttpserver = { module = "io.prometheus:simpleclient_httpserver" } -protobufGradlePlugin = { module = "com.google.protobuf:protobuf-gradle-plugin", version.ref = "protobufPlugin" } protobufJava = { module = "com.google.protobuf:protobuf-java", version.ref = "protobuf" } protoc = { module = "com.google.protobuf:protoc", version.ref = "protobuf" } retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" } @@ -207,7 +196,6 @@ retrofitScalars = { module = "com.squareup.retrofit2:converter-scalars", version retrofitWire = { module = "com.squareup.retrofit2:converter-wire", version.ref = "retrofit" } servletApi = { module = "javax.servlet:javax.servlet-api", version = "4.0.1" } slf4jApi = { module = "org.slf4j:slf4j-api", version = "2.0.16" } -sqldelightGradlePlugin = { module = "app.cash.sqldelight:gradle-plugin", version.ref = "sqldelight" } sqldelightJdbcDriver = { module = "app.cash.sqldelight:jdbc-driver", version.ref = "sqldelight" } sqldelightMysqlDialect = { module = "app.cash.sqldelight:mysql-dialect", version.ref = "sqldelight" } sqldelightRuntime = { module = "app.cash.sqldelight:runtime", version.ref = "sqldelight" } @@ -226,7 +214,6 @@ tinkAwskms = { module = "com.google.crypto.tink:tink-awskms", version = "1.9.1" tinkGcpkms = { module = "com.google.crypto.tink:tink-gcpkms", version = "1.10.0" } tracingDatadog = { module = "com.datadoghq:dd-trace-api", version.ref = "datadog" } wireBom = { module = "com.squareup.wire:wire-bom", version.ref = "wire" } -wireGradlePlugin = { module = "com.squareup.wire:wire-gradle-plugin", version.ref = "wire" } wireGrpcClient = { module = "com.squareup.wire:wire-grpc-client", version.ref = "wire" } wireMoshiAdapter = { module = "com.squareup.wire:wire-moshi-adapter", version.ref = "wire" } wireReflector = { module = "com.squareup.wire:wire-reflector", version.ref = "wire" } @@ -236,13 +223,15 @@ wireSchema = { module = "com.squareup.wire:wire-schema", version.ref = "wire" } [plugins] binaryCompatibilityValidator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "kotlinBinaryCompatibilityPlugin" } dependencyAnalysis = { id = "com.autonomousapps.dependency-analysis", version.ref = "dependencyAnalysisPlugin" } -flyway = { id = "org.flywaydb.flyway" } -jooq = { id = "nu.studer.jooq" } -kotlinAllOpen = { id = "org.jetbrains.kotlin.plugin.allopen" } -kotlinJpa = { id = "org.jetbrains.kotlin.plugin.jpa" } -kotlinJvm = { id = "org.jetbrains.kotlin.jvm" } -mavenPublish = { id = "com.vanniktech.maven.publish" } +detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" } +dokka = { id = "org.jetbrains.dokka", version = "2.0.0" } +flyway = { id = "org.flywaydb.flyway", version = "11.2.0" } +jooq = { id = "nu.studer.jooq", version = "9.0" } +kotlinAllOpen = { id = "org.jetbrains.kotlin.plugin.allopen", version.ref = "kotlin" } +kotlinJpa = { id = "org.jetbrains.kotlin.plugin.jpa", version.ref = "kotlin" } +kotlinJvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } +mavenPublish = { id = "com.vanniktech.maven.publish", version.ref = "mavenPublish" } mavenPublishBase = { id = "com.vanniktech.maven.publish.base", version.ref = "mavenPublish" } -protobuf = { id = "com.google.protobuf" } -sqldelight = { id = "app.cash.sqldelight" } -wire = { id = "com.squareup.wire" } +protobuf = { id = "com.google.protobuf", version = "0.9.4" } +sqldelight = { id = "app.cash.sqldelight", version.ref = "sqldelight" } +wire = { id = "com.squareup.wire", version.ref = "wire" } diff --git a/misk-action-scopes/build.gradle.kts b/misk-action-scopes/build.gradle.kts index 74e17cc7b81..f9cae3faa2a 100644 --- a/misk-action-scopes/build.gradle.kts +++ b/misk-action-scopes/build.gradle.kts @@ -2,8 +2,8 @@ import com.vanniktech.maven.publish.JavadocJar.Dokka import com.vanniktech.maven.publish.KotlinJvm plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublishBase) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish.base") } dependencies { diff --git a/misk-actions/build.gradle.kts b/misk-actions/build.gradle.kts index e4f2a56e1aa..2475e9a5871 100644 --- a/misk-actions/build.gradle.kts +++ b/misk-actions/build.gradle.kts @@ -2,8 +2,8 @@ import com.vanniktech.maven.publish.JavadocJar.Dokka import com.vanniktech.maven.publish.KotlinJvm plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublishBase) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish.base") } dependencies { diff --git a/misk-admin/build.gradle.kts b/misk-admin/build.gradle.kts index df5f66c4305..bf3871075ee 100644 --- a/misk-admin/build.gradle.kts +++ b/misk-admin/build.gradle.kts @@ -4,9 +4,9 @@ import java.io.ByteArrayOutputStream import java.nio.charset.Charset plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublishBase) - alias(libs.plugins.wire) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish.base") + id("com.squareup.wire") } dependencies { diff --git a/misk-api/build.gradle.kts b/misk-api/build.gradle.kts index abd463b7ef6..fd34bf80340 100644 --- a/misk-api/build.gradle.kts +++ b/misk-api/build.gradle.kts @@ -3,8 +3,8 @@ import com.vanniktech.maven.publish.KotlinJvm import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublishBase) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish.base") } dependencies { diff --git a/misk-aws-dynamodb/build.gradle.kts b/misk-aws-dynamodb/build.gradle.kts index cd8507a4e3a..f5b0b2d6a51 100644 --- a/misk-aws-dynamodb/build.gradle.kts +++ b/misk-aws-dynamodb/build.gradle.kts @@ -2,8 +2,8 @@ import com.vanniktech.maven.publish.JavadocJar.Dokka import com.vanniktech.maven.publish.KotlinJvm plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublishBase) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish.base") id("java-test-fixtures") } diff --git a/misk-aws/build.gradle.kts b/misk-aws/build.gradle.kts index e27de527acd..ca6d38d1a41 100644 --- a/misk-aws/build.gradle.kts +++ b/misk-aws/build.gradle.kts @@ -2,8 +2,8 @@ import com.vanniktech.maven.publish.JavadocJar.Dokka import com.vanniktech.maven.publish.KotlinJvm plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublishBase) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish.base") } dependencies { diff --git a/misk-aws2-dynamodb/build.gradle.kts b/misk-aws2-dynamodb/build.gradle.kts index 6809a22a49a..7540edeff94 100644 --- a/misk-aws2-dynamodb/build.gradle.kts +++ b/misk-aws2-dynamodb/build.gradle.kts @@ -2,8 +2,8 @@ import com.vanniktech.maven.publish.JavadocJar.Dokka import com.vanniktech.maven.publish.KotlinJvm plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublishBase) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish.base") id("java-test-fixtures") } diff --git a/misk-backoff/build.gradle.kts b/misk-backoff/build.gradle.kts index fd3c1694ab5..7338e1f5e83 100644 --- a/misk-backoff/build.gradle.kts +++ b/misk-backoff/build.gradle.kts @@ -2,8 +2,8 @@ import com.vanniktech.maven.publish.JavadocJar.Dokka import com.vanniktech.maven.publish.KotlinJvm plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublishBase) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish.base") } dependencies { diff --git a/misk-bom/build.gradle.kts b/misk-bom/build.gradle.kts index dfa4e2b9956..89100827d0b 100644 --- a/misk-bom/build.gradle.kts +++ b/misk-bom/build.gradle.kts @@ -1,6 +1,6 @@ plugins { id("java-platform") - alias(libs.plugins.mavenPublishBase) + id("com.vanniktech.maven.publish.base") } dependencies { diff --git a/misk-clustering-dynamodb/build.gradle.kts b/misk-clustering-dynamodb/build.gradle.kts index 14eb405b679..a5f11592ab6 100644 --- a/misk-clustering-dynamodb/build.gradle.kts +++ b/misk-clustering-dynamodb/build.gradle.kts @@ -2,8 +2,8 @@ import com.vanniktech.maven.publish.JavadocJar.Dokka import com.vanniktech.maven.publish.KotlinJvm plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublishBase) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish.base") } dependencies { diff --git a/misk-clustering/build.gradle.kts b/misk-clustering/build.gradle.kts index f63108cd750..a9514e09d64 100644 --- a/misk-clustering/build.gradle.kts +++ b/misk-clustering/build.gradle.kts @@ -2,8 +2,8 @@ import com.vanniktech.maven.publish.JavadocJar.Dokka import com.vanniktech.maven.publish.KotlinJvm plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublishBase) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish.base") } dependencies { diff --git a/misk-config/build.gradle.kts b/misk-config/build.gradle.kts index 3ab0a982fce..66124ec8d69 100644 --- a/misk-config/build.gradle.kts +++ b/misk-config/build.gradle.kts @@ -2,8 +2,8 @@ import com.vanniktech.maven.publish.JavadocJar.Dokka import com.vanniktech.maven.publish.KotlinJvm plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublishBase) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish.base") } dependencies { diff --git a/misk-core/build.gradle.kts b/misk-core/build.gradle.kts index 3da8546fee0..1b09f44ea52 100644 --- a/misk-core/build.gradle.kts +++ b/misk-core/build.gradle.kts @@ -2,8 +2,8 @@ import com.vanniktech.maven.publish.JavadocJar.Dokka import com.vanniktech.maven.publish.KotlinJvm plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublishBase) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish.base") } dependencies { diff --git a/misk-cron/build.gradle.kts b/misk-cron/build.gradle.kts index a6548a769e7..b23d59cf640 100644 --- a/misk-cron/build.gradle.kts +++ b/misk-cron/build.gradle.kts @@ -2,8 +2,8 @@ import com.vanniktech.maven.publish.JavadocJar.Dokka import com.vanniktech.maven.publish.KotlinJvm plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublishBase) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish.base") } dependencies { diff --git a/misk-crypto/build.gradle.kts b/misk-crypto/build.gradle.kts index 87a6c82977e..7f9509a58b3 100644 --- a/misk-crypto/build.gradle.kts +++ b/misk-crypto/build.gradle.kts @@ -2,8 +2,8 @@ import com.vanniktech.maven.publish.JavadocJar.Dokka import com.vanniktech.maven.publish.KotlinJvm plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublishBase) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish.base") id("java-test-fixtures") } diff --git a/misk-datadog/build.gradle.kts b/misk-datadog/build.gradle.kts index 804b5a56d6c..b254b81bb8a 100644 --- a/misk-datadog/build.gradle.kts +++ b/misk-datadog/build.gradle.kts @@ -2,8 +2,8 @@ import com.vanniktech.maven.publish.JavadocJar.Dokka import com.vanniktech.maven.publish.KotlinJvm plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublishBase) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish.base") } dependencies { diff --git a/misk-events-core/build.gradle.kts b/misk-events-core/build.gradle.kts index 84b27c0354d..8602a481f6e 100644 --- a/misk-events-core/build.gradle.kts +++ b/misk-events-core/build.gradle.kts @@ -2,8 +2,8 @@ import com.vanniktech.maven.publish.JavadocJar.Dokka import com.vanniktech.maven.publish.KotlinJvm plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublishBase) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish.base") } dependencies { diff --git a/misk-events/build.gradle.kts b/misk-events/build.gradle.kts index 57c97e85b54..a9c310f581c 100644 --- a/misk-events/build.gradle.kts +++ b/misk-events/build.gradle.kts @@ -2,8 +2,8 @@ import com.vanniktech.maven.publish.JavadocJar.Dokka import com.vanniktech.maven.publish.KotlinJvm plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublishBase) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish.base") id("java-test-fixtures") } diff --git a/misk-exceptions-dynamodb/build.gradle.kts b/misk-exceptions-dynamodb/build.gradle.kts index 5ce798f3092..4a93781c826 100644 --- a/misk-exceptions-dynamodb/build.gradle.kts +++ b/misk-exceptions-dynamodb/build.gradle.kts @@ -2,8 +2,8 @@ import com.vanniktech.maven.publish.JavadocJar.Dokka import com.vanniktech.maven.publish.KotlinJvm plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublishBase) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish.base") } dependencies { diff --git a/misk-feature/build.gradle.kts b/misk-feature/build.gradle.kts index 8c57e380eb8..767b204aeca 100644 --- a/misk-feature/build.gradle.kts +++ b/misk-feature/build.gradle.kts @@ -2,8 +2,8 @@ import com.vanniktech.maven.publish.JavadocJar.Dokka import com.vanniktech.maven.publish.KotlinJvm plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublishBase) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish.base") id("java-test-fixtures") } diff --git a/misk-gcp/build.gradle.kts b/misk-gcp/build.gradle.kts index 3d66e0c4e66..69d3d86e01c 100644 --- a/misk-gcp/build.gradle.kts +++ b/misk-gcp/build.gradle.kts @@ -2,8 +2,8 @@ import com.vanniktech.maven.publish.JavadocJar.Dokka import com.vanniktech.maven.publish.KotlinJvm plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublishBase) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish.base") id("java-test-fixtures") } diff --git a/misk-grpc-reflect/build.gradle.kts b/misk-grpc-reflect/build.gradle.kts index 9cc30c5a22a..5cf4fe7f8c5 100644 --- a/misk-grpc-reflect/build.gradle.kts +++ b/misk-grpc-reflect/build.gradle.kts @@ -2,9 +2,9 @@ import com.vanniktech.maven.publish.JavadocJar.Dokka import com.vanniktech.maven.publish.KotlinJvm plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublishBase) - alias(libs.plugins.wire) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish.base") + id("com.squareup.wire") } wire { diff --git a/misk-grpc-tests/build.gradle.kts b/misk-grpc-tests/build.gradle.kts index 4aa4824de46..9d537f5120d 100644 --- a/misk-grpc-tests/build.gradle.kts +++ b/misk-grpc-tests/build.gradle.kts @@ -3,10 +3,10 @@ import com.vanniktech.maven.publish.JavadocJar.Dokka import com.vanniktech.maven.publish.KotlinJvm plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublishBase) - alias(libs.plugins.protobuf) - alias(libs.plugins.wire) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish.base") + id("com.google.protobuf") + id("com.squareup.wire") } protobuf { diff --git a/misk-hibernate-testing/build.gradle.kts b/misk-hibernate-testing/build.gradle.kts index 2630c8b60b6..821278a0de0 100644 --- a/misk-hibernate-testing/build.gradle.kts +++ b/misk-hibernate-testing/build.gradle.kts @@ -2,8 +2,8 @@ import com.vanniktech.maven.publish.JavadocJar.Dokka import com.vanniktech.maven.publish.KotlinJvm plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublishBase) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish.base") } dependencies { diff --git a/misk-hibernate/build.gradle.kts b/misk-hibernate/build.gradle.kts index 0cbb98d81ff..229c7162221 100644 --- a/misk-hibernate/build.gradle.kts +++ b/misk-hibernate/build.gradle.kts @@ -2,10 +2,10 @@ import com.vanniktech.maven.publish.JavadocJar.Dokka import com.vanniktech.maven.publish.KotlinJvm plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublishBase) - alias(libs.plugins.kotlinAllOpen) - alias(libs.plugins.kotlinJpa) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish.base") + id("org.jetbrains.kotlin.plugin.allopen") + id("org.jetbrains.kotlin.plugin.jpa") } allOpen { diff --git a/misk-hotwire/build.gradle.kts b/misk-hotwire/build.gradle.kts index 4485cc4b8ca..e3af5cfee91 100644 --- a/misk-hotwire/build.gradle.kts +++ b/misk-hotwire/build.gradle.kts @@ -2,8 +2,8 @@ import com.vanniktech.maven.publish.JavadocJar.Dokka import com.vanniktech.maven.publish.KotlinJvm plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublishBase) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish.base") } dependencies { diff --git a/misk-inject/build.gradle.kts b/misk-inject/build.gradle.kts index a201134bcfa..339089347af 100644 --- a/misk-inject/build.gradle.kts +++ b/misk-inject/build.gradle.kts @@ -2,8 +2,8 @@ import com.vanniktech.maven.publish.JavadocJar.Dokka import com.vanniktech.maven.publish.KotlinJvm plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublishBase) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish.base") } dependencies { diff --git a/misk-inject/misk-inject-guice7-test/build.gradle.kts b/misk-inject/misk-inject-guice7-test/build.gradle.kts index d6dd6f0c61e..bba2966815b 100644 --- a/misk-inject/misk-inject-guice7-test/build.gradle.kts +++ b/misk-inject/misk-inject-guice7-test/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - alias(libs.plugins.kotlinJvm) + id("org.jetbrains.kotlin.jvm") } dependencies { diff --git a/misk-jdbc/build.gradle.kts b/misk-jdbc/build.gradle.kts index a68889e1584..302d09671ab 100644 --- a/misk-jdbc/build.gradle.kts +++ b/misk-jdbc/build.gradle.kts @@ -2,8 +2,8 @@ import com.vanniktech.maven.publish.JavadocJar.Dokka import com.vanniktech.maven.publish.KotlinJvm plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublishBase) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish.base") id("java-test-fixtures") } diff --git a/misk-jobqueue/build.gradle.kts b/misk-jobqueue/build.gradle.kts index b97203ff7b0..45332b272b6 100644 --- a/misk-jobqueue/build.gradle.kts +++ b/misk-jobqueue/build.gradle.kts @@ -2,8 +2,8 @@ import com.vanniktech.maven.publish.JavadocJar.Dokka import com.vanniktech.maven.publish.KotlinJvm plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublishBase) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish.base") id("java-test-fixtures") } diff --git a/misk-jooq/build.gradle.kts b/misk-jooq/build.gradle.kts index 3683d737801..ce292813b33 100644 --- a/misk-jooq/build.gradle.kts +++ b/misk-jooq/build.gradle.kts @@ -2,12 +2,12 @@ import com.vanniktech.maven.publish.JavadocJar.Dokka import com.vanniktech.maven.publish.KotlinJvm plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublishBase) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish.base") // Needed to generate jooq test db classes - alias(libs.plugins.flyway) - alias(libs.plugins.jooq) + id("org.flywaydb.flyway") + id("nu.studer.jooq") } dependencies { diff --git a/misk-launchdarkly-core/build.gradle.kts b/misk-launchdarkly-core/build.gradle.kts index e9ba5567eb6..89694c1e629 100644 --- a/misk-launchdarkly-core/build.gradle.kts +++ b/misk-launchdarkly-core/build.gradle.kts @@ -2,8 +2,8 @@ import com.vanniktech.maven.publish.JavadocJar.Dokka import com.vanniktech.maven.publish.KotlinJvm plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublishBase) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish.base") } dependencies { diff --git a/misk-launchdarkly/build.gradle.kts b/misk-launchdarkly/build.gradle.kts index c19e9a20e02..7ec8a2183e9 100644 --- a/misk-launchdarkly/build.gradle.kts +++ b/misk-launchdarkly/build.gradle.kts @@ -2,8 +2,8 @@ import com.vanniktech.maven.publish.JavadocJar.Dokka import com.vanniktech.maven.publish.KotlinJvm plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublishBase) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish.base") } dependencies { diff --git a/misk-lease/build.gradle.kts b/misk-lease/build.gradle.kts index 27fb1beab16..e3c6097ac6c 100644 --- a/misk-lease/build.gradle.kts +++ b/misk-lease/build.gradle.kts @@ -2,8 +2,8 @@ import com.vanniktech.maven.publish.JavadocJar.Dokka import com.vanniktech.maven.publish.KotlinJvm plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublishBase) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish.base") } dependencies { diff --git a/misk-metrics-digester/build.gradle.kts b/misk-metrics-digester/build.gradle.kts index a89f3d19811..0e65a2d1142 100644 --- a/misk-metrics-digester/build.gradle.kts +++ b/misk-metrics-digester/build.gradle.kts @@ -2,8 +2,8 @@ import com.vanniktech.maven.publish.JavadocJar.Dokka import com.vanniktech.maven.publish.KotlinJvm plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublishBase) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish.base") } dependencies { diff --git a/misk-metrics/build.gradle.kts b/misk-metrics/build.gradle.kts index 09148ec286a..47c9eca9fab 100644 --- a/misk-metrics/build.gradle.kts +++ b/misk-metrics/build.gradle.kts @@ -2,8 +2,8 @@ import com.vanniktech.maven.publish.JavadocJar.Dokka import com.vanniktech.maven.publish.KotlinJvm plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublishBase) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish.base") id("java-test-fixtures") } diff --git a/misk-policy/build.gradle.kts b/misk-policy/build.gradle.kts index 2a04514093d..e5416bc9b8f 100644 --- a/misk-policy/build.gradle.kts +++ b/misk-policy/build.gradle.kts @@ -2,8 +2,8 @@ import com.vanniktech.maven.publish.JavadocJar.Dokka import com.vanniktech.maven.publish.KotlinJvm plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublishBase) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish.base") id("java-test-fixtures") } diff --git a/misk-prometheus/build.gradle.kts b/misk-prometheus/build.gradle.kts index 2f3438f5141..f6e1a2c6b8b 100644 --- a/misk-prometheus/build.gradle.kts +++ b/misk-prometheus/build.gradle.kts @@ -2,8 +2,8 @@ import com.vanniktech.maven.publish.JavadocJar.Dokka import com.vanniktech.maven.publish.KotlinJvm plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublishBase) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish.base") } dependencies { diff --git a/misk-proto/build.gradle.kts b/misk-proto/build.gradle.kts index 38bf6480ca4..fb968b7b110 100644 --- a/misk-proto/build.gradle.kts +++ b/misk-proto/build.gradle.kts @@ -2,9 +2,9 @@ import com.vanniktech.maven.publish.JavadocJar.Dokka import com.vanniktech.maven.publish.KotlinJvm plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublishBase) - alias(libs.plugins.wire) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish.base") + id("com.squareup.wire") } wire { diff --git a/misk-rate-limiting-bucket4j-dynamodb-v1/build.gradle.kts b/misk-rate-limiting-bucket4j-dynamodb-v1/build.gradle.kts index eb5bbb00178..625ef47dad6 100644 --- a/misk-rate-limiting-bucket4j-dynamodb-v1/build.gradle.kts +++ b/misk-rate-limiting-bucket4j-dynamodb-v1/build.gradle.kts @@ -2,8 +2,8 @@ import com.vanniktech.maven.publish.JavadocJar import com.vanniktech.maven.publish.KotlinJvm plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublishBase) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish.base") id("java-test-fixtures") } diff --git a/misk-rate-limiting-bucket4j-mysql/build.gradle.kts b/misk-rate-limiting-bucket4j-mysql/build.gradle.kts index 2edcee3de03..042905fa828 100644 --- a/misk-rate-limiting-bucket4j-mysql/build.gradle.kts +++ b/misk-rate-limiting-bucket4j-mysql/build.gradle.kts @@ -2,8 +2,8 @@ import com.vanniktech.maven.publish.JavadocJar import com.vanniktech.maven.publish.KotlinJvm plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublishBase) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish.base") id("java-test-fixtures") } diff --git a/misk-rate-limiting-bucket4j-redis/build.gradle.kts b/misk-rate-limiting-bucket4j-redis/build.gradle.kts index 5a5be5ff1fa..c54e0850670 100644 --- a/misk-rate-limiting-bucket4j-redis/build.gradle.kts +++ b/misk-rate-limiting-bucket4j-redis/build.gradle.kts @@ -2,8 +2,8 @@ import com.vanniktech.maven.publish.JavadocJar import com.vanniktech.maven.publish.KotlinJvm plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublishBase) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish.base") id("java-test-fixtures") } diff --git a/misk-redis/build.gradle.kts b/misk-redis/build.gradle.kts index cff14905f20..de163279e41 100644 --- a/misk-redis/build.gradle.kts +++ b/misk-redis/build.gradle.kts @@ -2,8 +2,8 @@ import com.vanniktech.maven.publish.JavadocJar.Dokka import com.vanniktech.maven.publish.KotlinJvm plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublishBase) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish.base") id("java-test-fixtures") } diff --git a/misk-schema-migrator-gradle-plugin/build.gradle.kts b/misk-schema-migrator-gradle-plugin/build.gradle.kts index b57c70ec147..74002a1abc0 100644 --- a/misk-schema-migrator-gradle-plugin/build.gradle.kts +++ b/misk-schema-migrator-gradle-plugin/build.gradle.kts @@ -2,8 +2,8 @@ import com.vanniktech.maven.publish.GradlePlugin import com.vanniktech.maven.publish.JavadocJar plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublishBase) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish.base") id("java-gradle-plugin") } diff --git a/misk-service/build.gradle.kts b/misk-service/build.gradle.kts index f0bff92ae6d..3985c1e64b5 100644 --- a/misk-service/build.gradle.kts +++ b/misk-service/build.gradle.kts @@ -2,8 +2,8 @@ import com.vanniktech.maven.publish.JavadocJar.Dokka import com.vanniktech.maven.publish.KotlinJvm plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublishBase) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish.base") } dependencies { diff --git a/misk-slack/build.gradle.kts b/misk-slack/build.gradle.kts index fc85775f921..69a9600c566 100644 --- a/misk-slack/build.gradle.kts +++ b/misk-slack/build.gradle.kts @@ -2,8 +2,8 @@ import com.vanniktech.maven.publish.JavadocJar.Dokka import com.vanniktech.maven.publish.KotlinJvm plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublishBase) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish.base") } dependencies { diff --git a/misk-sqldelight-testing/build.gradle.kts b/misk-sqldelight-testing/build.gradle.kts index b3cac0defad..9554d438c13 100644 --- a/misk-sqldelight-testing/build.gradle.kts +++ b/misk-sqldelight-testing/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.sqldelight) + id("org.jetbrains.kotlin.jvm") + id("app.cash.sqldelight") } dependencies { diff --git a/misk-sqldelight/build.gradle.kts b/misk-sqldelight/build.gradle.kts index b619ef7a69e..c804fddbd7b 100644 --- a/misk-sqldelight/build.gradle.kts +++ b/misk-sqldelight/build.gradle.kts @@ -2,8 +2,8 @@ import com.vanniktech.maven.publish.JavadocJar.Dokka import com.vanniktech.maven.publish.KotlinJvm plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublishBase) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish.base") id("java-test-fixtures") } diff --git a/misk-tailwind/build.gradle.kts b/misk-tailwind/build.gradle.kts index b6ce7a9f2a3..60850f135ae 100644 --- a/misk-tailwind/build.gradle.kts +++ b/misk-tailwind/build.gradle.kts @@ -2,8 +2,8 @@ import com.vanniktech.maven.publish.JavadocJar.Dokka import com.vanniktech.maven.publish.KotlinJvm plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublishBase) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish.base") } dependencies { diff --git a/misk-testing-api/build.gradle.kts b/misk-testing-api/build.gradle.kts index d456030f596..8ebdca8fc9d 100644 --- a/misk-testing-api/build.gradle.kts +++ b/misk-testing-api/build.gradle.kts @@ -2,8 +2,8 @@ import com.vanniktech.maven.publish.JavadocJar.Dokka import com.vanniktech.maven.publish.KotlinJvm plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublishBase) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish.base") } mavenPublishing { diff --git a/misk-testing/build.gradle.kts b/misk-testing/build.gradle.kts index bc2973f704f..cff065f15ac 100644 --- a/misk-testing/build.gradle.kts +++ b/misk-testing/build.gradle.kts @@ -2,8 +2,8 @@ import com.vanniktech.maven.publish.JavadocJar.Dokka import com.vanniktech.maven.publish.KotlinJvm plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublishBase) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish.base") } dependencies { diff --git a/misk-transactional-jobqueue/build.gradle.kts b/misk-transactional-jobqueue/build.gradle.kts index a1dfcb772be..1745f853e4a 100644 --- a/misk-transactional-jobqueue/build.gradle.kts +++ b/misk-transactional-jobqueue/build.gradle.kts @@ -2,8 +2,8 @@ import com.vanniktech.maven.publish.JavadocJar.Dokka import com.vanniktech.maven.publish.KotlinJvm plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublishBase) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish.base") } dependencies { diff --git a/misk-warmup/build.gradle.kts b/misk-warmup/build.gradle.kts index f25d435128f..621f68e62e8 100644 --- a/misk-warmup/build.gradle.kts +++ b/misk-warmup/build.gradle.kts @@ -2,8 +2,8 @@ import com.vanniktech.maven.publish.JavadocJar.Dokka import com.vanniktech.maven.publish.KotlinJvm plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublishBase) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish.base") } dependencies { diff --git a/misk/build.gradle.kts b/misk/build.gradle.kts index c6740f8bb4d..258e45f0735 100644 --- a/misk/build.gradle.kts +++ b/misk/build.gradle.kts @@ -2,9 +2,9 @@ import com.vanniktech.maven.publish.JavadocJar.Dokka import com.vanniktech.maven.publish.KotlinJvm plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublishBase) - alias(libs.plugins.wire) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish.base") + id("com.squareup.wire") } dependencies { diff --git a/samples/exemplar/build.gradle.kts b/samples/exemplar/build.gradle.kts index fc90fbf00b9..7678fded1f4 100644 --- a/samples/exemplar/build.gradle.kts +++ b/samples/exemplar/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.wire) + id("org.jetbrains.kotlin.jvm") + id("com.squareup.wire") id("application") } diff --git a/samples/exemplarchat/build.gradle.kts b/samples/exemplarchat/build.gradle.kts index 07a0225deaa..97219b4738b 100644 --- a/samples/exemplarchat/build.gradle.kts +++ b/samples/exemplarchat/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - alias(libs.plugins.kotlinJvm) - application + id("org.jetbrains.kotlin.jvm") + id("application") } val applicationMainClass = "com.squareup.chat.ChatServiceKt" diff --git a/settings.gradle.kts b/settings.gradle.kts index 53290c40a78..f418802d0d4 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -6,9 +6,6 @@ pluginManagement { } plugins { - // When updating the cash plugin versions, update .buildkite/scripts/copy.bara.sky too - id("com.squareup.cash.develocity") version "1.186.1" - id("com.squareup.cash.remotecache") version "1.186.1" id("com.gradle.develocity") version "3.19.1" } diff --git a/wisp/wisp-aws-environment/build.gradle.kts b/wisp/wisp-aws-environment/build.gradle.kts index 645e68aedc6..599ee3c4ba7 100644 --- a/wisp/wisp-aws-environment/build.gradle.kts +++ b/wisp/wisp-aws-environment/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublish) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish") } dependencies { diff --git a/wisp/wisp-client/build.gradle.kts b/wisp/wisp-client/build.gradle.kts index ba4da2e27af..fc506c2dc1d 100644 --- a/wisp/wisp-client/build.gradle.kts +++ b/wisp/wisp-client/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublish) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish") } sourceSets { diff --git a/wisp/wisp-config/build.gradle.kts b/wisp/wisp-config/build.gradle.kts index e7d327f2a20..274913bbaff 100644 --- a/wisp/wisp-config/build.gradle.kts +++ b/wisp/wisp-config/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublish) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish") } dependencies { diff --git a/wisp/wisp-containers-testing/build.gradle.kts b/wisp/wisp-containers-testing/build.gradle.kts index 917e1c13d7d..0efc4d0ed97 100644 --- a/wisp/wisp-containers-testing/build.gradle.kts +++ b/wisp/wisp-containers-testing/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublish) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish") } dependencies { diff --git a/wisp/wisp-deployment-testing/build.gradle.kts b/wisp/wisp-deployment-testing/build.gradle.kts index 6c649f958bd..11fe81feec0 100644 --- a/wisp/wisp-deployment-testing/build.gradle.kts +++ b/wisp/wisp-deployment-testing/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublish) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish") } dependencies { diff --git a/wisp/wisp-deployment/build.gradle.kts b/wisp/wisp-deployment/build.gradle.kts index 179978d0c0a..238d14bc9a3 100644 --- a/wisp/wisp-deployment/build.gradle.kts +++ b/wisp/wisp-deployment/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublish) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish") } dependencies { diff --git a/wisp/wisp-feature-testing/build.gradle.kts b/wisp/wisp-feature-testing/build.gradle.kts index ff99fb41c09..97eb8ab314b 100644 --- a/wisp/wisp-feature-testing/build.gradle.kts +++ b/wisp/wisp-feature-testing/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublish) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish") } sourceSets { diff --git a/wisp/wisp-feature/build.gradle.kts b/wisp/wisp-feature/build.gradle.kts index 17c72ef46af..080e820954a 100644 --- a/wisp/wisp-feature/build.gradle.kts +++ b/wisp/wisp-feature/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublish) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish") } dependencies { diff --git a/wisp/wisp-launchdarkly/build.gradle.kts b/wisp/wisp-launchdarkly/build.gradle.kts index d0ef354a398..10e6e8b28bd 100644 --- a/wisp/wisp-launchdarkly/build.gradle.kts +++ b/wisp/wisp-launchdarkly/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublish) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish") } dependencies { diff --git a/wisp/wisp-lease-testing/build.gradle.kts b/wisp/wisp-lease-testing/build.gradle.kts index 0bbaf3878c3..1fd916d8794 100644 --- a/wisp/wisp-lease-testing/build.gradle.kts +++ b/wisp/wisp-lease-testing/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublish) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish") } dependencies { diff --git a/wisp/wisp-lease/build.gradle.kts b/wisp/wisp-lease/build.gradle.kts index 67024c83b8d..1aedad8f9cf 100644 --- a/wisp/wisp-lease/build.gradle.kts +++ b/wisp/wisp-lease/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublish) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish") } dependencies { diff --git a/wisp/wisp-logging-testing/build.gradle.kts b/wisp/wisp-logging-testing/build.gradle.kts index 230c737ec97..ec8cc71f413 100644 --- a/wisp/wisp-logging-testing/build.gradle.kts +++ b/wisp/wisp-logging-testing/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublish) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish") } dependencies { diff --git a/wisp/wisp-logging/build.gradle.kts b/wisp/wisp-logging/build.gradle.kts index 0106f44e942..8d52a0d6c0f 100644 --- a/wisp/wisp-logging/build.gradle.kts +++ b/wisp/wisp-logging/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublish) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish") } dependencies { diff --git a/wisp/wisp-moshi/build.gradle.kts b/wisp/wisp-moshi/build.gradle.kts index 6e7c54cde27..c4d87143804 100644 --- a/wisp/wisp-moshi/build.gradle.kts +++ b/wisp/wisp-moshi/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublish) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish") } dependencies { diff --git a/wisp/wisp-rate-limiting/bucket4j/build.gradle.kts b/wisp/wisp-rate-limiting/bucket4j/build.gradle.kts index fae98c597c4..181ebedcd68 100644 --- a/wisp/wisp-rate-limiting/bucket4j/build.gradle.kts +++ b/wisp/wisp-rate-limiting/bucket4j/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublish) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish") id("java-test-fixtures") } diff --git a/wisp/wisp-rate-limiting/build.gradle.kts b/wisp/wisp-rate-limiting/build.gradle.kts index 09a4e247f29..d08298a4a49 100644 --- a/wisp/wisp-rate-limiting/build.gradle.kts +++ b/wisp/wisp-rate-limiting/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublish) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish") id("java-test-fixtures") } diff --git a/wisp/wisp-resource-loader-testing/build.gradle.kts b/wisp/wisp-resource-loader-testing/build.gradle.kts index 9481e1db66f..8750dae6441 100644 --- a/wisp/wisp-resource-loader-testing/build.gradle.kts +++ b/wisp/wisp-resource-loader-testing/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublish) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish") } dependencies { diff --git a/wisp/wisp-resource-loader/build.gradle.kts b/wisp/wisp-resource-loader/build.gradle.kts index 5861cdf9c8e..d68bdf2c994 100644 --- a/wisp/wisp-resource-loader/build.gradle.kts +++ b/wisp/wisp-resource-loader/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublish) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish") } dependencies { diff --git a/wisp/wisp-sampling/build.gradle.kts b/wisp/wisp-sampling/build.gradle.kts index 55bbcda72ea..e2d8c9ede7e 100644 --- a/wisp/wisp-sampling/build.gradle.kts +++ b/wisp/wisp-sampling/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublish) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish") } dependencies { diff --git a/wisp/wisp-ssl/build.gradle.kts b/wisp/wisp-ssl/build.gradle.kts index 5052d379643..689d993482f 100644 --- a/wisp/wisp-ssl/build.gradle.kts +++ b/wisp/wisp-ssl/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublish) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish") } dependencies { diff --git a/wisp/wisp-task/build.gradle.kts b/wisp/wisp-task/build.gradle.kts index 2538c7d63a4..4baacfb3796 100644 --- a/wisp/wisp-task/build.gradle.kts +++ b/wisp/wisp-task/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublish) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish") } dependencies { diff --git a/wisp/wisp-time-testing/build.gradle.kts b/wisp/wisp-time-testing/build.gradle.kts index 200ba800dd0..58f9c853b72 100644 --- a/wisp/wisp-time-testing/build.gradle.kts +++ b/wisp/wisp-time-testing/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublish) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish") } dependencies { diff --git a/wisp/wisp-token-testing/build.gradle.kts b/wisp/wisp-token-testing/build.gradle.kts index 7c1018a3fd4..3ffccf7e867 100644 --- a/wisp/wisp-token-testing/build.gradle.kts +++ b/wisp/wisp-token-testing/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublish) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish") } diff --git a/wisp/wisp-token/build.gradle.kts b/wisp/wisp-token/build.gradle.kts index ab355fe6bda..2318515fdd6 100644 --- a/wisp/wisp-token/build.gradle.kts +++ b/wisp/wisp-token/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublish) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish") } dependencies { diff --git a/wisp/wisp-tracing/build.gradle.kts b/wisp/wisp-tracing/build.gradle.kts index 693f250d3d2..44c56502443 100644 --- a/wisp/wisp-tracing/build.gradle.kts +++ b/wisp/wisp-tracing/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - alias(libs.plugins.kotlinJvm) - alias(libs.plugins.mavenPublish) + id("org.jetbrains.kotlin.jvm") + id("com.vanniktech.maven.publish") id("java-test-fixtures") }