Merge branch 'release/0.1.1'

jangalinski · jangalinski · commit 4ae7b6da0767 · 2025-02-08T12:50:18.000+01:00
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,15 +1,15 @@
 version: 2
 updates:
-  - package-ecosystem: maven
+  - package-ecosystem: "maven"
     directory: "/"
     schedule:
-      interval: daily
-    open-pull-requests-limit: 10
-    default-labels:
+      interval: "weekly"
+    open-pull-requests-limit: 19
+    labels:
       - "Type: dependencies"
-  - package-ecosystem: github-actions
+  - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
-      interval: daily
-    default-labels:
+      interval: "daily"
+    labels:
       - "Type: dependencies"
diff --git a/.github/workflows/development.yml b/.github/workflows/development.yml
@@ -38,7 +38,7 @@ jobs:
 
       - name: Upload coverage to Codecov
         if: github.event_name == 'push' && github.actor != 'dependabot[bot]'
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           token: ${{secrets.CODECOV_TOKEN}}
 
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -47,7 +47,7 @@ jobs:
           OSS_CENTRAL_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
 
       - name: Upload coverage information
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
 
diff --git a/_build/parent/pom.xml b/_build/parent/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.toolisticon.kotlin.generation._</groupId>
     <artifactId>kotlin-code-generation-root</artifactId>
-    <version>0.1.0</version>
+    <version>0.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -21,8 +21,8 @@
     <slf4j.version>2.0.16</slf4j.version>
 
     <!-- TEST -->
-    <assertj.version>3.26.3</assertj.version>
-    <logback.version>1.5.12</logback.version>
+    <assertj.version>3.27.3</assertj.version>
+    <logback.version>1.5.16</logback.version>
   </properties>
 
   <dependencyManagement>
@@ -80,14 +80,8 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>io.github.microutils</groupId>
+      <groupId>io.github.oshai</groupId>
       <artifactId>kotlin-logging-jvm</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <!-- /KOTLIN -->
 
diff --git a/_build/report-generator/pom.xml b/_build/report-generator/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.toolisticon.kotlin.generation._</groupId>
     <artifactId>kotlin-code-generation-parent</artifactId>
-    <version>0.1.0</version>
+    <version>0.1.1</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
diff --git a/_itest/builder-itest/pom.xml b/_itest/builder-itest/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.toolisticon.kotlin.generation._</groupId>
     <artifactId>kotlin-code-generation-itest-root</artifactId>
-    <version>0.1.0</version>
+    <version>0.1.1</version>
   </parent>
 
   <groupId>io.toolisticon.kotlin.generation.itest</groupId>
diff --git a/_itest/pom.xml b/_itest/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.toolisticon.kotlin.generation._</groupId>
     <artifactId>kotlin-code-generation-parent</artifactId>
-    <version>0.1.0</version>
+    <version>0.1.1</version>
     <relativePath>../_build/parent/pom.xml</relativePath>
   </parent>
 
diff --git a/_itest/spi-itest/pom.xml b/_itest/spi-itest/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.toolisticon.kotlin.generation._</groupId>
     <artifactId>kotlin-code-generation-itest-root</artifactId>
-    <version>0.1.0</version>
+    <version>0.1.1</version>
   </parent>
 
   <groupId>io.toolisticon.kotlin.generation.itest</groupId>
diff --git a/kotlin-code-generation-bom/pom.xml b/kotlin-code-generation-bom/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.toolisticon.kotlin.generation._</groupId>
     <artifactId>kotlin-code-generation-root</artifactId>
-    <version>0.1.0</version>
+    <version>0.1.1</version>
   </parent>
 
   <groupId>io.toolisticon.kotlin.generation</groupId>
diff --git a/kotlin-code-generation-test/pom.xml b/kotlin-code-generation-test/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.toolisticon.kotlin.generation._</groupId>
     <artifactId>kotlin-code-generation-parent</artifactId>
-    <version>0.1.0</version>
+    <version>0.1.1</version>
     <relativePath>../_build/parent/pom.xml</relativePath>
   </parent>
 
diff --git a/kotlin-code-generation/pom.xml b/kotlin-code-generation/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.toolisticon.kotlin.generation._</groupId>
     <artifactId>kotlin-code-generation-parent</artifactId>
-    <version>0.1.0</version>
+    <version>0.1.1</version>
     <relativePath>../_build/parent/pom.xml</relativePath>
   </parent>
 
diff --git a/kotlin-code-generation/src/main/kotlin/KotlinCodeGeneration.kt b/kotlin-code-generation/src/main/kotlin/KotlinCodeGeneration.kt
@@ -4,6 +4,7 @@ package io.toolisticon.kotlin.generation
 
 import com.squareup.kotlinpoet.*
 import com.squareup.kotlinpoet.MemberName.Companion.member
+import io.github.oshai.kotlinlogging.KotlinLogging
 import io.toolisticon.kotlin.generation.KotlinCodeGeneration.builder.annotationBuilder
 import io.toolisticon.kotlin.generation.KotlinCodeGeneration.builder.annotationClassBuilder
 import io.toolisticon.kotlin.generation.KotlinCodeGeneration.builder.anonymousClassBuilder
@@ -33,15 +34,16 @@ import io.toolisticon.kotlin.generation.spi.KotlinCodeGenerationStrategy
 import io.toolisticon.kotlin.generation.spi.registry.KotlinCodeGenerationServiceLoader
 import io.toolisticon.kotlin.generation.spi.strategy.executeAll
 import io.toolisticon.kotlin.generation.support.SUPPRESS_MEMBER_VISIBILITY_CAN_BE_PRIVATE
