fix(deps): update dependency org.jmailen.gradle:kotlinter-gradle to v…

…3.11.1 (#122) * chore(deps): update dependency org.jmailen.gradle:kotlinter-gradle to v3.11.1 * Fix by bump Kotlin Co-authored-by: Erwin Wessels <54856303+erwinw@users.noreply.github.com> Co-authored-by: Erwin Wessels <erwin@pleo.io>
pleo-io · Sep 8, 2022 · 08fe25f · 08fe25f
1 parent b8fda00
commit 08fe25f
Show file tree

Hide file tree

Showing 27 changed files with 38 additions and 40 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,11 +1,11 @@
 
 buildscript {
     ext {
-        kotlinVersion = "1.7.0"
+        kotlinVersion = "1.7.10"
         kotlinCoroutinesVersion = "1.6.0"
-        kotlinGradlePluginVersion = "1.7.0"
+        kotlinGradlePluginVersion = "1.7.10"
 
-        kotlinterGradleVersion = "3.10.0"
+        kotlinterGradleVersion = "3.11.1"
     }
 
     repositories {
@@ -31,7 +31,7 @@ subprojects {
     ext {
         junitVersion = "5.9.0"
         kotlinGuiceVersion = "1.6.0"
-        kotlinReflectVersion = "1.7.0"
+        kotlinReflectVersion = "1.7.10"
         mockkVersion = "1.12.4"
     }
 

diff --git a/gradle.properties b/gradle.properties
diff --git a/prop-all/src/test/kotlin/io/pleo/prop/PropTest.kt b/prop-all/src/test/kotlin/io/pleo/prop/PropTest.kt
@@ -51,7 +51,7 @@ class PropTest {
             ComplexObjects.ParsingStage.UNDER_HUMAN_REVIEW to "This is under human review",
             ComplexObjects.ParsingStage.OUTPUT to "This is output",
             ComplexObjects.ParsingStage.FINISHED to "This is finished",
-            ComplexObjects.ParsingStage.ERROR to "This is error",
+            ComplexObjects.ParsingStage.ERROR to "This is error"
         )
 
         val complexObjects = injector.getInstance(ComplexObjects::class.java)
@@ -312,7 +312,7 @@ class PropTest {
             "io.pleo",
             modules.toList(),
             CommonsConfigPropFactory(),
-            JacksonParserFactory(),
+            JacksonParserFactory()
         )
 
         val allModules: List<Module> = buildList {

diff --git a/prop-all/src/test/kotlin/io/pleo/prop/objects/BothNamedAnnotations.kt b/prop-all/src/test/kotlin/io/pleo/prop/objects/BothNamedAnnotations.kt
@@ -7,5 +7,5 @@ import javax.inject.Named as JavaxNamed
 
 class BothNamedAnnotations @Inject constructor(
     @JavaxNamed("io.pleo.test.prop3") val stringProp1: Prop<String>,
-    @GoogleNamed("io.pleo.test.prop4") val stringProp2: Prop<String>,
+    @GoogleNamed("io.pleo.test.prop4") val stringProp2: Prop<String>
 )
diff --git a/prop-all/src/test/kotlin/io/pleo/prop/objects/ComplexObjects.kt b/prop-all/src/test/kotlin/io/pleo/prop/objects/ComplexObjects.kt
@@ -10,7 +10,7 @@ class ComplexObjects @Inject constructor(
     @Named("io.pleo.test.prop1") val withConstructor: Prop<InjectedObjectWithConstructor>,
     @Named("io.pleo.test.prop2") val myListOfComplexObjectProp: Prop<List<InjectedObject>>,
     @Named("io.pleo.test.prop3") val myStringProp: Prop<String>,
-    @Named("io.pleo.test.prop7") val myMappedEnumProp: Prop<Map<ParsingStage, String>>,
+    @Named("io.pleo.test.prop7") val myMappedEnumProp: Prop<Map<ParsingStage, String>>
 ) {
     enum class ParsingStage {
         UPLOADED,

diff --git a/prop-all/src/test/kotlin/io/pleo/prop/objects/DefaultValue.kt b/prop-all/src/test/kotlin/io/pleo/prop/objects/DefaultValue.kt
@@ -8,7 +8,7 @@ import javax.inject.Named
 class DefaultValue @Inject constructor(
     @Default(DEFAULT_VALUE)
     @Named("io.pleo.undefined.property")
-    val usesDefaultValue: Prop<String>,
+    val usesDefaultValue: Prop<String>
 ) {
     companion object {
         const val DEFAULT_VALUE = "This is the default value!"

diff --git a/prop-all/src/test/kotlin/io/pleo/prop/objects/InjectedObjectWithConstructor.kt b/prop-all/src/test/kotlin/io/pleo/prop/objects/InjectedObjectWithConstructor.kt
@@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonProperty
 @Suppress("unused", "unused_parameter")
 class InjectedObjectWithConstructor @JsonCreator constructor(
     @JsonProperty("name") var name: String,
-    @JsonProperty("age") age: Int,
+    @JsonProperty("age") age: Int
 ) {
     var age = 0
 }
diff --git a/prop-all/src/test/kotlin/io/pleo/prop/objects/InlineProviderModule.kt b/prop-all/src/test/kotlin/io/pleo/prop/objects/InlineProviderModule.kt
@@ -21,7 +21,7 @@ class InlineProviderModule : AbstractModule() {
     fun tiesto(
         io: InjectedObject?,
         @Named("io.pleo.test.prop4") w_w: Prop<String>,
-        @Named("io.pleo.test.prop3") u_u: Prop<String>,
+        @Named("io.pleo.test.prop3") u_u: Prop<String>
     ): InjectedObject {
         return InjectedObject()
     }

diff --git a/prop-all/src/test/kotlin/io/pleo/prop/objects/InvalidDefaultValue.kt b/prop-all/src/test/kotlin/io/pleo/prop/objects/InvalidDefaultValue.kt
@@ -9,7 +9,7 @@ import javax.inject.Named
 class InvalidDefaultValue @Inject constructor(
     @Default(DEFAULT_VALUE)
     @Named("io.pleo.undefined.property")
-    val usesDefaultValue: Prop<Double>,
+    val usesDefaultValue: Prop<Double>
 ) {
     companion object {
         const val DEFAULT_VALUE = "This is not a double!"

diff --git a/prop-all/src/test/kotlin/io/pleo/prop/objects/InvalidDefaultValueButValidValue.kt b/prop-all/src/test/kotlin/io/pleo/prop/objects/InvalidDefaultValueButValidValue.kt
@@ -9,7 +9,7 @@ import javax.inject.Named
 class InvalidDefaultValueButValidValue @Inject constructor(
     @Default(DEFAULT_VALUE)
     @Named("io.pleo.test.prop6")
-    val usesDefaultValue: Prop<Double>,
+    val usesDefaultValue: Prop<Double>
 ) {
 
     companion object {

diff --git a/prop-all/src/test/kotlin/io/pleo/prop/objects/MyAssistedInjectFactoryImp.kt b/prop-all/src/test/kotlin/io/pleo/prop/objects/MyAssistedInjectFactoryImp.kt
@@ -8,5 +8,5 @@ import javax.inject.Named
 @Suppress("unused")
 class MyAssistedInjectFactoryImp @Inject constructor(
     @Named("io.pleo.test.prop3") private val prop: Prop<String>,
-    @Assisted private val assistedArg: String,
+    @Assisted private val assistedArg: String
 )
diff --git a/prop-all/src/test/kotlin/io/pleo/prop/objects/MyInterfaceProvider.kt b/prop-all/src/test/kotlin/io/pleo/prop/objects/MyInterfaceProvider.kt
@@ -6,7 +6,7 @@ import javax.inject.Named
 import javax.inject.Provider
 
 class MyInterfaceProvider @Inject constructor(
-    @Named("io.pleo.test.prop3") val prop: Prop<String>,
+    @Named("io.pleo.test.prop3") val prop: Prop<String>
 ) : Provider<MyInterface> {
     override fun get(): MyInterface =
         object : MyInterface {

diff --git a/prop-all/src/test/kotlin/io/pleo/prop/objects/SamePropertyAsComplexObjects.kt b/prop-all/src/test/kotlin/io/pleo/prop/objects/SamePropertyAsComplexObjects.kt
@@ -5,5 +5,5 @@ import javax.inject.Inject
 import javax.inject.Named
 
 class SamePropertyAsComplexObjects @Inject constructor(
-    @Named("io.pleo.test.prop1") val myComplexObjectProp: Prop<InjectedObject>,
+    @Named("io.pleo.test.prop1") val myComplexObjectProp: Prop<InjectedObject>
 )
diff --git a/prop-all/src/test/kotlin/io/pleo/prop/objects/UsesTwiceSameProp.kt b/prop-all/src/test/kotlin/io/pleo/prop/objects/UsesTwiceSameProp.kt
@@ -6,5 +6,5 @@ import javax.inject.Named
 
 class UsesTwiceSameProp @Inject constructor(
     @Named("io.pleo.test.prop3") val stringProp1: Prop<String>,
-    @Named("io.pleo.test.prop3") val stringProp2: Prop<String>,
+    @Named("io.pleo.test.prop3") val stringProp2: Prop<String>
 )
diff --git a/prop-commons-config/src/main/kotlin/io/pleo/prop/commonsconfig/CommonsConfigPropFactory.kt b/prop-commons-config/src/main/kotlin/io/pleo/prop/commonsconfig/CommonsConfigPropFactory.kt
@@ -8,19 +8,19 @@ import org.apache.commons.configuration2.builder.fluent.Configurations
 import java.io.File
 
 class CommonsConfigPropFactory(
-    private val builder: ConfigurationBuilder<*>? = null,
+    private val builder: ConfigurationBuilder<*>? = null
 ) : PropFactory {
     override fun <T> createProp(
         propName: String,
         parse: Parser<T>,
-        defaultValue: T?,
+        defaultValue: T?
     ): Prop<T> =
         CommonsConfigProp(
             ParsingProperty(
                 builder = builder ?: createDefaultBuilder(),
                 name = propName,
                 parser = parse,
-                defaultValue = defaultValue,
+                defaultValue = defaultValue
             )
         )
 

diff --git a/prop-commons-config/src/main/kotlin/io/pleo/prop/commonsconfig/ParsingProperty.kt b/prop-commons-config/src/main/kotlin/io/pleo/prop/commonsconfig/ParsingProperty.kt
@@ -14,7 +14,7 @@ class ParsingProperty<T>(
     private val builder: ConfigurationBuilder<*>,
     val name: String,
     private val parser: Parser<T>,
-    private val defaultValue: T?,
+    private val defaultValue: T?
 ) {
     @Volatile
     private var value: T = parseProperty()

diff --git a/...-config/src/main/kotlin/io/pleo/prop/commonsconfig/utils/CompositeConfigurationBuilder.kt b/...-config/src/main/kotlin/io/pleo/prop/commonsconfig/utils/CompositeConfigurationBuilder.kt
@@ -102,22 +102,21 @@ class CompositeConfigurationBuilder : ConfigurationBuilder<CompositeConfiguratio
                 ConfigurationBuilderResultCreatedEvent(
                     this,
                     ConfigurationBuilderResultCreatedEvent.RESULT_CREATED,
-                    compositeConfiguration,
+                    compositeConfiguration
                 )
             )
         }
     }
 
     private fun <E : Event> registerListener(
         eventSource: EventSource,
-        registrationData: EventListenerRegistrationData<E>,
+        registrationData: EventListenerRegistrationData<E>
     ) {
         eventSource.addEventListener(registrationData.eventType, registrationData.listener)
     }
 
     private fun createResult(): CompositeConfiguration =
         CompositeConfiguration().apply {
-
             items.forEach {
                 val configuration =
                     when (it) {

diff --git a/prop-core/src/main/kotlin/io/pleo/prop/core/Default.kt b/prop-core/src/main/kotlin/io/pleo/prop/core/Default.kt
@@ -4,5 +4,5 @@ package io.pleo.prop.core
 @Target(AnnotationTarget.VALUE_PARAMETER)
 annotation class Default(
     /** The default value  */
-    val value: String = "",
+    val value: String = ""
 )
diff --git a/prop-core/src/main/kotlin/io/pleo/prop/core/PropException.kt b/prop-core/src/main/kotlin/io/pleo/prop/core/PropException.kt
@@ -2,5 +2,5 @@ package io.pleo.prop.core
 
 open class PropException(
     message: String? = null,
-    cause: Throwable? = null,
+    cause: Throwable? = null
 ) : RuntimeException(message, cause)
diff --git a/prop-core/src/main/kotlin/io/pleo/prop/core/Types.kt b/prop-core/src/main/kotlin/io/pleo/prop/core/Types.kt
@@ -0,0 +1,5 @@
+package io.pleo.prop.core
+
+typealias Callback<T> = (T) -> Unit
+typealias Supplier<T> = () -> T
+typealias Parser<T> = (String) -> T
diff --git a/prop-core/src/main/kotlin/io/pleo/prop/core/internal/LocalProp.kt b/prop-core/src/main/kotlin/io/pleo/prop/core/internal/LocalProp.kt
@@ -6,7 +6,7 @@ import io.pleo.prop.core.Supplier
 import java.time.Instant
 
 class LocalProp<T>(
-    private val supplier: Supplier<T>,
+    private val supplier: Supplier<T>
 ) : Prop<T> {
     private val created: Instant = Instant.now()
 

diff --git a/prop-core/src/main/kotlin/io/pleo/prop/core/internal/PropFactory.kt b/prop-core/src/main/kotlin/io/pleo/prop/core/internal/PropFactory.kt
@@ -8,6 +8,6 @@ interface PropFactory {
     fun <T> createProp(
         propName: String,
         parse: Parser<T>,
-        defaultValue: T?,
+        defaultValue: T?
     ): Prop<T>
 }
diff --git a/prop-core/src/main/kotlin/io/pleo/prop/core/types.kt b/prop-core/src/main/kotlin/io/pleo/prop/core/types.kt
diff --git a/prop-guice/src/main/kotlin/io/pleo/prop/guice/AutoPropModule.kt b/prop-guice/src/main/kotlin/io/pleo/prop/guice/AutoPropModule.kt
@@ -11,7 +11,7 @@ class AutoPropModule(
     private val packagePrefix: String,
     private val modulesToScan: Iterable<Module>,
     private val propFactory: PropFactory,
-    private val parserFactory: ParserFactory,
+    private val parserFactory: ParserFactory
 ) : Module {
     override fun configure(binder: Binder) {
         PropMappingVisitor(
@@ -23,7 +23,7 @@ class AutoPropModule(
             .forEach { (key, value) ->
                 value.fold(
                     { binder.bind(key).toInstance(it) },
-                    { binder.addError(it) },
+                    { binder.addError(it) }
                 )
             }
     }

diff --git a/prop-guice/src/main/kotlin/io/pleo/prop/guice/internal/PropMappingVisitor.kt b/prop-guice/src/main/kotlin/io/pleo/prop/guice/internal/PropMappingVisitor.kt
@@ -31,7 +31,7 @@ typealias PropResult = Result<Prop<*>>
 class PropMappingVisitor(
     filter: Predicate<TypeLiteral<*>>,
     private val propFactory: PropFactory,
-    private val parserFactory: ParserFactory,
+    private val parserFactory: ParserFactory
 ) : DefaultElementVisitor<Map<Key<Prop<*>>, PropResult>>() {
     private val injectionPointExtractor: InjectionPointExtractor = InjectionPointExtractor(filter)
 
@@ -108,7 +108,7 @@ class PropMappingVisitor(
             return propFactory.createProp(
                 propertyName,
                 parser as Parser<Any>,
-                defaultValue,
+                defaultValue
             )
         } catch (ex: RuntimeException) {
             throw FailedToCreatePropException(propertyName, ex)

diff --git a/prop-guice/src/main/kotlin/io/pleo/prop/guice/internal/PropParameters.kt b/prop-guice/src/main/kotlin/io/pleo/prop/guice/internal/PropParameters.kt
@@ -4,5 +4,5 @@ import com.google.inject.TypeLiteral
 
 class PropParameters<T>(
     val typeLiteral: TypeLiteral<T>,
-    val annotations: List<Annotation>,
+    val annotations: List<Annotation>
 )
diff --git a/prop-jackson/src/main/kotlin/io/pleo/prop/jackson/JacksonParserFactory.kt b/prop-jackson/src/main/kotlin/io/pleo/prop/jackson/JacksonParserFactory.kt
@@ -23,7 +23,7 @@ import java.time.ZonedDateTime
 import javax.money.Monetary
 
 class JacksonParserFactory @JvmOverloads constructor(
-    private val objectMapper: ObjectMapper = ObjectMapper(),
+    private val objectMapper: ObjectMapper = ObjectMapper()
 ) : ParserFactory {
     @Suppress("MemberVisibilityCanBePrivate")
     private val knownParsers: MutableMap<Type, (String) -> Any> = mutableMapOf(