Skip to content

Commit 9905851

Browse files
sureshgsureshg
committed
chore: misc fixes & dep updates
1 parent eb2f868 commit 9905851

File tree

8 files changed

+50
-35
lines changed

8 files changed

+50
-35
lines changed

‎.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ jobs:
138138

139139
- name: 🕸 Deploy the webapp to Github Pages
140140
if: steps.gradle-build.outcome == 'success' && runner.os == 'Linux'
141-
uses: JamesIves/github-pages-deploy-action@v4.4.3
141+
uses: JamesIves/github-pages-deploy-action@v4.5.0
142142
with:
143143
branch: gh-pages
144144
folder: web/build/dist/js/productionExecutable
@@ -148,7 +148,7 @@ jobs:
148148

149149
- name: 🏖️ Publish documentation to Github Pages
150150
if: steps.gradle-build.outcome == 'success' && runner.os == 'Linux'
151-
uses: JamesIves/github-pages-deploy-action@v4.4.3
151+
uses: JamesIves/github-pages-deploy-action@v4.5.0
152152
with:
153153
branch: gh-pages
154154
folder: build/dokka/htmlMultiModule
@@ -158,7 +158,7 @@ jobs:
158158

159159
- name: 🏖️ Publish coverage report to Github Pages
160160
if: steps.gradle-build.outcome == 'success' && runner.os == 'Linux'
161-
uses: JamesIves/github-pages-deploy-action@v4.4.3
161+
uses: JamesIves/github-pages-deploy-action@v4.5.0
162162
with:
163163
branch: gh-pages
164164
folder: build/reports/kover/html

