fix github build (#211)

Author: jaredsburrows

.editorconfig

@@ -10,6 +10,8 @@ end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
+ij_kotlin_allow_trailing_comma = true
+ij_kotlin_allow_trailing_comma_on_call_site = true
 
 [*.md]
 trim_trailing_whitespace = false

.github/workflows/auto-merge.yml

@@ -2,12 +2,12 @@ import java.time.ZonedDateTime
 import java.time.format.DateTimeFormatter
 
 plugins {
-  id 'org.jetbrains.kotlin.jvm' version '1.9.0'
-  id 'org.jetbrains.dokka' version '1.8.20' apply false
-  id 'org.jlleitschuh.gradle.ktlint' version '11.5.0' apply false
+  id 'org.jetbrains.kotlin.jvm' version '1.9.10'
+  id 'org.jetbrains.dokka' version '1.9.10' apply false
+  id 'org.jlleitschuh.gradle.ktlint' version '11.6.1' apply false
   id 'com.vanniktech.maven.publish' version '0.25.3' apply false
   id 'com.gradle.plugin-publish' version '0.21.0' apply false
-  id 'com.github.ben-manes.versions' version '0.47.0'
+  id 'com.github.ben-manes.versions' version '0.49.0'
   id 'java-gradle-plugin'
   id 'java-library'
   id 'groovy'

build.gradle

@@ -1,7 +1,7 @@
 plugins {
-  id 'org.jetbrains.kotlin.jvm' version '1.9.0'
-  id 'org.jetbrains.dokka' version '1.8.20'
-  id 'org.jlleitschuh.gradle.ktlint' version '11.5.0'
+  id 'org.jetbrains.kotlin.jvm' version '1.9.10'
+  id 'org.jetbrains.dokka' version '1.9.10'
+  id 'org.jlleitschuh.gradle.ktlint' version '11.6.1'
   id 'com.vanniktech.maven.publish' version '0.25.3'
   id 'com.gradle.plugin-publish' version '0.21.0'
   id 'java-gradle-plugin'

gradle-spoon-plugin/build.gradle

@@ -42,7 +42,7 @@ class UncheckedException : RuntimeException {
      */
     @JvmOverloads fun throwAsUncheckedException(
       throwable: Throwable,
-      preserveMessage: Boolean = false
+      preserveMessage: Boolean = false,
     ): RuntimeException {
       if (throwable is RuntimeException) {
         throw throwable

gradle-spoon-plugin/src/main/kotlin/com/jaredsburrows/spoon/ConsoleRenderer.kt

@@ -22,7 +22,7 @@ internal fun Project.isAndroidProject(): Boolean {
       // LibraryPlugin
       "android-library",
       "com.android.library",
-    )
+    ),
   )
 }
 
@@ -51,7 +51,7 @@ internal fun Project.configureAndroidProject() {
 
 private fun Project.configureVariant(
   baseExtension: BaseExtension,
-  variants: DomainObjectSet<TestVariant>? = null
+  variants: DomainObjectSet<TestVariant>? = null,
 ) {
   // Configure tasks for all variants
   variants?.all { variant ->

gradle-spoon-plugin/src/main/kotlin/com/jaredsburrows/spoon/project.kt gradle-spoon-plugin/src/main/kotlin/com/jaredsburrows/spoon/Project.kt

@@ -16,6 +16,7 @@ open class SpoonTask : DefaultTask() { // tasks can't be final
 
   /** Results baseOutputDir. */
   @get:OutputDirectory lateinit var outputDir: File
+
   @Internal lateinit var buildDir: File
 
   /** For testing only. */
@@ -45,7 +46,7 @@ open class SpoonTask : DefaultTask() { // tasks can't be final
   fun spoonTask() {
     if (spoonExtension.className.isEmpty() && spoonExtension.methodName.isNotEmpty()) {
       throw IllegalStateException(
-        "'${spoonExtension.methodName}' must have a fully qualified class name."
+        "'${spoonExtension.methodName}' must have a fully qualified class name.",
       )
     }
 
@@ -127,7 +128,7 @@ open class SpoonTask : DefaultTask() { // tasks can't be final
     val success = if (testing) builder.build().run() else true
     if (!success && !spoonExtension.ignoreFailures) {
       throw GradleException(
-        "Tests failed! See ${ConsoleRenderer.asClickableFileUrl(File(outputDir, "index.html"))}"
+        "Tests failed! See ${ConsoleRenderer.asClickableFileUrl(File(outputDir, "index.html"))}",
       )
     }
   }

gradle-spoon-plugin/src/main/kotlin/com/jaredsburrows/spoon/projectAndroid.kt gradle-spoon-plugin/src/main/kotlin/com/jaredsburrows/spoon/ProjectAndroid.kt

@@ -1,6 +1,6 @@
 ext.versions = [
   'agp'     : '4.2.2', // 7.1.3, ddms issue
-  'kotlin'  : '1.6.21',
+  'kotlin'  : '1.9.10',
   'spoon'   : '2.0.0-SNAPSHOT',
   'jacoco'  : '0.7.9',
 ]