-import mu.KLogging
 import kotlin.reflect.KClass
 import kotlin.reflect.full.isSubclassOf
 
 /**
  * Kotlin Code Generation is a wrapper lib for kotlin poet. This is the central class that allows access to builders and tools via simple static helpers.
  */
 @ExperimentalKotlinPoetApi
-object KotlinCodeGeneration : KLogging() {
+object KotlinCodeGeneration {
+  @PublishedApi
+  internal val logger = KotlinLogging.logger {}
 
   // region [Category: build* functions]
 
diff --git a/kotlin-code-generation/src/main/kotlin/builder/KotlinDataClassSpecBuilder.kt b/kotlin-code-generation/src/main/kotlin/builder/KotlinDataClassSpecBuilder.kt
@@ -3,12 +3,12 @@
 package io.toolisticon.kotlin.generation.builder
 
 import com.squareup.kotlinpoet.*
+import io.github.oshai.kotlinlogging.KotlinLogging
 import io.toolisticon.kotlin.generation.KotlinCodeGeneration.simpleClassName
 import io.toolisticon.kotlin.generation.builder.KotlinConstructorPropertySpecBuilder.Companion.primaryConstructorWithProperties
 import io.toolisticon.kotlin.generation.poet.*
 import io.toolisticon.kotlin.generation.spec.*
 import io.toolisticon.kotlin.generation.support.SUPPRESS_UNUSED
-import mu.KLogging
 import javax.lang.model.element.Element
 import kotlin.reflect.KClass
 
@@ -26,7 +26,7 @@ class KotlinDataClassSpecBuilder internal constructor(
   KotlinMemberSpecHolderBuilder<KotlinDataClassSpecBuilder>,
   KotlinSuperInterfaceSupport<KotlinDataClassSpecBuilder>,
   KotlinTypeSpecHolderBuilder<KotlinDataClassSpecBuilder> {
-  companion object : KLogging() {
+  companion object {
     /**
      * Creates new builder.
      */
@@ -38,6 +38,8 @@ class KotlinDataClassSpecBuilder internal constructor(
     fun builder(className: ClassName): KotlinDataClassSpecBuilder = KotlinDataClassSpecBuilder(className)
   }
 
+  private val logger = KotlinLogging.logger {}
+
   internal constructor (className: ClassName) : this(
     className = className,
     delegate = TypeSpecBuilder.classBuilder(className)
diff --git a/kotlin-code-generation/src/main/kotlin/spi/registry/KotlinCodeGenerationServiceRepository.kt b/kotlin-code-generation/src/main/kotlin/spi/registry/KotlinCodeGenerationServiceRepository.kt
@@ -1,11 +1,13 @@
 package io.toolisticon.kotlin.generation.spi.registry
 
 import com.squareup.kotlinpoet.ExperimentalKotlinPoetApi
+import io.github.oshai.kotlinlogging.KotlinLogging
 import io.toolisticon.kotlin.generation.KotlinCodeGeneration
-import io.toolisticon.kotlin.generation.spi.*
+import io.toolisticon.kotlin.generation.spi.KotlinCodeGenerationProcessor
+import io.toolisticon.kotlin.generation.spi.KotlinCodeGenerationSpiRegistry
+import io.toolisticon.kotlin.generation.spi.KotlinCodeGenerationStrategy
 import io.toolisticon.kotlin.generation.spi.processor.KotlinCodeGenerationProcessorList
 import io.toolisticon.kotlin.generation.spi.strategy.KotlinCodeGenerationStrategyList
-import mu.KLogging
 import java.util.*
 import kotlin.reflect.KClass
 
@@ -21,16 +23,19 @@ class KotlinCodeGenerationServiceRepository(
   override val processors: KotlinCodeGenerationProcessorList = KotlinCodeGenerationProcessorList(),
   override val strategies: KotlinCodeGenerationStrategyList = KotlinCodeGenerationStrategyList(),
 ) : KotlinCodeGenerationSpiRegistry {
-  companion object : KLogging() {
+  companion object {
 
-    fun load(contextTypeUpperBound: KClass<*>,
-             classLoader: ClassLoader = KotlinCodeGeneration.spi.defaultClassLoader(),
-             exclusions: Set<String> = emptySet()
+    fun load(
+      contextTypeUpperBound: KClass<*>,
+      classLoader: ClassLoader = KotlinCodeGeneration.spi.defaultClassLoader(),
+      exclusions: Set<String> = emptySet()
     ): KotlinCodeGenerationSpiRegistry {
       return KotlinCodeGenerationServiceLoader(contextTypeUpperBound, classLoader, exclusions)()
     }
   }
 
+  private val logger = KotlinLogging.logger {}
+
   init {
     require(strategies.isNotEmpty()) { "At least one strategy is required." }
     if (processors.isEmpty()) {
diff --git a/pom.xml b/pom.xml
@@ -5,13 +5,13 @@
   <parent>
     <groupId>io.toolisticon.maven.parent</groupId>
     <artifactId>maven-parent-kotlin-base</artifactId>
-    <version>2024.12.1</version>
+    <version>2025.2.0</version>
     <relativePath/>
   </parent>
 
   <groupId>io.toolisticon.kotlin.generation._</groupId>
   <artifactId>kotlin-code-generation-root</artifactId>
-  <version>0.1.0</version>
+  <version>0.1.1</version>
 
   <name>pom: ${project.artifactId}</name>
   <description>Root of kotlin-code-generation</description>