‎backend/jvm/build.gradle.kts

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,15 @@ application {
2020

2121
ktor { fatJar { archiveFileName = "${project.name}-app.jar" } }
2222

23+
jte {
24+
contentType = gg.jte.ContentType.Html
25+
sourceDirectory =
26+
sourceSets.main.map { it.resources.srcDirs.first().resolve("templates").toPath() }
27+
generate()
28+
}
29+
30+
exposedCodeGeneratorConfig { outputDirectory.set(file("src/main/kotlin/dev/suresh")) }
31+
2332
jib {
2433
from {
2534
image = "openjdk:${javaVersion.get().majorVersion}-slim"
@@ -51,15 +60,6 @@ jib {
5160
containerizingMode = "packaged"
5261
}
5362

54-
jte {
55-
contentType = gg.jte.ContentType.Html
56-
sourceDirectory =
57-
sourceSets.main.map { it.resources.srcDirs.first().resolve("templates").toPath() }
58-
generate()
59-
}
60-
61-
exposedCodeGeneratorConfig { outputDirectory.set(file("src/main/kotlin/dev/suresh")) }
62-
6363
// Configuration to copy webapp to resources
6464
val webapp by configurations.creating
6565

@@ -123,9 +123,18 @@ dependencies {
123123
// Templating
124124
implementation(libs.jte.runtime)
125125
// compileOnly(libs.jte.kotlin)
126-
implementation(libs.ktor.server.html)
127-
implementation(libs.kotlinx.html)
126+
implementation(libs.kotlinx.html) {
127+
version { strictly(libs.kotlinx.html.get().version.toString()) }
128+
because("Ktor Issue!")
129+
}
128130
implementation(kotlinw("css"))
131+
implementation(libs.ktor.server.html)
132+
// constraints {
133+
// implementation(libs.kotlinx.html.get().module.toString()) {
134+
// version { strictly(libs.kotlinx.html.get().version.toString()) }
135+
// because("Ktor Issue!")
136+
// }
137+
// }
129138

130139
// Monitoring
131140
implementation(libs.ktor.cohort.core)

‎backend/jvm/src/main/kotlin/dev/suresh/App.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@ import dev.suresh.plugins.configureHTTP
66
import dev.suresh.plugins.configureSecurity
77
import dev.suresh.plugins.configureSerialization
88
import dev.suresh.plugins.errorRoutes
9-
import dev.suresh.routes.*
9+
import dev.suresh.routes.adminRoutes
10+
import dev.suresh.routes.jvmFeatures
11+
import dev.suresh.routes.mgmtRoutes
12+
import dev.suresh.routes.webApp
1013
import io.ktor.server.application.*
1114
import io.ktor.server.netty.*
1215
import io.ktor.server.routing.*

‎backend/jvm/src/main/kotlin/dev/suresh/routes/Mgmt.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ fun Route.mgmtRoutes() {
165165
else ->
166166
mutex.withLock {
167167
runOnVirtualThread {
168-
val jfrPath = kotlin.io.path.createTempFile("profile", ".jfr")
168+
val jfrPath = createTempFile("profile", ".jfr")
169169
RecordingStream(Configuration.getConfiguration("profile")).use {
170170
it.setMaxSize(100 * 1024 * 1024)
171171
it.setMaxAge(2.minutes.toJavaDuration())
@@ -210,7 +210,7 @@ fun Route.mgmtRoutes() {
210210
"com.sun.management:type=HotSpotDiagnostic",
211211
HotSpotDiagnosticMXBean::class.java)
212212

213-
val heapDumpPath = kotlin.io.path.createTempFile("heapdump", ".hprof")
213+
val heapDumpPath = createTempFile("heapdump", ".hprof")
214214
heapDumpPath.deleteIfExists()
215215
hotspot.dumpHeap(heapDumpPath.pathString, true)
216216
call.response.header(

‎gradle/build-logic/common-plugins/src/main/kotlin/plugins/kotlin.docs.gradle.kts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,12 @@ if (project == rootProject) {
2424

2525
// Combined test & coverage report
2626
dependencies {
27-
project.subprojects.forEach {
28-
kover(it)
29-
// testReportAggregation(it)
30-
}
27+
project.subprojects
28+
.filter { !it.path.contains(":dep-mgmt") }
29+
.forEach {
30+
kover(it)
31+
testReportAggregation(it)
32+
}
3133
}
3234

3335
// Dokka multi-module config.

‎gradle/build-logic/common-plugins/src/main/kotlin/plugins/misc.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ plugins {
2020
// }
2121

2222
// Formatting
23+
@Suppress("INACCESSIBLE_TYPE")
2324
spotless {
2425
java {
2526
// googleJavaFormat(libs.versions.google.javaformat.get())

‎gradle/libs.versions.toml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
[versions]
22
java = "22"
33
kotlin = "2.0.0-Beta1"
4-
kotlin-ksp = "2.0.0-Beta1-1.0.14"
4+
kotlin-ksp = "2.0.0-Beta1-1.0.15"
55
kotlin-jvmtarget = "21"
66
kotlin-dsl-jvmtarget = "21"
77
kotlin-api-version = "1.9"
88
kotlin-lang-version = "2.0"
9-
gradle = "8.5-rc-3"
9+
gradle = "8.5-rc-4"
1010
node-version = "21.2.0"
1111
java-vendor = "Oracle"
1212
java-jvmArguments = "--enable-preview"
@@ -21,9 +21,9 @@ org-name = "suresh.dev"
2121
org-url = "https://suresh.dev"
2222

2323
# Gradle Dependencies Versions
24-
kotlinx-kover = "0.7.4"
24+
kotlinx-kover = "0.7.5"
2525
kotlinx-io = "0.3.0"
26-
kotlinx-atomicfu = "0.23.0"
26+
kotlinx-atomicfu = "0.23.1"
2727
kotlinx-coroutines = "1.7.3"
2828
kotlinx-datetime = "0.4.1"
2929
kotlinx-serialization = "1.6.1"
@@ -34,8 +34,10 @@ kotlinx-benchmark = "0.4.9"
3434
kotlinx-metadata = "0.7.0"
3535
kotlinx-reflect-lite = "1.1.0"
3636
kotlinx-bincompat = "0.13.2"
37-
kotlin-wrappers = "1.0.0-pre.647"
38-
kotlin-redacted = "1.7.0"
37+
kotlin-wrappers = "1.0.0-pre.650"
38+
kotlin-redacted = "1.7.1"
39+
ktor = "3.0.0-beta-1"
40+
ktor-cohort = "2.3.0"
3941
ksp-auto-service = "1.1.0"
4042
gradle-kotlin-dsl = "4.1.2"
4143
zip-prefixer = "0.3.1"
@@ -58,7 +60,7 @@ mockk = "1.13.8"
5860
mokkery = "1.9.20-1.3.0"
5961
powerassert = "0.13.0"
6062
slf4j = "2.0.9"
61-
logback = "1.4.11"
63+
logback = "1.4.13"
6264
log4j = "3.0.0-alpha1"
6365
jmh = "1.37"
6466
ktfmt = "0.46"
@@ -72,7 +74,7 @@ jctools = "4.0.1"
7274
benasher44-uuid = "0.8.2"
7375
kotlinx-uuid = "0.0.20"
7476
kotlin-codepoints = "0.6.1"
75-
kotlin-logging = "5.1.0"
77+
kotlin-logging = "5.1.1"
7678
kotlin-bignum = "0.3.8"
7779
kotlin-diff = "0.4.0"
7880
kotlin-retry = "1.0.9"
@@ -84,8 +86,6 @@ parsus = "0.6.0"
8486
java-keyring = "1.0.3"
8587
java-keychain = "1.1.0"
8688
webjars-xterm = "5.1.0"
87-
ktor = "2.3.6"
88-
ktor-cohort = "2.3.0"
8989
arrow-suspendapp = "0.4.1-alpha.5"
9090
exposed = "0.44.1"
9191
postgresql = "42.7.0"
@@ -123,7 +123,7 @@ foojay-resolver = "0.7.0"
123123
gradle-enterprise = "3.15.1"
124124
nexus-publish = "2.0.0-rc-1"
125125
shadow = "8.1.1"
126-
spotless = "6.22.0"
126+
spotless = "6.23.0"
127127
semver-plugin = "0.5.0-rc.5"
128128
taskinfo = "2.1.0"
129129
dependency-analysis = "1.26.0"
@@ -138,13 +138,13 @@ akkurate = "0.1.0"
138138
gmazzo-buildconfig = "3.1.0"
139139
cyclonedx-plugin = "1.8.0"
140140
modulegraph = "0.5.0"
141-
cash-molecule = "1.3.0"
141+
cash-molecule = "1.3.1"
142142
npm-publish-plugin = "3.4.1"
143143
exposed-plugin = "0.2.1"
144144
jib-plugin = "3.4.0"
145145
jib-nativeimage-extn = "0.1.0"
146146
includegit-plugin = "0.1.6"
147-
jetbrains-compose = "1.6.0-dev1282"
147+
jetbrains-compose = "1.6.0-dev1291"
148148
jetbrains-compose-compiler = "1.5.3"
149149
kobweb = "0.15.0"
150150

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

0 commit comments

Comments
 (0)