Skip to content

Commit 0a57618

Browse files
fix github build (#211)
1 parent 92c70c5 commit 0a57618

File tree

9 files changed

+16
-38
lines changed

9 files changed

+16
-38
lines changed

.editorconfig

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ end_of_line = lf
1010
charset = utf-8
1111
trim_trailing_whitespace = true
1212
insert_final_newline = true
13+
ij_kotlin_allow_trailing_comma = true
14+
ij_kotlin_allow_trailing_comma_on_call_site = true
1315

1416
[*.md]
1517
trim_trailing_whitespace = false

.github/workflows/auto-merge.yml

-25
This file was deleted.

build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ import java.time.ZonedDateTime
22
import java.time.format.DateTimeFormatter
33

44
plugins {
5-
id 'org.jetbrains.kotlin.jvm' version '1.9.0'
6-
id 'org.jetbrains.dokka' version '1.8.20' apply false
7-
id 'org.jlleitschuh.gradle.ktlint' version '11.5.0' apply false
5+
id 'org.jetbrains.kotlin.jvm' version '1.9.10'
6+
id 'org.jetbrains.dokka' version '1.9.10' apply false
7+
id 'org.jlleitschuh.gradle.ktlint' version '11.6.1' apply false
88
id 'com.vanniktech.maven.publish' version '0.25.3' apply false
99
id 'com.gradle.plugin-publish' version '0.21.0' apply false
10-
id 'com.github.ben-manes.versions' version '0.47.0'
10+
id 'com.github.ben-manes.versions' version '0.49.0'
1111
id 'java-gradle-plugin'
1212
id 'java-library'
1313
id 'groovy'

gradle-spoon-plugin/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
2-
id 'org.jetbrains.kotlin.jvm' version '1.9.0'
3-
id 'org.jetbrains.dokka' version '1.8.20'
4-
id 'org.jlleitschuh.gradle.ktlint' version '11.5.0'
2+
id 'org.jetbrains.kotlin.jvm' version '1.9.10'
3+
id 'org.jetbrains.dokka' version '1.9.10'
4+
id 'org.jlleitschuh.gradle.ktlint' version '11.6.1'
55
id 'com.vanniktech.maven.publish' version '0.25.3'
66
id 'com.gradle.plugin-publish' version '0.21.0'
77
id 'java-gradle-plugin'

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class UncheckedException : RuntimeException {
4242
*/
4343
@JvmOverloads fun throwAsUncheckedException(
4444
throwable: Throwable,
45-
preserveMessage: Boolean = false
45+
preserveMessage: Boolean = false,
4646
): RuntimeException {
4747
if (throwable is RuntimeException) {
4848
throw throwable

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ internal fun Project.isAndroidProject(): Boolean {
2222
// LibraryPlugin
2323
"android-library",
2424
"com.android.library",
25-
)
25+
),
2626
)
2727
}
2828

@@ -51,7 +51,7 @@ internal fun Project.configureAndroidProject() {
5151

5252
private fun Project.configureVariant(
5353
baseExtension: BaseExtension,
54-
variants: DomainObjectSet<TestVariant>? = null
54+
variants: DomainObjectSet<TestVariant>? = null,
5555
) {
5656
// Configure tasks for all variants
5757
variants?.all { variant ->

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ open class SpoonTask : DefaultTask() { // tasks can't be final
1616

1717
/** Results baseOutputDir. */
1818
@get:OutputDirectory lateinit var outputDir: File
19+
1920
@Internal lateinit var buildDir: File
2021

2122
/** For testing only. */
@@ -45,7 +46,7 @@ open class SpoonTask : DefaultTask() { // tasks can't be final
4546
fun spoonTask() {
4647
if (spoonExtension.className.isEmpty() && spoonExtension.methodName.isNotEmpty()) {
4748
throw IllegalStateException(
48-
"'${spoonExtension.methodName}' must have a fully qualified class name."
49+
"'${spoonExtension.methodName}' must have a fully qualified class name.",
4950
)
5051
}
5152

@@ -127,7 +128,7 @@ open class SpoonTask : DefaultTask() { // tasks can't be final
127128
val success = if (testing) builder.build().run() else true
128129
if (!success && !spoonExtension.ignoreFailures) {
129130
throw GradleException(
130-
"Tests failed! See ${ConsoleRenderer.asClickableFileUrl(File(outputDir, "index.html"))}"
131+
"Tests failed! See ${ConsoleRenderer.asClickableFileUrl(File(outputDir, "index.html"))}",
131132
)
132133
}
133134
}

gradle/dependencies.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ext.versions = [
22
'agp' : '4.2.2', // 7.1.3, ddms issue
3-
'kotlin' : '1.6.21',
3+
'kotlin' : '1.9.10',
44
'spoon' : '2.0.0-SNAPSHOT',
55
'jacoco' : '0.7.9',
66
]

0 commit comments

Comments
 (0)