Skip to content

Commit 62d297f

Browse files
committed
lint
1 parent 75b46cd commit 62d297f

File tree

25 files changed

+80
-65
lines changed

25 files changed

+80
-65
lines changed

.editorconfig

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
[*.{kt,kts}]
2-
disabled_rules=no-wildcard-imports
2+
ktlint_code_style = ktlint_official
3+
ktlint_disabled_rules = no-wildcard-imports
4+
ij_kotlin_allow_trailing_comma_on_call_site = true

build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,9 @@ tasks {
6060

6161
val publish by creating {
6262
group = "publishing"
63-
if (!isSnapshot)
63+
if (!isSnapshot) {
6464
finalizedBy("closeAndReleaseSonatypeStagingRepository", ":docs:orchidDeploy", ":gradle-plugin:publishPlugins")
65+
}
6566
}
6667

6768
val version by creating {

docs/src/orchid/kotlin/com/intuit/hooks/docs/HooksTheme.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,6 @@ class HooksTheme @Inject constructor(context: OrchidContext) : Theme(context, "H
3535
listOfNotNull(super.getResourceSource(), delegateTheme.resourceSource),
3636
emptyList(),
3737
priority,
38-
ThemeResourceSource
38+
ThemeResourceSource,
3939
)
4040
}

example-library/src/test/kotlin/CarHooksTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.intuit.hooks.example.library
22

33
import com.intuit.hooks.example.library.car.Car
4-
import org.junit.jupiter.api.Assertions.*
4+
import org.junit.jupiter.api.Assertions.assertEquals
55
import org.junit.jupiter.api.Test
66

77
internal class CarHooksTest {

example-library/src/test/kotlin/GenericHookTests.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.intuit.hooks.example.library
22

3-
import com.intuit.hooks.BailResult.*
3+
import com.intuit.hooks.BailResult.Bail
4+
import com.intuit.hooks.BailResult.Continue
45
import com.intuit.hooks.HookContext
56
import com.intuit.hooks.LoopResult
67
import com.intuit.hooks.example.library.generic.GenericHooksImpl
@@ -140,6 +141,7 @@ class GenericHookTests {
140141
val result = h.call("Kian")
141142
Assertions.assertEquals("bail now", result)
142143
}
144+
143145
@Test
144146
fun `async series loop`() = runBlocking {
145147
var incrementedA = 0

gradle-plugin/src/main/kotlin/com/intuit/hooks/plugin/gradle/HooksGradlePlugin.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,18 @@ public class HooksGradlePlugin : Plugin<Project> {
2121

2222
private fun Project.addDependency(configuration: String, dependencyNotation: String) = configurations
2323
.getByName(configuration).dependencies.add(
24-
dependencies.create(dependencyNotation)
24+
dependencies.create(dependencyNotation),
2525
)
2626

2727
override fun apply(project: Project): Unit = with(project) {
2828
extensions.create(
2929
"hooks",
30-
HooksGradleExtension::class.java
30+
HooksGradleExtension::class.java,
3131
)
3232

33-
if (!pluginManager.hasPlugin("com.google.devtools.ksp"))
33+
if (!pluginManager.hasPlugin("com.google.devtools.ksp")) {
3434
pluginManager.apply("com.google.devtools.ksp")
35+
}
3536

3637
addDependency("api", "com.intuit.hooks:hooks:$hooksVersion")
3738
addDependency("ksp", "com.intuit.hooks:processor:$hooksVersion")

gradle-plugin/src/test/kotlin/HooksGradlePluginTest.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@ class HooksGradlePluginTest {
3333
kotlin("jvm")
3434
id("com.intuit.hooks")
3535
}
36-
"""
36+
""",
3737
)
3838
}
3939

4040
@Test fun `can apply plugin`() {
4141
buildFile.appendKotlin(
4242
"""
4343
hooks {}
44-
"""
44+
""",
4545
)
4646

4747
assertDoesNotThrow {
@@ -66,7 +66,7 @@ class HooksGradlePluginTest {
6666
@Sync<(String) -> Unit>
6767
abstract val testSyncHook: Hook
6868
}
69-
"""
69+
""",
7070
)
7171

7272
val runner = GradleRunner.create()

hooks/src/main/kotlin/com/intuit/hooks/BaseHook.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public data class TapInfo<FWithContext : Function<*>> internal constructor(
3737
public val name: String,
3838
public val id: String,
3939
public val type: String,
40-
public val f: FWithContext,
40+
public val f: FWithContext
4141
// val stage: Int, // todo: maybe this should be forEachIndexed?
4242
// before?: string | Array // todo: do we even really need this?
4343
)

hooks/src/main/kotlin/com/intuit/hooks/dsl/Hooks.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ public abstract class Hooks {
6060
ReplaceWith("@Hooks.AsyncParallelBail<F>"),
6161
DeprecationLevel.ERROR,
6262
)
63-
@ExperimentalCoroutinesApi protected fun <F : Function<BailResult<*>>> asyncParallelBailHook(): AsyncParallelBailHook<*, *> = stub()
63+
@ExperimentalCoroutinesApi
64+
protected fun <F : Function<BailResult<*>>> asyncParallelBailHook(): AsyncParallelBailHook<*, *> = stub()
6465

6566
protected annotation class AsyncSeries<F : Function<*>>
6667

hooks/src/test/kotlin/com/intuit/hooks/AsyncSeriesLoopHookTests.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package com.intuit.hooks
22

3-
import io.mockk.*
3+
import io.mockk.coEvery
4+
import io.mockk.coVerify
5+
import io.mockk.mockk
46
import kotlinx.coroutines.delay
57
import kotlinx.coroutines.runBlocking
68
import org.junit.jupiter.api.Assertions
@@ -10,7 +12,7 @@ class AsyncSeriesLoopHookTests {
1012
class LoopHook1<T1> : AsyncSeriesLoopHook<suspend (HookContext, T1) -> LoopResult, suspend (HookContext, T1) -> Unit>() {
1113
suspend fun call(p1: T1) = super.call(
1214
invokeTap = { f, context -> f(context, p1) },
13-
invokeInterceptor = { f, context -> f(context, p1) }
15+
invokeInterceptor = { f, context -> f(context, p1) },
1416
)
1517
}
1618

0 commit comments

Comments
 (0)