Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(deps): update plugin com.diffplug.spotless to v6.25.0 #369

Merged
merged 5 commits into from
Jun 29, 2024
Merged

chore(deps): update plugin com.diffplug.spotless to v6.25.0 #369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
251a0dc
chore(deps): update plugin com.diffplug.spotless to v6.25.0
renovate[bot] Jun 23, 2024
47ba1dd
Merge branch 'main' into renovate/com.diffplug.spotless-6.x
ikovalyov Jun 23, 2024
25bb82b
Merge branch 'main' of github.com:ikovalyov/kotlin-blogpost-engine in…
ikovalyov Jun 26, 2024
0f72b89
fix js compile, add jsTest pipeline step
ikovalyov Jun 26, 2024
02fd7d4
spotless
ikovalyov Jun 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/workflows/gradle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,8 @@ jobs:
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
run: ./gradlew jvmTest
run: ./gradlew jvmTest jsTest
spotless:

runs-on: ubuntu-latest

steps:
Expand Down
30 changes: 14 additions & 16 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ plugins {
kotlin("plugin.allopen") version "2.0.0"
kotlin("plugin.serialization") version "2.0.0"
id("com.github.johnrengelman.shadow") version "8.1.1"
id("com.diffplug.spotless") version "6.17.0"
id("com.diffplug.spotless") version "6.25.0"
id("idea")
}

Expand Down Expand Up @@ -49,7 +49,7 @@ kotlin {
}
}
}
js {
js(IR) {
browser {
commonWebpackConfig {
cssSupport {
Expand Down Expand Up @@ -81,8 +81,8 @@ kotlin {
implementation(kotlin("stdlib-js"))
implementation(
project.dependencies.enforcedPlatform(
"org.jetbrains.kotlin-wrappers:kotlin-wrappers-bom:1.0.0-pre.763"
)
"org.jetbrains.kotlin-wrappers:kotlin-wrappers-bom:1.0.0-pre.763",
),
)
implementation("org.jetbrains.kotlin-wrappers:kotlin-react")
implementation("org.jetbrains.kotlin-wrappers:kotlin-react-dom")
Expand Down Expand Up @@ -131,8 +131,8 @@ kotlin {
configurations["kapt"].dependencies.addAll(
listOf(
project.dependencies.create("io.micronaut:micronaut-inject-java:3.10.4"),
project.dependencies.create("info.picocli:picocli-codegen:4.7.6")
)
project.dependencies.create("info.picocli:picocli-codegen:4.7.6"),
),
)
if (System.getProperty("os.name").lowercase(Locale.getDefault()).contains("mac")) {
implementation("io.micronaut:micronaut-runtime-osx")
Expand All @@ -146,8 +146,8 @@ kotlin {
configurations["kaptTest"].dependencies.addAll(
listOf(
project.dependencies.create("io.micronaut:micronaut-inject-java:3.10.4"),
project.dependencies.create("info.picocli:picocli-codegen:4.7.6")
)
project.dependencies.create("info.picocli:picocli-codegen:4.7.6"),
),
)

implementation(kotlin("test-junit5"))
Expand Down Expand Up @@ -208,23 +208,21 @@ spotless {
val files = project.fileTree(rootDir)
files.include("**/*.kt")
target(files)
ktlint("0.47.1")
.setUseExperimental(true)
ktlint("1.3.0")
.editorConfigOverride(
mapOf(
"max_line_length" to "256",
"insert_final_newline" to "true"
)
"insert_final_newline" to "true",
),
)
}
kotlinGradle {
ktlint("0.47.1")
.setUseExperimental(true)
ktlint("1.3.0")
.editorConfigOverride(
mapOf(
"max_line_length" to "256",
"insert_final_newline" to "true"
)
"insert_final_newline" to "true",
),
)
}
}
Loading