disabling kotlinter until fixes are in for new kotlin

robertfmurdock · Dec 7, 2024 · d5a95b2 · d5a95b2
1 parent 5d03cac
commit d5a95b2
Show file tree

Hide file tree

Showing 17 changed files with 88 additions and 81 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -36,9 +36,9 @@ tasks {
     create("versionCatalogUpdate") {
         dependsOn(provider { gradle.includedBuilds.map { it.task(":versionCatalogUpdate") }.toList() })
     }
-    register("formatKotlin") {
-        dependsOn(provider { gradle.includedBuilds.map { it.task(":formatKotlin") }.toList() })
-    }
+//    register("formatKotlin") {
+//        dependsOn(provider { gradle.includedBuilds.map { it.task(":formatKotlin") }.toList() })
+//    }
     val testBuilds = listOf(
         gradle.includedBuild("tools"),
     )

diff --git a/command-line-tools/build.gradle.kts b/command-line-tools/build.gradle.kts
@@ -10,7 +10,7 @@ repositories {
 plugins {
     base
     alias(libs.plugins.org.jetbrains.kotlin.multiplatform) apply false
-    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)
 }
@@ -24,9 +24,9 @@ tasks {
     create("collectResults") {
         dependsOn(provider { (getTasksByName("collectResults", true) - this).toList() })
     }
-    register("formatKotlin") {
-        dependsOn(provider { (getTasksByName("formatKotlin", true) - this).toList() })
-    }
+//    register("formatKotlin") {
+//        dependsOn(provider { (getTasksByName("formatKotlin", true) - this).toList() })
+//    }
     register("release") {
         mustRunAfter(check)
         finalizedBy(provider { (getTasksByName("publish", true)).toList() })

diff --git a/command-line-tools/digger-cli/build.gradle.kts b/command-line-tools/digger-cli/build.gradle.kts
@@ -7,7 +7,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     alias(libs.plugins.org.jetbrains.kotlin.multiplatform)
-    alias(libs.plugins.org.jmailen.kotlinter)
+//    alias(libs.plugins.org.jmailen.kotlinter)
     alias(libs.plugins.com.github.ben.manes.versions)
 }
 

diff --git a/command-line-tools/kotlin-js-store/yarn.lock b/command-line-tools/kotlin-js-store/yarn.lock
@@ -279,6 +279,13 @@ js-yaml@^4.1.0:
   dependencies:
     argparse "^2.0.1"
 
+[email protected]:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/kotlin-web-helpers/-/kotlin-web-helpers-2.0.0.tgz#b112096b273c1e733e0b86560998235c09a19286"
+  integrity sha512-xkVGl60Ygn/zuLkDPx+oHj7jeLR7hCvoNF99nhwXMn8a3ApB4lLiC9pk4ol4NHPjyoCbvQctBqvzUcp8pkqyWw==
+  dependencies:
+    format-util "^1.0.5"
+
 locate-path@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
@@ -301,10 +308,10 @@ minimatch@^5.0.1, minimatch@^5.1.6:
   dependencies:
     brace-expansion "^2.0.1"
 
-[email protected].0:
-  version "10.7.0"
-  resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.7.0.tgz#9e5cbed8fa9b37537a25bd1f7fb4f6fc45458b9a"
-  integrity sha512-v8/rBWr2VO5YkspYINnvu81inSz2y3ODJrhO175/Exzor1RcEZZkizgE2A+w/CAXXoESS8Kys5E62dOHGHzULA==
+[email protected].3:
+  version "10.7.3"
+  resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.7.3.tgz#ae32003cabbd52b59aece17846056a68eb4b0752"
+  integrity sha512-uQWxAu44wwiACGqjbPYmjo7Lg8sFrS3dQe7PP2FQI+woptP4vZXSMcfMyFL/e1yFEeEpV4RtyTpZROOKmxis+A==
   dependencies:
     ansi-colors "^4.1.3"
     browser-stdout "^1.3.1"

diff --git a/command-line-tools/tagger-cli/build.gradle.kts b/command-line-tools/tagger-cli/build.gradle.kts
@@ -6,7 +6,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     alias(libs.plugins.org.jetbrains.kotlin.multiplatform)
-    alias(libs.plugins.org.jmailen.kotlinter)
+//    alias(libs.plugins.org.jmailen.kotlinter)
     alias(libs.plugins.com.github.ben.manes.versions)
     alias(libs.plugins.org.jetbrains.kotlin.plugin.serialization)
 }

diff --git a/tools-plugins/build.gradle.kts b/tools-plugins/build.gradle.kts
@@ -11,14 +11,14 @@ plugins {
     id("java-gradle-plugin")
     alias(libs.plugins.com.github.ben.manes.versions)
     alias(libs.plugins.nl.littlerobots.version.catalog.update)
-    alias(libs.plugins.org.jmailen.kotlinter)
+//    alias(libs.plugins.org.jmailen.kotlinter)
 }
 
 dependencies {
     implementation(kotlin("stdlib", embeddedKotlinVersion))
     implementation(kotlin("gradle-plugin", embeddedKotlinVersion))
     implementation(libs.com.github.ben.manes.gradle.versions.plugin)
-    implementation(libs.org.jmailen.gradle.kotlinter.gradle)
+//    implementation(libs.org.jmailen.gradle.kotlinter.gradle)
 }
 
 tasks {
@@ -37,10 +37,10 @@ tasks {
     }
     assemble { dependsOn(provider { (getTasksByName("assemble", true) - this).toList() }) }
     clean { dependsOn(provider { (getTasksByName("clean", true) - this).toList() }) }
-    formatKotlinMain {
-        exclude { spec -> spec.file.absolutePath.contains("generated-sources") }
-    }
-    lintKotlinMain {
-        exclude { spec -> spec.file.absolutePath.contains("generated-sources") }
-    }
+//    formatKotlinMain {
+//        exclude { spec -> spec.file.absolutePath.contains("generated-sources") }
+//    }
+//    lintKotlinMain {
+//        exclude { spec -> spec.file.absolutePath.contains("generated-sources") }
+//    }
 }
diff --git a/tools-plugins/src/main/kotlin/com/zegreatrob/tools/plugins/lint.gradle.kts b/tools-plugins/src/main/kotlin/com/zegreatrob/tools/plugins/lint.gradle.kts
@@ -1,5 +1,5 @@
 package com.zegreatrob.tools.plugins
 
-plugins {
-    id("org.jmailen.kotlinter")
-}
+//plugins {
+//    id("org.jmailen.kotlinter")
+//}
diff --git a/tools/build.gradle.kts b/tools/build.gradle.kts
@@ -19,9 +19,9 @@ tasks {
     create("collectResults") {
         dependsOn(provider { (getTasksByName("collectResults", true) - this).toList() })
     }
-    register("formatKotlin") {
-        dependsOn(provider { (getTasksByName("formatKotlin", true) - this).toList() })
-    }
+//    register("formatKotlin") {
+//        dependsOn(provider { (getTasksByName("formatKotlin", true) - this).toList() })
+//    }
     register("release") {
         mustRunAfter(check)
         finalizedBy(provider { (getTasksByName("publish", true)).toList() })

diff --git a/tools/certifier-plugin/build.gradle.kts b/tools/certifier-plugin/build.gradle.kts
@@ -53,12 +53,12 @@ tasks {
     named<Test>("test") {
         useJUnitPlatform()
     }
-    formatKotlinMain {
-        exclude { spec -> spec.file.absolutePath.contains("generated-sources") }
-    }
-    lintKotlinMain {
-        exclude { spec -> spec.file.absolutePath.contains("generated-sources") }
-    }
+//    formatKotlinMain {
+//        exclude { spec -> spec.file.absolutePath.contains("generated-sources") }
+//    }
+//    lintKotlinMain {
+//        exclude { spec -> spec.file.absolutePath.contains("generated-sources") }
+//    }
 }
 
 

diff --git a/tools/cli-tools/build.gradle.kts b/tools/cli-tools/build.gradle.kts
@@ -25,10 +25,10 @@ tasks {
     named<Test>("jvmTest") {
         useJUnitPlatform()
     }
-    formatKotlinCommonMain {
-        exclude { spec -> spec.file.absolutePath.contains("generated-sources") }
-    }
-    lintKotlinCommonMain {
-        exclude { spec -> spec.file.absolutePath.contains("generated-sources") }
-    }
+//    formatKotlinCommonMain {
+//        exclude { spec -> spec.file.absolutePath.contains("generated-sources") }
+//    }
+//    lintKotlinCommonMain {
+//        exclude { spec -> spec.file.absolutePath.contains("generated-sources") }
+//    }
 }
diff --git a/tools/digger-core/build.gradle.kts b/tools/digger-core/build.gradle.kts
@@ -29,10 +29,10 @@ tasks {
         environment("GIT_CONFIG_GLOBAL", "/dev/null")
         environment("GIT_CONFIG_SYSTEM", "/dev/null")
     }
-    formatKotlinCommonMain {
-        exclude { spec -> spec.file.absolutePath.contains("generated-sources") }
-    }
-    lintKotlinCommonMain {
-        exclude { spec -> spec.file.absolutePath.contains("generated-sources") }
-    }
+//    formatKotlinCommonMain {
+//        exclude { spec -> spec.file.absolutePath.contains("generated-sources") }
+//    }
+//    lintKotlinCommonMain {
+//        exclude { spec -> spec.file.absolutePath.contains("generated-sources") }
+//    }
 }
diff --git a/tools/digger-json/build.gradle.kts b/tools/digger-json/build.gradle.kts
@@ -34,10 +34,10 @@ tasks {
     named<Test>("jvmTest") {
         useJUnitPlatform()
     }
-    formatKotlinCommonMain {
-        exclude { spec -> spec.file.absolutePath.contains("generated-sources") }
-    }
-    lintKotlinCommonMain {
-        exclude { spec -> spec.file.absolutePath.contains("generated-sources") }
-    }
+//    formatKotlinCommonMain {
+//        exclude { spec -> spec.file.absolutePath.contains("generated-sources") }
+//    }
+//    lintKotlinCommonMain {
+//        exclude { spec -> spec.file.absolutePath.contains("generated-sources") }
+//    }
 }
diff --git a/tools/digger-model/build.gradle.kts b/tools/digger-model/build.gradle.kts
@@ -25,11 +25,11 @@ tasks {
     named<Test>("jvmTest") {
         useJUnitPlatform()
     }
-    formatKotlinCommonMain {
-        exclude { spec -> spec.file.absolutePath.contains("generated-sources") }
-    }
-    lintKotlinCommonMain {
-        exclude { spec -> spec.file.absolutePath.contains("generated-sources") }
-    }
+//    formatKotlinCommonMain {
+//        exclude { spec -> spec.file.absolutePath.contains("generated-sources") }
+//    }
+//    lintKotlinCommonMain {
+//        exclude { spec -> spec.file.absolutePath.contains("generated-sources") }
+//    }
 
 }
diff --git a/tools/digger-plugin/build.gradle.kts b/tools/digger-plugin/build.gradle.kts
@@ -58,12 +58,12 @@ tasks {
         environment("GIT_CONFIG_GLOBAL", "/dev/null")
         environment("GIT_CONFIG_SYSTEM", "/dev/null")
     }
-    formatKotlinMain {
-        exclude { spec -> spec.file.absolutePath.contains("generated-sources") }
-    }
-    lintKotlinMain {
-        exclude { spec -> spec.file.absolutePath.contains("generated-sources") }
-    }
+//    formatKotlinMain {
+//        exclude { spec -> spec.file.absolutePath.contains("generated-sources") }
+//    }
+//    lintKotlinMain {
+//        exclude { spec -> spec.file.absolutePath.contains("generated-sources") }
+//    }
 }
 
 signing {

diff --git a/tools/git-adapter/build.gradle.kts b/tools/git-adapter/build.gradle.kts
@@ -29,10 +29,10 @@ tasks {
         environment("GIT_CONFIG_GLOBAL", "/dev/null")
         environment("GIT_CONFIG_SYSTEM", "/dev/null")
     }
-    formatKotlinCommonMain {
-        exclude { spec -> spec.file.absolutePath.contains("generated-sources") }
-    }
-    lintKotlinCommonMain {
-        exclude { spec -> spec.file.absolutePath.contains("generated-sources") }
-    }
+//    formatKotlinCommonMain {
+//        exclude { spec -> spec.file.absolutePath.contains("generated-sources") }
+//    }
+//    lintKotlinCommonMain {
+//        exclude { spec -> spec.file.absolutePath.contains("generated-sources") }
+//    }
 }
diff --git a/tools/tagger-core/build.gradle.kts b/tools/tagger-core/build.gradle.kts
@@ -23,10 +23,10 @@ dependencies {
 }
 
 tasks {
-    formatKotlinCommonMain {
-        exclude { spec -> spec.file.absolutePath.contains("generated-sources") }
-    }
-    lintKotlinCommonMain {
-        exclude { spec -> spec.file.absolutePath.contains("generated-sources") }
-    }
+//    formatKotlinCommonMain {
+//        exclude { spec -> spec.file.absolutePath.contains("generated-sources") }
+//    }
+//    lintKotlinCommonMain {
+//        exclude { spec -> spec.file.absolutePath.contains("generated-sources") }
+//    }
 }
diff --git a/tools/tagger-plugin/build.gradle.kts b/tools/tagger-plugin/build.gradle.kts
@@ -58,12 +58,12 @@ tasks {
         environment("GIT_CONFIG_GLOBAL", "/dev/null")
         environment("GIT_CONFIG_SYSTEM", "/dev/null")
     }
-    formatKotlinMain {
-        exclude { spec -> spec.file.absolutePath.contains("generated-sources") }
-    }
-    lintKotlinMain {
-        exclude { spec -> spec.file.absolutePath.contains("generated-sources") }
-    }
+//    formatKotlinMain {
+//        exclude { spec -> spec.file.absolutePath.contains("generated-sources") }
+//    }
+//    lintKotlinMain {
+//        exclude { spec -> spec.file.absolutePath.contains("generated-sources") }
+//    }
 }