Skip to content

Commit

Permalink
Merge pull request #34 from tfandkusu/fix_ktlint
Browse files Browse the repository at this point in the history
ktlint のフォーマットと IntelliJ IDEA のフォーマットがずれているので、調整する
  • Loading branch information
tfandkusu authored Aug 15, 2024
2 parents 0a57974 + 47a7970 commit f760018
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
distribution: 'temurin'
java-version: '17'
- uses: gradle/gradle-build-action@v2
- run: ./gradlew spotlessCheck
- run: ./gradlew ktlintCheck
- run: ./gradlew test
- name: イベントの検証
run: ./gradlew run --args validate
8 changes: 1 addition & 7 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
kotlin("jvm") version libs.versions.kotlin
application
alias(libs.plugins.spotless)
alias(libs.plugins.ktlint)
alias(libs.plugins.serialization)
}

Expand Down Expand Up @@ -29,9 +29,3 @@ kotlin {
application {
mainClass.set("com.tfandkusu.ga913yaml.MainKt")
}
spotless {
kotlin {
target("**/*.kt")
ktlint("1.3.1")
}
}
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ kaml = "com.charleskorn.kaml:kaml:0.60.0"
kotlin-poet = "com.squareup:kotlinpoet:1.18.1"
swift-poet = "io.outfoxx:swiftpoet:1.6.5"
[plugins]
spotless = { id = "com.diffplug.spotless", version = "6.25.0" }
ktlint = { id = "org.jlleitschuh.gradle.ktlint", version = "12.1.1" }
serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
1 change: 0 additions & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@ plugins {
id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
}
rootProject.name = "ga913-yaml"

0 comments on commit f760018

Please sign in to comment.