Skip to content

Commit ae8e627

Browse files
committed
chore: refactor build dependencies
1 parent 5c4ea55 commit ae8e627

File tree

3 files changed

+128
-188
lines changed

3 files changed

+128
-188
lines changed

backend/jvm/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ plugins {
1010
gg.jte.gradle
1111
dev.suresh.plugin.graalvm
1212
com.gradleup.shadow
13-
alias(libs.plugins.ktor)
14-
alias(libs.plugins.exposed)
13+
alias(libs.plugins.jetbrains.ktor)
14+
alias(libs.plugins.jetbrains.exposed)
1515
dev.suresh.plugin.publishing
1616
}
1717

gradle/build-logic/build.gradle.kts

Lines changed: 42 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -140,67 +140,53 @@ dependencies {
140140
implementation(libs.kotlin.stdlib)
141141
implementation(libs.kotlinx.coroutines.core)
142142
implementation(libs.kotlinx.datetime)
143-
implementation(libs.kotlinx.collections.immutable)
144-
implementation(libs.ktor.client.java)
145-
implementation(libs.ktor.client.content.negotiation)
146-
implementation(libs.ktor.client.encoding)
147-
implementation(libs.ktor.client.logging)
148-
implementation(libs.ktor.client.resources)
149-
implementation(libs.ktor.client.auth)
150-
implementation(libs.ktor.serialization.json)
143+
implementation(libs.kotlinx.serialization.json)
151144
implementation(libs.ajalt.mordant.coroutines)
152-
implementation(libs.build.zip.prefixer)
153145
implementation(libs.jte.runtime)
154146
jteGenerate(libs.jte.models)
155-
// compileOnly(libs.jte.kotlin)
147+
156148

157149
// External plugins deps to use in precompiled script plugins
158-
// https://docs.gradle.org/current/userguide/implementing_gradle_plugins_precompiled.html#sec:applying_external_plugins
159-
implementation(libs.build.kotlin)
160-
// OR implementation(kotlin("gradle-plugin"))
161-
implementation(libs.build.kotlin.ksp)
162-
implementation(libs.build.kotlinx.atomicfu)
163-
implementation(libs.build.kotlin.allopen)
164-
implementation(libs.build.kotlin.powerassert)
165-
implementation(libs.build.kotlin.jsplainobjects)
166-
implementation(libs.build.kotlinx.serialization)
167-
implementation(libs.build.kotlinx.kover)
168-
implementation(libs.build.kotlinx.benchmark)
169-
implementation(libs.build.kotlinx.bcv)
170-
implementation(libs.build.kmpmt)
171-
implementation(libs.build.dokka.plugin)
172-
implementation(libs.build.redacted.plugin)
173-
implementation(libs.build.gradle.develocity)
174-
implementation(libs.build.nmcp.plugin)
175-
implementation(libs.build.nexus.plugin)
176-
implementation(libs.build.spotless.plugin)
177-
implementation(libs.build.shadow.plugin)
178-
implementation(libs.build.mrjar.plugin)
179-
implementation(libs.build.semver.plugin)
180-
implementation(libs.build.benmanesversions)
181-
implementation(libs.build.tasktree)
182-
implementation(libs.build.foojay.resolver)
183-
implementation(libs.build.nativeimage.plugin)
184-
implementation(libs.build.mokkery.plugin)
185-
implementation(libs.build.jte.plugin)
186-
implementation(libs.build.jib.plugin)
187-
implementation(libs.build.jib.nativeimage.extn)
188-
implementation(libs.build.github.changelog)
189-
implementation(libs.build.modulegraph.plugin)
190-
implementation(libs.build.kopy.plugin)
191-
implementation(libs.build.tomlj)
192-
193-
// https://github.com/gradle/gradle/issues/15383#issuecomment-779893192
150+
implementation(libs.plugins.kotlin.multiplatform.dep)
151+
implementation(libs.plugins.kotlin.allopen.dep)
152+
implementation(libs.plugins.kotlin.powerassert.dep)
153+
implementation(libs.plugins.kotlin.js.plainobjects.dep)
154+
implementation(libs.plugins.kotlin.ksp.dep)
155+
implementation(libs.plugins.kotlinx.atomicfu.dep)
156+
implementation(libs.plugins.kotlinx.serialization.dep)
157+
implementation(libs.plugins.kotlinx.kover.dep)
158+
implementation(libs.plugins.kotlinx.benchmark.dep)
159+
implementation(libs.plugins.kotlinx.bcv.dep)
160+
implementation(libs.plugins.jetbrains.dokka.dep)
161+
implementation(libs.plugins.graalvm.nativeimage.dep)
162+
implementation(libs.plugins.gradle.develocity.dep)
163+
implementation(libs.plugins.foojay.resolver.dep)
164+
implementation(libs.plugins.redacted.dep)
165+
implementation(libs.plugins.nmcp.dep)
166+
implementation(libs.plugins.spotless.dep)
167+
implementation(libs.plugins.shadow.dep)
168+
implementation(libs.plugins.mrjar.dep)
169+
implementation(libs.plugins.semver.dep)
170+
implementation(libs.plugins.benmanes.dep)
171+
implementation(libs.plugins.tasktree.dep)
172+
implementation(libs.plugins.mokkery.dep)
173+
implementation(libs.plugins.jte.dep)
174+
implementation(libs.plugins.jib.dep)
175+
implementation(libs.plugins.modulegraph.dep)
176+
implementation(libs.plugins.kopy.dep)
177+
implementation(libs.plugins.github.changelog.dep)
178+
179+
implementation(libs.tomlj)
180+
implementation(libs.jib.nativeimage.extn)
181+
implementation(libs.zip.prefixer)
182+
implementation(libs.kmpmt)
194183
implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
195-
196-
// implementation(libs.build.kotlin.compose.compiler)
197-
// implementation(libs.build.karakum.plugin)
198-
// implementation(libs.jte.native)
199-
// implementation(libs.build.kmp.hierarchy)
200-
// implementation(libs.build.includegit.plugin)
201-
// implementation(libs.build.dependencyanalysis)
202-
203184
testImplementation(gradleTestKit())
204-
// For using kotlin-dsl in pre-compiled script plugins
205-
// implementation("${libs.build.kotlin.dsl.get().module}:${expectedKotlinDslPluginsVersion}")
185+
// compileOnly(libs.jte.kotlin)
206186
}
187+
188+
val Provider<PluginDependency>.dep: Provider<String>
189+
get() = map { "${it.module}:${it.version}" }
190+
191+
val PluginDependency.module
192+
get() = "$pluginId:$pluginId.gradle.plugin"

0 commit comments

Comments
 (0)