diff --git a/build.gradle.kts b/build.gradle.kts index dabf2ec..3ce7d28 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,7 +2,7 @@ plugins { id("maven") id("java") id("org.jetbrains.kotlin.jvm") version "1.3.72" - id("org.jlleitschuh.gradle.ktlint") version "9.2.1" + id("org.jlleitschuh.gradle.ktlint") version "9.3.0" id("jacoco") } diff --git a/src/main/kotlin/com/mapk/core/Functions.kt b/src/main/kotlin/com/mapk/core/Functions.kt index 7ef037e..556398c 100644 --- a/src/main/kotlin/com/mapk/core/Functions.kt +++ b/src/main/kotlin/com/mapk/core/Functions.kt @@ -8,7 +8,7 @@ import kotlin.reflect.full.functions inline fun KClass<*>.getAnnotatedFunctionsFromCompanionObject(): Pair>>? { return this.companionObject?.let { companionObject -> - val temp = companionObject.functions.filter { functions -> functions.annotations.any { it is A } } + val temp = companionObject.functions.filter { function -> function.annotations.any { it is A } } if (temp.isEmpty()) { // 空ならその後の処理をしてもしょうがないのでnullに合わせる diff --git a/src/main/kotlin/com/mapk/core/KFunctionForCall.kt b/src/main/kotlin/com/mapk/core/KFunctionForCall.kt index 7586e05..4282305 100644 --- a/src/main/kotlin/com/mapk/core/KFunctionForCall.kt +++ b/src/main/kotlin/com/mapk/core/KFunctionForCall.kt @@ -7,12 +7,12 @@ import com.mapk.core.internal.ParameterNameConverter import com.mapk.core.internal.getAliasOrName import com.mapk.core.internal.getKConstructor import com.mapk.core.internal.isUseDefaultArgument +import org.jetbrains.annotations.TestOnly import kotlin.reflect.KClass import kotlin.reflect.KFunction import kotlin.reflect.KParameter import kotlin.reflect.full.findAnnotation import kotlin.reflect.jvm.isAccessible -import org.jetbrains.annotations.TestOnly class KFunctionForCall internal constructor( @TestOnly diff --git a/src/main/kotlin/com/mapk/core/internal/Functions.kt b/src/main/kotlin/com/mapk/core/internal/Functions.kt index d8bbd8a..de3b7f6 100644 --- a/src/main/kotlin/com/mapk/core/internal/Functions.kt +++ b/src/main/kotlin/com/mapk/core/internal/Functions.kt @@ -22,13 +22,11 @@ internal fun KParameter.getAliasOrName(): String? = findAnnotation