checkpoint

smithy-lang · Dec 17, 2024 · cd2c625 · cd2c625
1 parent 159ea08
commit cd2c625
Show file tree

Hide file tree

Showing 10 changed files with 390 additions and 724 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -26,7 +26,7 @@ jobs:
           distribution: 'corretto'
 
       - name: Clean, build, test, and javadoc
-        run: ./gradlew clean build javadoc -Plog-tests --stacktrace
+        run: ./gradlew clean build javadoc -PnoFormat -Plog-tests --stacktrace
 
       - name: Allow long file names in git for windows
         if: matrix.os == 'windows-latest'

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -12,7 +12,6 @@ dependencies {
     implementation(libs.spotbugs)
     implementation(libs.spotless)
     implementation(libs.jmh)
-
     // https://github.com/gradle/gradle/issues/15383
     implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
 }
diff --git a/buildSrc/src/main/kotlin/smithy.formatting-conventions.gradle.kts b/buildSrc/src/main/kotlin/smithy.formatting-conventions.gradle.kts
@@ -1,7 +1,6 @@
 import java.util.regex.Pattern
 
 plugins {
-    checkstyle
     id("com.diffplug.spotless")
 }
 
@@ -17,20 +16,16 @@ spotless {
             .onlyIfContentMatches("^((?!SKIPLICENSECHECK)[\\s\\S])*\$")
         indentWithSpaces()
         endWithNewline()
-
         eclipse().configFile("${project.rootDir}/config/spotless/formatting.xml")
-
         // Fixes for some strange formatting applied by eclipse:
         // see: https://github.com/kamkie/demo-spring-jsf/blob/bcacb9dc90273a5f8d2569470c5bf67b171c7d62/build.gradle.kts#L159
         custom("Lambda fix") { it.replace("} )", "})").replace("} ,", "},") }
         custom("Long literal fix") { Pattern.compile("([0-9_]+) [Ll]").matcher(it).replaceAll("\$1L") }
-
         // Static first, then everything else alphabetically
         removeUnusedImports()
         importOrder("\\#", "")
-
         // Ignore generated code for formatter check
-        targetExclude("**/build/**/*.*")
+        targetExclude("*/build/**/*.*")
     }
 
     // Formatting for build.gradle.kts files

diff --git a/buildSrc/src/main/kotlin/smithy.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/smithy.java-conventions.gradle.kts
@@ -106,12 +106,6 @@ if (project.hasProperty("log-tests")) {
     }
 }
 
-// ==== CheckStyle ====
-// https://docs.gradle.org/current/userguide/checkstyle_plugin.html
-tasks.named("checkstyleTest") {
-    enabled = false
-}
-
 // ==== Code coverage ====
 // https://docs.gradle.org/current/userguide/jacoco_plugin.html
 

diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
diff --git a/config/checkstyle/suppressions.xml b/config/checkstyle/suppressions.xml