Skip to content

Commit 7884464

Browse files
committed
chore: dep updates
1 parent 1cc5431 commit 7884464

File tree

4 files changed

+25
-23
lines changed

4 files changed

+25
-23
lines changed

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

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -117,17 +117,19 @@ val Project.githubRepo
117117
get() = "https://github.com/${githubUser}/${rootProject.name}"
118118

119119
/** For publishing to maven central and GitHub */
120-
val Project.signingKey
121-
get() = providers.gradleProperty("signingKey")
120+
val Project.signingInMemoryKey
121+
get() = providers.gradleProperty("signingInMemoryKey")
122122

123-
val Project.signingKeyId
124-
get() = providers.gradleProperty("signingKeyId")
123+
val Project.signingInMemoryKeyId
124+
get() = providers.gradleProperty("signingInMemoryKeyId")
125125

126-
val Project.signingPassword
127-
get() = providers.gradleProperty("signingPassword")
126+
val Project.signingInMemoryKeyPassword
127+
get() = providers.gradleProperty("signingInMemoryKeyPassword")
128128

129129
val Project.hasSigningKey
130-
get() = signingKey.orNull.isNullOrBlank().not() && signingPassword.orNull.isNullOrBlank().not()
130+
get() =
131+
signingInMemoryKey.orNull.isNullOrBlank().not() &&
132+
signingInMemoryKeyPassword.orNull.isNullOrBlank().not()
131133

132134
val Project.mavenCentralUsername
133135
get() = providers.gradleProperty("mavenCentralUsername")
@@ -140,7 +142,6 @@ val Project.githubPackagesUsername
140142

141143
val Project.githubPackagesPassword
142144
get() = providers.gradleProperty("githubPackagesPassword")
143-
144145
/** Kotlin Dependencies extension functions. */
145146
val Project.isKotlinMultiplatformProject
146147
get() = plugins.hasPlugin("org.jetbrains.kotlin.multiplatform")

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,8 @@ pluginManager.withPlugin("com.google.cloud.tools.jib") {
109109
signing {
110110
setRequired { hasSigningKey }
111111
if (hasSigningKey) {
112-
useInMemoryPgpKeys(signingKeyId.orNull, signingKey.orNull, signingPassword.orNull)
112+
useInMemoryPgpKeys(
113+
signingInMemoryKeyId.orNull, signingInMemoryKey.orNull, signingInMemoryKeyPassword.orNull)
113114
sign(publishing.publications)
114115
}
115116
}

gradle/libs.versions.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ ktor-cohort = "2.5.1"
5656
otel = "1.43.0"
5757
otel-instr = "2.8.0"
5858
otel-instr-alpha = "2.8.0-alpha"
59-
otel-semconv = "1.27.0-alpha"
59+
otel-semconv = "1.28.0-alpha"
6060
otel-samplers = "1.39.0-alpha"
6161
elastic-otel = "0.4.0"
6262
okio = "3.9.1"
@@ -86,7 +86,7 @@ wiremock = "3.9.1"
8686
wiremock-kotlin = "2.1.1"
8787
okhttp = "5.0.0-alpha.14"
8888
slf4j = "2.1.0-alpha1"
89-
logback = "1.5.10"
89+
logback = "1.5.11"
9090
logback-tyler = "0.7"
9191
log4j = "3.0.0-beta2"
9292
jmh = "1.37"
@@ -165,10 +165,10 @@ 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"
174174
detekt-compose-rules = "0.4.16"
@@ -193,7 +193,7 @@ nmcp = "0.0.9"
193193
nexus-publish = "2.0.0"
194194
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"

meta/scripts/script.main.kts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
#!/usr/bin/env -S kotlin -Xplugin=/opt/homebrew/opt/kotlin/libexec/lib/kotlinx-serialization-compiler-plugin.jar
22
// @file:Repository("https://maven.google.com")
3-
@file:DependsOn("io.ktor:ktor-client-core:3.0.0-beta-1")
4-
@file:DependsOn("io.ktor:ktor-client-cio:3.0.0-beta-1")
5-
@file:DependsOn("io.ktor:ktor-client-java:3.0.0-beta-1")
6-
@file:DependsOn("io.ktor:ktor-client-auth:3.0.0-beta-1")
7-
@file:DependsOn("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0-RC")
8-
@file:DependsOn("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.0")
9-
@file:DependsOn("org.jetbrains.kotlinx:kotlinx-datetime:0.6.0")
3+
@file:DependsOn("io.ktor:ktor-client-core:3.0.0")
4+
@file:DependsOn("io.ktor:ktor-client-cio:3.0.0")
5+
@file:DependsOn("io.ktor:ktor-client-java:3.0.0")
6+
@file:DependsOn("io.ktor:ktor-client-auth:3.0.0")
7+
@file:DependsOn("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0")
8+
@file:DependsOn("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3")
9+
@file:DependsOn("org.jetbrains.kotlinx:kotlinx-datetime:0.6.1")
1010
@file:DependsOn("org.slf4j:slf4j-simple:2.1.0-alpha1")
11-
@file:DependsOn("com.microsoft.playwright:playwright:1.44.0")
11+
@file:DependsOn("com.microsoft.playwright:playwright:1.47.0")
1212
// @file:Import("common.main.kts")
1313

1414
@file:CompilerOptions("-jvm-target", "1.8")

0 commit comments

Comments
 (0)