Skip to content

Commit dc4f855

Browse files
committed
chore: plugin refactorings
1 parent 24c7fc3 commit dc4f855

15 files changed

+624
-668
lines changed

gradle.properties

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ org.gradle.unsafe.isolated-projects=false
1414
kotlin.code.style=official
1515
kotlin.jvm.target.validation.mode=warning
1616

17+
## Dokka
18+
org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
19+
org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
20+
1721
# Project
1822
semver.tagPrefix=v
1923
semver.project.tagPrefix=v

gradle/libs.versions.toml

Lines changed: 35 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
[versions]
22
java = "24"
3-
kotlin = "2.1.0-Beta1"
4-
kotlin-ksp = "2.1.0-Beta1-1.0.25"
5-
kotlin-jvmtarget = "22"
3+
kotlin = "2.1.0-Beta2"
4+
kotlin-ksp = "2.1.0-Beta2-1.0.25"
5+
kotlin-jvmtarget = "21"
66
kotlin-dsl-jvmtarget = "21"
77
kotlin-api-version = "2.1"
88
kotlin-lang-version = "2.1"
9-
gradle = "8.10.2"
9+
gradle = "8.11-rc-1"
1010
java-vendor = "Oracle"
1111
java-jvmArguments = "--enable-preview"
1212
java-addModules = "jdk.incubator.vector"
@@ -22,7 +22,7 @@ org-url = "https://suresh.dev"
2222
# Gradle Dependencies Versions
2323
kotlinx-kover = "0.9.0-RC"
2424
kotlinx-io = "0.5.4"
25-
kotlinx-atomicfu = "0.25.0"
25+
kotlinx-atomicfu = "0.26.0"
2626
kotlinx-coroutines = "1.9.0"
2727
kotlinx-datetime = "0.6.1"
2828
kotlinx-serialization = "1.7.3"
@@ -31,18 +31,18 @@ kotlinx-collections-immutable = "0.3.8"
3131
kotlinx-lincheck = "2.34"
3232
kotlinx-html = "0.11.0"
3333
kotlinx-browser = "0.2"
34-
kotlinx-benchmark = "0.4.11"
34+
kotlinx-benchmark = "0.4.12"
3535
kotlinx-metadata = "0.9.0"
3636
kotlinx-reflect-lite = "1.1.0"
3737
kotlinx-bcv = "0.16.3"
38-
kotlin-dokka = "1.9.20"
39-
kotlin-wrappers = "1.0.0-pre.817"
38+
kotlin-dokka = "2.0.0-Beta"
39+
kotlin-wrappers = "1.0.0-pre.820"
4040
kotlin-redacted = "1.11.0-alpha01"
4141
kotlinx-multik = "0.2.3"
4242
kotlinx-dataframe = "0.13.1"
4343
kotlinx-kandy = "0.5.0"
4444
evas = "1.1.0"
45-
kopy = "0.11.0+2.0.20"
45+
kopy = "0.12.0+2.0.21"
4646
poko = "0.17.2"
4747
mappie = "0.8.0"
4848
akkurate = "0.10.0"
@@ -53,11 +53,11 @@ spring-boot = "3.3.4"
5353
spring-depmgmt = "1.1.6"
5454
ktor = "3.0.0"
5555
ktor-cohort = "2.5.1"
56-
otel = "1.42.1"
56+
otel = "1.43.0"
5757
otel-instr = "2.9.0"
58-
otel-instr-alpha = "2.8.0-alpha"
59-
otel-semconv = "1.27.0-alpha"
60-
otel-samplers = "1.39.0-alpha"
58+
otel-instr-alpha = "2.9.0-alpha"
59+
otel-semconv = "1.28.0-alpha"
60+
otel-samplers = "1.40.0-alpha"
6161
elastic-otel = "0.4.0"
6262
okio = "3.9.1"
6363
sslcontext-kickstart = "8.3.7"
@@ -76,17 +76,17 @@ jte = "3.1.13"
7676
jimfs = "1.3.0"
7777
sshj = "0.38.0"
7878
jsch = "0.2.20"
79-
pty4j = "0.13.0"
80-
junit = "5.11.2"
79+
pty4j = "0.13.2"
80+
junit = "5.11.3"
8181
koin = "4.0.0"
8282
kotest = "6.0.0.M1"
8383
mockk = "1.13.13"
8484
mokkery = "2.4.0"
85-
wiremock = "3.9.1"
85+
wiremock = "3.9.2"
8686
wiremock-kotlin = "2.1.1"
8787
okhttp = "5.0.0-alpha.14"
8888
slf4j = "2.1.0-alpha1"
89-
logback = "1.5.9"
89+
logback = "1.5.11"
9090
logback-tyler = "0.7"
9191
log4j = "3.0.0-beta2"
9292
jmh = "1.37"
@@ -111,9 +111,9 @@ kotlin-cryptography = "0.4.0"
111111
uri-kmp = "0.0.18"
112112
urlencoder = "1.5.0"
113113
bytesize = "2.0.0-beta04"
114-
cash-turbine = "1.1.0"
114+
cash-turbine = "1.2.0"
115115
cardiologist = "0.2.2"
116-
kmp-store5 = "5.1.0-alpha05"
116+
kmp-store5 = "5.1.0-alpha04"
117117
kmp-settings = "1.2.0"
118118
kmp-appdirs = "1.2.0"
119119
parsus = "0.6.1"
@@ -125,37 +125,37 @@ exposed = "0.55.0"
125125
postgresql = "42.7.4"
126126
hikariCP = "6.0.0"
127127
h2 = "2.3.232"
128-
micrometer = "1.13.5"
128+
micrometer = "1.13.3"
129129
swagger-ui = "5.17.14"
130130
hoplite = "2.8.0"
131131
config4k = "0.6.0"
132132
shedlock = "5.15.0"
133133
sherlock = "1.0.1"
134134
sqids = "0.1.0"
135135
tsid = "2.1.1"
136-
expiringmap = "0.5.11"
136+
expiringmap = "0.5.10"
137137
otp = "2.0.3"
138138
password4j = "1.8.2"
139139
apache-commons-imaging = "1.0-alpha3"
140-
testcontainers = "1.20.2"
140+
testcontainers = "1.20.3"
141141
sourceBuddy = "2.5.0"
142142
tcp-javanioproxy = "1.6"
143-
kubernetes-client = "21.0.1"
143+
kubernetes-client = "21.0.2"
144144
reflect-typeparamresolver = "1.0.2"
145145
reflect-typetools = "0.6.3"
146146
async-profiler = "3.0"
147147
ap-loader-all = "3.0-9"
148148
openjdk-jmc = "9.0.0"
149149
airlift-aircompressor = "2.0.2"
150-
airlift-security = "273"
150+
airlift-security = "275"
151151
directory-keystore = "1.1.0"
152152
maven-mima = "3.0.0-alpha-3"
153153
maven-archeologist = "0.0.10"
154-
jfree-chart = "1.5.5"
154+
jfree-chart = "1.5.4"
155155
jfree-svg = "5.0.6"
156156
xchart = "3.8.7"
157157
batik = "1.17"
158-
twelvemonkeys = "3.10.1"
158+
twelvemonkeys = "3.12.0"
159159
okapibarcode = "0.4.1"
160160
chasm = "0.7.1"
161161
kfswatch = "1.3.0"
@@ -165,16 +165,16 @@ ldaptive = "2.3.2"
165165
chicory = "0.0.12"
166166

