Skip to content

Commit 8dc4ba9

Browse files
committed
chore: dep updates
1 parent d82fefa commit 8dc4ba9

File tree

8 files changed

+50
-21
lines changed

8 files changed

+50
-21
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ semver.logOnlyOnRootProject=true
6060
# semver.remote=origin
6161

6262
# Snapshot Repo
63-
enableMavenSnapshot=false
63+
maven.snapshot.repo.enabled=false
6464

6565
# Other projects
6666
composeBuild=true

gradle/build-logic/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ kotlin.code.style=official
1818
kotlin.jvm.target.validation.mode=warning
1919

2020
# Snapshot Repo
21-
enableMavenSnapshot=false
21+
maven.snapshot.repo.enabled=false
2222

2323
# KSP
2424
ksp.useKSP2=true

gradle/build-logic/settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ dependencyResolutionManagement {
1212
}
1313

1414
fun RepositoryHandler.mavenSnapshot() {
15-
val mvnSnapshot = providers.gradleProperty("enableMavenSnapshot").orNull.toBoolean()
15+
val mvnSnapshot = providers.gradleProperty("maven.snapshot.repo.enabled").orNull.toBoolean()
1616
if (mvnSnapshot) {
1717
val mvnSnapshotRepo =
1818
file(rootDir)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ val Project.debugEnabled
7777
get() = gradleBooleanProperty("debug").get()
7878

7979
val Project.isSnapshotVersion
80-
get() = version.toString().endsWith("SNAPSHOT", true)
80+
get() = version.toString().endsWith("-SNAPSHOT", true)
8181

8282
val Project.isKmpExecEnabled
8383
get() = extra.has("enableKmpExec") && extra["enableKmpExec"] as Boolean
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package common
2+
3+
import kotlin.text.toBoolean
4+
import org.gradle.api.initialization.Settings
5+
import org.gradle.api.provider.Provider
6+
7+
fun Settings.gradleBooleanProperty(name: String): Provider<Boolean> =
8+
providers.gradleProperty(name).map(String::toBoolean).orElse(false)
9+
10+
val Settings.isNativeTargetEnabled: Boolean
11+
get() = gradleBooleanProperty("kotlin.target.native.enabled").get()
12+
13+
val Settings.isWinTargetEnabled: Boolean
14+
get() = gradleBooleanProperty("kotlin.target.win.enabled").get()
15+
16+
val Settings.isComposeEnabled: Boolean
17+
get() = gradleBooleanProperty("compose.enabled").get()
18+
19+
val Settings.isSpringBootEnabled: Boolean
20+
get() = gradleBooleanProperty("springboot.enabled").get()

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

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,24 @@
22

33
import com.gradle.develocity.agent.gradle.scan.PublishedBuildScan
44
import com.javiersc.semver.settings.gradle.plugin.SemverSettingsExtension
5-
import common.GithubAction
5+
import common.*
66
import kotlinx.kover.gradle.aggregation.settings.dsl.KoverSettingsExtension
7-
import org.gradle.api.JavaVersion.VERSION_17
7+
import org.gradle.api.JavaVersion.VERSION_21
88
import org.gradle.kotlin.dsl.*
99
import org.gradle.toolchains.foojay.FoojayToolchainResolver
1010
import org.tomlj.Toml
1111

1212
val versionCatalog by lazy {
1313
// A hack to read version catalog from settings
1414
runCatching {
15-
Toml.parse(file("$rootDir/gradle/libs.versions.toml").readText()).getTable("versions")
15+
Toml.parse(settingsDir.resolve("gradle/libs.versions.toml").readText()).getTable("versions")
1616
}
1717
.getOrNull()
1818
}
1919

2020
pluginManagement {
21-
require(JavaVersion.current().isCompatibleWith(VERSION_17)) {
22-
"This build requires Gradle to be run with at least Java $VERSION_17"
21+
require(JavaVersion.current().isCompatibleWith(VERSION_21)) {
22+
"This build requires Gradle to be run with at least Java $VERSION_21"
2323
}
2424

2525
resolutionStrategy {
@@ -77,7 +77,7 @@ toolchainManagement {
7777
}
7878

7979
configure<SemverSettingsExtension> {
80-
// val ktVersion = versionCatalog.getString("kotlin").orEmpty()
80+
// val ktVersion = versionCatalog?.getString("kotlin").orEmpty()
8181
// mapVersion { it.copy(metadata = ktVersion).toString() }
8282
}
8383

@@ -137,11 +137,13 @@ fun RepositoryHandler.nodeJS() {
137137
}
138138

139139
fun RepositoryHandler.mavenSnapshot() {
140-
val mvnSnapshot = providers.gradleProperty("enableMavenSnapshot").orNull.toBoolean()
140+
val mvnSnapshot = gradleBooleanProperty("maven.snapshot.repo.enabled").get()
141141
if (mvnSnapshot) {
142142
logger.lifecycle("❖ Maven Snapshot is enabled!")
143143
maven(url = versionCatalog?.getString("repo-mvn-snapshot").orEmpty()) {
144+
name = "Central Portal Snapshots"
144145
mavenContent { snapshotsOnly() }
146+
// content { includeModule("dev.suresh", "app") }
145147
}
146148
}
147149
}

gradle/libs.versions.toml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[versions]
22
java = "25"
3-
kotlin = "2.1.20-RC"
3+
kotlin = "2.1.20-RC2"
44
kotlin-ksp = "2.1.20-RC-1.0.31"
55
kotlin-jvmtarget = "21"
66
kotlin-dsl-jvmtarget = "21"
@@ -20,7 +20,7 @@ org-name = "suresh.dev"
2020
org-url = "https://suresh.dev"
2121

2222
# Gradle Dependencies Versions
23-
bc-plugins = "1.14.0"
23+
bc-plugins = "1.15.0"
2424
kotlinx-kover = "0.9.1"
2525
kotlinx-bcv = "0.17.0"
2626
kotlin-dokka = "2.0.0"
@@ -32,7 +32,7 @@ kotlinx-datetime-zoneinfo = "2025a-spi.0.6.2"
3232
kotlinx-serialization = "1.8.0"
3333
kotlinx-rpc = "0.5.1"
3434
kotlinx-collections-immutable = "0.3.8"
35-
kotlinx-lincheck = "2.36"
35+
kotlinx-lincheck = "2.37"
3636
kotlinx-html = "0.12.0"
3737
kotlinx-browser = "0.3"
3838
kotlinx-benchmark = "0.4.13"
@@ -65,7 +65,7 @@ otel-semconv = "1.30.0"
6565
otel-samplers = "1.44.0-alpha"
6666
elastic-otel = "0.4.0"
6767
okio = "3.10.2"
68-
sslcontext-kickstart = "9.0.0"
68+
sslcontext-kickstart = "9.1.0"
6969
ksp-auto-service = "1.2.0"
7070
gradle-kotlin-dsl = "4.3.1"
7171
zip-prefixer = "0.3.1"
@@ -107,7 +107,7 @@ jspecify = "1.0.0"
107107
rsocket = "0.16.0"
108108
jctools = "4.0.5"
109109
kotlin-codepoints = "0.9.0"
110-
kotlin-logging = "7.0.4"
110+
kotlin-logging = "7.0.5"
111111
kotlin-bignum = "0.3.10"
112112
kotlin-diff = "1.0.0"
113113
kotlin-retry = "2.0.1"
@@ -151,7 +151,7 @@ testcontainers = "1.20.6"
151151
sourceBuddy = "2.5.0"
152152
tcp-javanioproxy = "1.6"
153153
kubernetes-client = "23.0.0"
154-
reflect-typeparamresolver = "1.0.2"
154+
reflect-typeparamresolver = "1.0.3"
155155
reflect-typetools = "0.6.3"
156156
async-profiler = "3.0"
157157
ap-loader-all = "3.0-9"
@@ -189,7 +189,7 @@ jetbrains-compose = "1.8.0-alpha03"
189189
jetbrains-compose-viewmodel = "2.9.0-alpha03"
190190
jetbrains-compose-nav = "2.8.0-alpha13"
191191
jetbrains-compose-adaptive = "1.1.0-alpha03"
192-
kobweb = "0.20.3"
192+
kobweb = "0.20.4"
193193
detekt = "1.23.8"
194194
detekt-compose-rules = "0.4.22"
195195
compose-hotreload = "1.0.0-alpha01"
@@ -213,7 +213,7 @@ foojay-resolver = "0.9.0"
213213
gradle-develocity = "3.19.2"
214214
nmcp = "0.0.9"
215215
nexus-publish = "2.0.0"
216-
vanniktech-publish = "0.30.0"
216+
vanniktech-publish = "0.31.0"
217217
gradle-publish = "1.3.0"
218218
shadow = "9.0.0-beta10"
219219
spotless = "7.0.2"
@@ -250,8 +250,7 @@ gradlex-maven-plugin = "1.0.3"
250250

251251
# Repositories
252252
repo-mvn-central = "https://repo.maven.apache.org/maven2/"
253-
repo-mvn-snapshot = "https://oss.sonatype.org/content/repositories/snapshots"
254-
repo-mvn-snapshots01 = "https://s01.oss.sonatype.org/content/repositories/snapshots/"
253+
repo-mvn-snapshot = "https://central.sonatype.com/repository/maven-snapshots/"
255254
repo-nodejs = "https://nodejs.org/dist/"
256255

257256
[libraries]

shared/src/jvmTest/kotlin/dev/suresh/PlatformTest.kt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package dev.suresh
22

3+
import dev.suresh.http.MediaApiClient
34
import kotlin.test.assertTrue
5+
import kotlinx.coroutines.test.runTest
46
import org.junit.jupiter.api.Test
57

68
class PlatformTest {
@@ -10,4 +12,10 @@ class PlatformTest {
1012
assertTrue(Greeting().greeting().contains("JVM"), message = "JVM platform check failed!")
1113
DOP.run()
1214
}
15+
16+
@Test
17+
fun httpClientTest() = runTest {
18+
MediaApiClient().images().forEach { s -> println(s) }
19+
println("Done")
20+
}
1321
}

0 commit comments

Comments
 (0)