Skip to content

Commit fe842d0

Browse files
committed
chore: dep updates and misc refactorings
1 parent b8d9b8b commit fe842d0

File tree

7 files changed

+27
-31
lines changed

7 files changed

+27
-31
lines changed

gradle/build-logic/src/main/kotlin/common/Multiplatform.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ fun KotlinMultiplatformExtension.jvmTarget(project: Project) =
108108
executable {
109109
mainClass = libs.versions.app.mainclass
110110
applicationDefaultJvmArgs = jvmRunArgs
111-
applicationDistribution.duplicatesStrategy = DuplicatesStrategy.WARN
111+
applicationDistribution.duplicatesStrategy = DuplicatesStrategy.INCLUDE
112112
}
113113
}
114114
}

gradle/build-logic/src/main/kotlin/dev.suresh.plugin.kotlin.jvm.gradle.kts

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,14 @@ apply(plugin = "dev.suresh.plugin.depreports")
3535
// Load the build script from a file
3636
// apply(from = rootDir.resolve("project.plugin.gradle.kts"))
3737

38+
configurations.configureEach {
39+
resolutionStrategy {
40+
// failOnNonReproducibleResolution()
41+
// eachDependency { if (requested.name.contains("intellij-coverage")) {
42+
// useVersion(libs.versions.intellij.coverage.get()) }}
43+
}
44+
}
45+
3846
java {
3947
withSourcesJar()
4048
withJavadocJar()
@@ -115,7 +123,7 @@ tasks {
115123
Attributes.Name.IMPLEMENTATION_VENDOR.toString() to project.group,
116124
)
117125
}
118-
duplicatesStrategy = DuplicatesStrategy.WARN
126+
duplicatesStrategy = DuplicatesStrategy.INCLUDE
119127
}
120128

121129
processResources {
@@ -290,16 +298,3 @@ dependencies {
290298
testImplementation(libs.mockk)
291299
// testImplementation(libs.slf4j.simple)
292300
}
293-
294-
allprojects {
295-
configurations.configureEach {
296-
resolutionStrategy {
297-
// force()
298-
eachDependency {
299-
if (requested.name.contains("intellij-coverage")) {
300-
// useVersion(libs.versions.intellij.coverage.get())
301-
}
302-
}
303-
}
304-
}
305-
}

gradle/build-logic/src/main/kotlin/dev.suresh.plugin.kotlin.mpp.gradle.kts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ tasks {
127127
Attributes.Name.IMPLEMENTATION_VENDOR.toString() to project.group,
128128
)
129129
}
130-
duplicatesStrategy = DuplicatesStrategy.WARN
130+
duplicatesStrategy = DuplicatesStrategy.INCLUDE
131131
}
132132