167167
# Compose
168-
jetbrains-compose = "1.7.0-rc01"
169-
jetbrains-compose-viewmodel = "2.8.3-rc01"
168+
jetbrains-compose = "1.7.0"
169+
jetbrains-compose-viewmodel = "2.8.3"
170170
jetbrains-compose-nav = "2.8.0-alpha10"
171-
jetbrains-compose-adaptive = "1.0.0-rc01"
171+
jetbrains-compose-adaptive = "1.0.0"
172172
kobweb = "0.19.2"
173173
detekt = "1.23.7"
174-
detekt-compose-rules = "0.4.12"
174+
detekt-compose-rules = "0.4.16"
175175
compose-icons = "1.1.0"
176176
compose-routing = "0.4.0"
177-
kottie = "2.0.0"
177+
kottie = "2.0.1"
178178
mosaic = "0.14.0"
179179

180180
# NPM Dependencies
@@ -191,14 +191,14 @@ foojay-resolver = "0.8.0"
191191
gradle-develocity = "3.18.1"
192192
nmcp = "0.0.9"
193193
nexus-publish = "2.0.0"
194-
vanniktech-publish = "0.29.0"
194+
vanniktech-publish = "0.30.0"
195195
shadow = "8.3.3"
196-
spotless = "7.0.0.BETA2"
196+
spotless = "7.0.0.BETA3"
197197
semver-plugin = "0.8.0"
198198
tasktree = "4.0.0"
199199
sigstore = "1.0.0"
200200
reproducible-builds = "1.0"
201-
autonomousapps-depanalysis = "2.1.4"
201+
autonomousapps-depanalysis = "2.2.0"
202202
autonomousapps-bestpractices = "0.10"
203203
graalvm-nativeimage = "0.10.3"
204204
github-depgraph = "0.1.0"
@@ -211,7 +211,7 @@ modulegraph = "0.10.1"
211211
cash-molecule = "1.4.3"
212212
npm-publish-plugin = "3.4.3"
213213
exposed-plugin = "0.2.1"
214-
jib-plugin = "3.4.3"
214+
jib-plugin = "3.4.4"
215215
jib-nativeimage-extn = "0.1.0"
216216
includegit-plugin = "0.1.6"
217217
kmp-hierarchy = "1.1"
@@ -238,7 +238,6 @@ build-kotlinx-atomicfu = { module = "org.jetbrains.kotlinx:atomicf
238238
build-kotlinx-benchmark = { module = "org.jetbrains.kotlinx:kotlinx-benchmark-plugin" , version.ref = "kotlinx-benchmark"}
239239
build-kotlin-dsl = { module = "org.gradle.kotlin:gradle-kotlin-dsl-plugins" , version.ref = "gradle-kotlin-dsl"}
240240
build-dokka-plugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin" , version.ref = "kotlin-dokka"}
241-
build-dokka-base = { module = "org.jetbrains.dokka:dokka-base" , version.ref = "kotlin-dokka"}
242241
build-kotlin-ksp = { module = "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin" , version.ref = "kotlin-ksp"}
243242
build-kopy-plugin = { module = "com.javiersc.kotlin:kopy-gradle-plugin" , version.ref = "kopy"}
244243
build-redacted-plugin = { module = "dev.zacsweers.redacted:redacted-compiler-plugin-gradle" , version.ref = "kotlin-redacted"}

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-rc-1-all.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

plugins/build.gradle.kts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import gg.jte.gradle.GenerateJteTask
44
import org.jetbrains.kotlin.gradle.dsl.*
55

66
plugins {
7-
// Just apply with `kotlin-dsl` id.
87
id("org.gradle.kotlin.kotlin-dsl")
98
// embeddedKotlin("jvm")
109
embeddedKotlin("plugin.serialization")
@@ -118,9 +117,6 @@ gradlePlugin {
118117
}
119118

120119
dependencies {
121-
// Hack to access version catalog from pre-compiled script plugins.
122-
// https://github.com/gradle/gradle/issues/15383#issuecomment-779893192
123-
implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
124120
implementation(platform(libs.kotlin.bom))
125121
implementation(libs.kotlin.stdlib)
126122
implementation(libs.kotlinx.coroutines.core)
@@ -153,7 +149,6 @@ dependencies {
153149
implementation(libs.build.kotlinx.benchmark)
154150
implementation(libs.build.kotlinx.bcv)
155151
implementation(libs.build.dokka.plugin)
156-
implementation(libs.build.dokka.base)
157152
implementation(libs.build.redacted.plugin)
158153
implementation(libs.build.gradle.develocity)
159154
implementation(libs.build.nmcp.plugin)
@@ -176,6 +171,9 @@ dependencies {
176171
implementation(libs.build.kopy.plugin)
177172
implementation(libs.build.tomlj)
178173

174+
// https://github.com/gradle/gradle/issues/15383#issuecomment-779893192
175+
implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
176+
179177
// implementation(libs.build.kotlin.compose.compiler)
180178
// implementation(libs.build.karakum.plugin)
181179
// implementation(libs.jte.native)

0 commit comments

Comments
 (0)