Skip to content

Commit

Permalink
kotlinter returns, disabling compression on server due to content-len…
Browse files Browse the repository at this point in the history
…gth inaccuracy
  • Loading branch information
robertfmurdock committed Dec 14, 2024
1 parent fa41522 commit ff70d05
Show file tree
Hide file tree
Showing 21 changed files with 235 additions and 233 deletions.
12 changes: 6 additions & 6 deletions client/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -208,12 +208,12 @@ tasks {
}

tasks {
// formatKotlinJsMain {
// dependsOn("kspKotlinJs")
// }
// lintKotlinJsMain {
// dependsOn("kspKotlinJs")
// }
formatKotlinJsMain {
dependsOn("kspKotlinJs")
}
lintKotlinJsMain {
dependsOn("kspKotlinJs")
}
}

artifacts {
Expand Down
12 changes: 6 additions & 6 deletions client/components/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ kotlin {
}

tasks {
// formatKotlinJsMain {
// dependsOn("kspKotlinJs")
// }
// lintKotlinJsMain {
// dependsOn("kspKotlinJs")
// }
formatKotlinJsMain {
dependsOn("kspKotlinJs")
}
lintKotlinJsMain {
dependsOn("kspKotlinJs")
}
}

dependencies {
Expand Down
12 changes: 6 additions & 6 deletions client/components/external/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ kotlin {
}

tasks {
// formatKotlinJsMain {
// dependsOn("kspKotlinJs")
// }
// lintKotlinJsMain {
// dependsOn("kspKotlinJs")
// }
formatKotlinJsMain {
dependsOn("kspKotlinJs")
}
lintKotlinJsMain {
dependsOn("kspKotlinJs")
}
}

dependencies {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ private fun saveNotificationLog(updatedThing: Array<String>) {
localStorage.setItem("notification-log", JSON.stringify(updatedThing))
}

private fun loadNotificationLog() =
localStorage.getItem("notification-log")?.let { JSON.parse<Array<String>>(it) } ?: emptyArray()
private fun loadNotificationLog() = localStorage.getItem("notification-log")?.let { JSON.parse<Array<String>>(it) } ?: emptyArray()

val NotificationButton by nfc<Props> {
val recentInfoMd = loadMarkdownString("recent-info")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,4 @@ external interface Marked {
fun parse(markdown: String): String
}


fun parse(markdown: String): String = marked.parse(markdown)
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.zegreatrob.coupling.client.components.stats

//import com.zegreatrob.coupling.client.components.stats.Visualization.Heatmap
import com.zegreatrob.coupling.json.GqlContributionWindow
import com.zegreatrob.coupling.model.Contribution
import com.zegreatrob.coupling.model.ContributionReport
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,9 @@ import web.cssom.px
val AboutPage by nfc<PageProps> {
aboutPageContent {
div {
dangerouslySetInnerHTML = jso { __html =
parse(loadMarkdownString("About"))
dangerouslySetInnerHTML = jso {
__html =
parse(loadMarkdownString("About"))
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions coupling-plugins/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ repositories {
plugins {
`kotlin-dsl`
id("java-gradle-plugin")
// alias(libs.plugins.org.jmailen.kotlinter)
alias(libs.plugins.org.jmailen.kotlinter)
alias(libs.plugins.com.github.ben.manes.versions)
alias(libs.plugins.nl.littlerobots.version.catalog.update)
}
Expand All @@ -33,7 +33,7 @@ dependencies {
implementation(libs.org.apache.logging.log4j.log4j.iostreams)
implementation(libs.org.jetbrains.kotlin.kotlin.stdlib)
implementation(libs.org.jetbrains.kotlin.plugin.serialization.gradle.plugin)
// implementation(libs.org.jmailen.gradle.kotlinter.gradle)
implementation(libs.org.jmailen.gradle.kotlinter.gradle)
implementation(libs.org.slf4j.slf4j.api)
implementation(platform(libs.com.zegreatrob.jsmints.jsmints.bom))
implementation(platform(libs.com.zegreatrob.testmints.testmints.bom))
Expand Down
10 changes: 5 additions & 5 deletions coupling-plugins/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
[versions]
kotlin = "2.1.0"
ktlint = "0.45.2"
org-apache-logging-log4j = "2.24.2"
org-apache-logging-log4j = "2.24.3"
org-jlleitschuh-gradle-ktlint = "11.0.0"

[libraries]
com-fasterxml-jackson-core-jackson-databind = "com.fasterxml.jackson.core:jackson-databind:2.18.2"
com-github-ben-manes-gradle-versions-plugin = "com.github.ben-manes:gradle-versions-plugin:0.51.0"
com-zegreatrob-jsmints-jsmints-bom = "com.zegreatrob.jsmints:jsmints-bom:6.1.97"
com-zegreatrob-jsmints-jsmints-bom = "com.zegreatrob.jsmints:jsmints-bom:6.1.99"
com-zegreatrob-testmints-testmints-bom = "com.zegreatrob.testmints:testmints-bom:12.1.33"
com-zegreatrob-tools-tools-bom = "com.zegreatrob.tools:tools-bom:1.5.30"
com-zegreatrob-tools-tools-bom = "com.zegreatrob.tools:tools-bom:1.5.32"
org-apache-logging-log4j-log4j-core = { module = "org.apache.logging.log4j:log4j-core", version.ref = "org-apache-logging-log4j" }
org-apache-logging-log4j-log4j-iostreams = { module = "org.apache.logging.log4j:log4j-iostreams", version.ref = "org-apache-logging-log4j" }
org-jetbrains-kotlin-kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
org-jetbrains-kotlin-plugin-serialization-gradle-plugin = "org.jetbrains.kotlin.plugin.serialization:org.jetbrains.kotlin.plugin.serialization.gradle.plugin:1.9.22"
org-jlleitschuh-gradle-ktlint-gradle = { module = "org.jlleitschuh.gradle:ktlint-gradle", version.ref = "org-jlleitschuh-gradle-ktlint" }
org-jmailen-gradle-kotlinter-gradle = "org.jmailen.gradle:kotlinter-gradle:4.5.0"
org-jmailen-gradle-kotlinter-gradle = "org.jmailen.gradle:kotlinter-gradle:5.0.1"
org-slf4j-slf4j-api = "org.slf4j:slf4j-api:2.0.16"

[plugins]
com-github-ben-manes-versions = "com.github.ben-manes.versions:0.51.0"
nl-littlerobots-version-catalog-update = "nl.littlerobots.version-catalog-update:0.8.5"
org-jmailen-kotlinter = "org.jmailen.kotlinter:4.5.0"
org-jmailen-kotlinter = "org.jmailen.kotlinter:5.0.1"
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
package com.zegreatrob.coupling.plugins

//import org.jmailen.gradle.kotlinter.tasks.FormatTask
//import org.jmailen.gradle.kotlinter.tasks.LintTask
import org.jmailen.gradle.kotlinter.tasks.FormatTask
import org.jmailen.gradle.kotlinter.tasks.LintTask

repositories {
mavenCentral()
}

plugins {
// id("org.jmailen.kotlinter")
id("org.jmailen.kotlinter")
}

afterEvaluate {
// tasks {
// withType<FormatTask> {
// exclude { spec -> spec.file.absolutePath.contains("generated") }
// }
// withType<LintTask> {
// exclude { spec -> spec.file.absolutePath.contains("generated") }
// }
// }
tasks {
withType<FormatTask> {
exclude { spec -> spec.file.absolutePath.contains("generated") }
}
withType<LintTask> {
exclude { spec -> spec.file.absolutePath.contains("generated") }
}
}
}
12 changes: 6 additions & 6 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ com-benasher44-uuid = "com.benasher44:uuid:0.8.4"
com-fasterxml-jackson-core-jackson-databind = "com.fasterxml.jackson.core:jackson-databind:2.18.2"
com-github-ajalt-clikt-clikt = "com.github.ajalt.clikt:clikt:5.0.2"
com-lemonappdev-konsist = "com.lemonappdev:konsist:0.17.3"
com-zegreatrob-jsmints-jsmints-bom = "com.zegreatrob.jsmints:jsmints-bom:6.1.97"
com-zegreatrob-jsmints-jsmints-bom = "com.zegreatrob.jsmints:jsmints-bom:6.1.99"
com-zegreatrob-testmints-testmints-bom = "com.zegreatrob.testmints:testmints-bom:12.1.33"
com-zegreatrob-tools-tools-bom = "com.zegreatrob.tools:tools-bom:1.5.30"
com-zegreatrob-tools-tools-bom = "com.zegreatrob.tools:tools-bom:1.5.32"
io-github-oshai-kotlin-logging = "io.github.oshai:kotlin-logging:7.0.3"
io-ktor-ktor-bom = "io.ktor:ktor-bom:3.0.1"
org-jetbrains-kotlin-wrappers-kotlin-wrappers-bom = "org.jetbrains.kotlin-wrappers:kotlin-wrappers-bom:1.0.0-pre.851"
io-ktor-ktor-bom = "io.ktor:ktor-bom:3.0.2"
org-jetbrains-kotlin-wrappers-kotlin-wrappers-bom = "org.jetbrains.kotlin-wrappers:kotlin-wrappers-bom:1.0.0-pre.852"
org-jetbrains-kotlinx-kotlinx-coroutines-bom = "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.9.0"
org-jetbrains-kotlinx-kotlinx-datetime = "org.jetbrains.kotlinx:kotlinx-datetime:0.6.1"
org-jetbrains-kotlinx-kotlinx-serialization-bom = "org.jetbrains.kotlinx:kotlinx-serialization-bom:1.7.3"
Expand All @@ -17,8 +17,8 @@ org-kotools-types = "org.kotools:types:4.5.3"
org-slf4j-slf4j-simple = "org.slf4j:slf4j-simple:2.0.16"

[plugins]
com-avast-gradle-docker-compose = "com.avast.gradle.docker-compose:0.17.11"
com-avast-gradle-docker-compose = "com.avast.gradle.docker-compose:0.17.12"
com-github-ben-manes-versions = "com.github.ben-manes.versions:0.51.0"
com-github-sghill-distribution-sha = "com.github.sghill.distribution-sha:0.4.0"
com-zegreatrob-tools-digger = "com.zegreatrob.tools.digger:1.5.30"
com-zegreatrob-tools-digger = "com.zegreatrob.tools.digger:1.5.32"
nl-littlerobots-version-catalog-update = "nl.littlerobots.version-catalog-update:0.8.5"
Loading

0 comments on commit ff70d05

Please sign in to comment.