133133
withType<ProcessResources>().configureEach {
@@ -152,19 +152,20 @@ tasks {
152152

153153
pluginManager.withPlugin("com.gradleup.shadow") {
154154
// Register a shadowJar task for the default jvm target
155-
val mainCompilation = kotlin.jvm().compilations.getByName("main")
156155
val shadowJvmJar by
157156
registering(ShadowJar::class) {
158-
from(tasks.named("jvmJar"))
159-
// from(mainCompilation.output.allOutputs) -> allOutputs == classes + resources
157+
val main by kotlin.jvm().compilations
158+
// allOutputs == classes + resources
159+
from(main.output.allOutputs)
160160
val runtimeDepConfig =
161-
project.configurations.getByName(mainCompilation.runtimeDependencyConfigurationName)
161+
project.configurations.getByName(main.runtimeDependencyConfigurationName)
162162
configurations = listOf(runtimeDepConfig)
163163
archiveClassifier = "all"
164164
mergeServiceFiles()
165165
manifest {
166166
attributes[Attributes.Name.MAIN_CLASS.toString()] = libs.versions.app.mainclass
167167
}
168+
duplicatesStrategy = DuplicatesStrategy.INCLUDE
168169
}
169170

170171
val buildExecutable by

gradle/libs.versions.toml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ kotlin-jvmtarget = "21"
66
kotlin-dsl-jvmtarget = "21"
77
kotlin-api-version = "2.1"
88
kotlin-lang-version = "2.1"
9-
gradle = "8.13-rc-2"
9+
gradle = "8.13"
1010
java-vendor = "Oracle"
1111
java-jvmArguments = "--enable-preview"
1212
java-addModules = "jdk.incubator.vector"
@@ -42,7 +42,7 @@ kotlin-wrappers = "2025.2.8"
4242
kotlin-redacted = "1.12.1"
4343
kotlin-serviceloader = "0.0.15"
4444
kotlinx-multik = "0.2.3"
45-
kotlinx-dataframe = "0.16.0-dev-5786"
45+
kotlinx-dataframe = "0.16.0-dev-5838"
4646
kotlinx-kandy = "0.8.0"
4747
kotlin-statistics = "0.4.0-RC1"
4848
evas = "1.2.0"
@@ -55,7 +55,7 @@ snakeyaml-engine-kmp = "3.1.1"
5555
konsist = "0.17.3"
5656
spring-boot = "3.4.2"
5757
spring-depmgmt = "1.1.7"
58-
ktor = "3.1.0"
58+
ktor = "3.1.1"
5959
ktor-cohort = "2.6.1"
6060
otel = "1.47.0"
6161
otel-instr = "2.13.1"
@@ -83,7 +83,7 @@ jsch = "0.2.23"
8383
pty4j = "0.13.2"
8484
junit = "5.12.0"
8585
koin = "4.1.0-Beta5"
86-
koin-annotations = "2.0.0-RC4"
86+
koin-annotations = "2.0.0"
8787
kotest = "6.0.0.M2"
8888
mockk = "1.13.16"
8989
mokkery = "2.7.0"
@@ -141,7 +141,7 @@ config4k = "0.7.0"
141141
shedlock = "6.3.0"
142142
sherlock = "1.0.3"
143143
sqids = "0.1.0"
144-
tsid = "2.1.3"
144+
tsid = "2.1.4"
145145
expiringmap = "0.5.10"
146146
otp = "2.1.0"
147147
password4j = "1.8.2"
@@ -156,7 +156,7 @@ async-profiler = "3.0"
156156
ap-loader-all = "3.0-9"
157157
openjdk-jmc = "9.0.0"
158158
airlift-aircompressor = "2.0.2"
159-
airlift-security = "305"
159+
airlift-security = "309"
160160
directory-keystore = "1.1.0"
161161
maven-mima = "3.0.0-alpha-3"
162162
maven-archeologist = "0.0.10"
@@ -181,7 +181,7 @@ chicory = "1.1.0"
181181
weh-bindings = "0.3"
182182
log4k = "0.30.0"
183183
rwmutex = "1.0.0"
184-
bluesky-ozone = "0.3.1"
184+
bluesky-ozone = "0.3.2"
185185

186186
# Compose
187187
jetbrains-compose = "1.8.0-alpha03"
@@ -213,7 +213,7 @@ nmcp = "0.0.9"
213213
nexus-publish = "2.0.0"
214214
vanniktech-publish = "0.30.0"
215215
gradle-publish = "1.3.0"
216-
shadow = "9.0.0-beta8"
216+
shadow = "9.0.0-beta9"
217217
spotless = "7.0.2"
218218
semver-plugin = "0.8.0"
219219
vercraft = "0.5.0"
@@ -227,12 +227,12 @@ graalvm-nativeimage = "0.10.5"
227227
github-depgraph = "0.1.0"
228228
github-changelog = "2.2.0"
229229
wire-plugin = "5.3.0"
230-
buildkonfig = "0.16.0"
230+
buildkonfig = "0.17.0"
231231
gmazzo-buildconfig = "3.1.0"
232232
cyclonedx-plugin = "1.10.0"
233233
modulegraph = "0.12.0"
234234
cash-molecule = "1.4.3"
235-
npm-publish-plugin = "3.5.2"
235+
npm-publish-plugin = "3.5.3"
236236
exposed-plugin = "0.2.1"
237237
jib-plugin = "3.4.4"
238238
jib-nativeimage-extn = "0.1.0"

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.13-rc-2-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)