Skip to content

Commit bf253e2

Browse files
committed
chore: plugin cleanups
1 parent 98443b4 commit bf253e2

File tree

6 files changed

+13
-20
lines changed

6 files changed

+13
-20
lines changed

plugins/project/build.gradle.kts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,18 +100,17 @@ dependencies {
100100
implementation(libs.plugins.redacted.dep)
101101
implementation(libs.plugins.spotless.dep)
102102
implementation(libs.plugins.shadow.dep)
103-
implementation(libs.plugins.mrjar.dep)
104103
implementation(libs.plugins.semver.dep)
105104
implementation(libs.plugins.benmanes.dep)
106-
implementation(libs.plugins.tasktree.dep)
107105
implementation(libs.plugins.jte.dep)
108106
implementation(libs.plugins.jib.dep)
109-
implementation(libs.plugins.github.changelog.dep)
110107
implementation(libs.plugins.vanniktech.publish.dep)
111108
implementation(libs.jib.nativeimage.extn)
112-
implementation(libs.kmpmt)
113109
implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
110+
// implementation(libs.plugins.mrjar.dep)
111+
// implementation(libs.plugins.github.changelog.dep)
114112
// implementation(libs.plugins.kopy.dep)
115113
// implementation(libs.plugins.nexus.publish.dep)
114+
// implementation(libs.kmpmt)
116115
// compileOnly(libs.jte.kotlin)
117116
}

plugins/project/src/main/kotlin/common/Multiplatform.kt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,17 @@ fun KotlinMultiplatformExtension.jvmTarget(project: Project) =
4343
jvmMain {
4444
// dependsOn(jvmCommon)
4545
dependencies {
46-
// api(libs.kotlin.stdlib)
47-
api(libs.kotlin.metadata.jvm)
4846
api(libs.ktor.client.java)
4947
api(libs.slf4j.api)
50-
api(libs.slf4j.jul)
5148
api(libs.kotlinx.coroutines.slf4j)
52-
api(libs.jspecify)
5349
api(libs.bundles.keystore)
54-
api(libs.google.auto.annotations)
50+
api(libs.jspecify)
51+
// api(libs.kotlin.stdlib)
52+
// api(libs.kotlin.metadata.jvm)
53+
// api(libs.slf4j.jul)
54+
5555
ksp(libs.ksp.auto.service)
56+
compileOnly(libs.google.auto.annotations)
5657
}
5758
}
5859

plugins/project/src/main/kotlin/dev.suresh.plugin.kotlin.docs.gradle.kts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import common.*
22
import java.time.Year
3-
import org.hildan.github.changelog.plugin.GitHubChangelogExtension
43
import org.jetbrains.dokka.gradle.engine.parameters.VisibilityModifier
54

65
plugins {
@@ -10,9 +9,8 @@ plugins {
109
// `test-report-aggregation`
1110
}
1211

13-
// The following plugins and config apply only to a root project.
1412
if (isRootProject) {
15-
apply(plugin = "org.hildan.github.changelog")
13+
// apply(plugin = "org.hildan.github.changelog")
1614

1715
// Combined test reports
1816
val allTestReports by
@@ -119,7 +117,3 @@ spotless {
119117
endWithNewline()
120118
}
121119
}
122-
123-
pluginManager.withPlugin("org.hildan.github.changelog") {
124-
configure<GitHubChangelogExtension> { githubUser = project.githubUser }
125-
}

plugins/project/src/main/kotlin/dev.suresh.plugin.kotlin.jvm.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,14 +231,14 @@ dependencies {
231231
implementation(libs.kotlinx.datetime)
232232
implementation(libs.kotlinx.collections.immutable)
233233
implementation(libs.kotlin.redacted.annotations)
234-
implementation(libs.jspecify)
235234
implementation(libs.bundles.keystore)
235+
implementation(libs.jspecify)
236236
implementation(libs.slf4j.api)
237237
// implementation(libs.slf4j.jul)
238238

239239
// Auto-service
240240
ksp(libs.ksp.auto.service)
241-
implementation(libs.google.auto.annotations)
241+
compileOnly(libs.google.auto.annotations)
242242

243243
// Test dependencies
244244
testImplementation(platform(libs.junit.bom))

plugins/project/src/main/kotlin/dev.suresh.plugin.kotlin.mpp.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ kotlin {
5656
api(libs.kotlin.redacted.annotations)
5757
api(libs.kotlin.retry)
5858
api(libs.kotlin.logging)
59-
api(libs.kotlinx.html)
6059
api(libs.ktor.client.core)
6160
api(libs.ktor.client.cio)
6261
api(libs.ktor.client.content.negotiation)
@@ -67,6 +66,7 @@ kotlin {
6766
api(libs.ktor.client.serialization)
6867
api(libs.ktor.client.websockets)
6968
api(libs.ktor.serialization.json)
69+
// api(libs.kotlinx.html)
7070

7171
testImplementation(kotlin("test"))
7272
testImplementation(libs.kotlinx.coroutines.test)

plugins/project/src/main/kotlin/dev.suresh.plugin.root.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ plugins {
1010
id("dev.suresh.plugin.kotlin.docs")
1111
id("dev.suresh.plugin.publishing")
1212
com.github.`ben-manes`.versions
13-
com.dorongold.`task-tree`
1413
// id("gg.jte.gradle")
1514
// com.autonomousapps.`dependency-analysis`
1615
}

0 commit comments

Comments
 (0)