update dependencies

0.19.5

CHANGELOG.md

@@ -1,5 +1,27 @@
 # Changelog
 
+## 0.19.6
+
+* `Versions`:
+      * `Coroutines`: `1.6.4` -> `1.7.1`
+      * `Ktor`: `2.3.1` -> `2.3.2`
+      * `Compose`: `1.4.0` -> `1.4.1`
+
+## 0.19.5
+
+* `Repos`:
+    * `Generator`:
+        * Fixes in new type generation
+
+## 0.19.4
+
+* `Versions`:
+    * `Koin`: `3.4.1` -> `3.4.2`
+    * `Android Fragments`: `1.5.7` -> `1.6.0`
+* `Koin`
+    * `Generator`
+        * Fixes in new generic generator part
+
 ## 0.19.3
 
 * `Koin`

build.gradle

@@ -17,6 +17,10 @@ buildscript {
     }
 }
 
+plugins {
+    alias(libs.plugins.versions)
+}
+
 allprojects {
     repositories {
         mavenLocal()
@@ -38,3 +42,4 @@ allprojects {
 
 apply from: "./extensions.gradle"
 apply from: "./github_release.gradle"
+apply from: "./versions_plugin_setup.gradle"

gradle.properties

@@ -14,5 +14,5 @@ crypto_js_version=4.1.1
 # Project data
 
 group=dev.inmo
-version=0.19.3
-android_code_version=199
+version=0.19.6
+android_code_version=202

gradle/libs.versions.toml

@@ -2,35 +2,37 @@
 
 kt = "1.8.20"
 kt-serialization = "1.5.1"
-kt-coroutines = "1.6.4"
+kt-coroutines = "1.7.1"
 
 kslog = "1.1.1"
 
-jb-compose = "1.4.0"
+jb-compose = "1.4.1"
 jb-exposed = "0.41.1"
 jb-dokka = "1.8.20"
 
 korlibs = "4.0.3"
 uuid = "0.7.1"
 
-ktor = "2.3.1"
+ktor = "2.3.2"
 
 gh-release = "2.4.1"
 
-koin = "3.4.1"
+koin = "3.4.2"
 
 okio = "3.3.0"
 
 ksp = "1.8.20-1.0.11"
 kotlin-poet = "1.14.2"
 
+versions = "0.47.0"
+
 android-gradle = "7.4.2"
 dexcount = "4.0.0"
 
 android-coreKtx = "1.10.1"
 android-recyclerView = "1.3.0"
 android-appCompat = "1.6.1"
-android-fragment = "1.5.7"
+android-fragment = "1.6.0"
 android-espresso = "3.5.1"
 android-test = "1.1.5"
 
@@ -109,3 +111,5 @@ buildscript-android-dexcount = { module = "com.getkeepsafe.dexcount:dexcount-gra
 [plugins]
 
 jb-compose = { id = "org.jetbrains.compose", version.ref = "jb-compose" }
+
+versions = { id = "com.github.ben-manes.versions", version.ref = "versions" }

koin/generator/build.gradle

@@ -13,3 +13,8 @@ dependencies {
     api libs.kotlin.poet
     api libs.ksp
 }
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}

koin/generator/src/main/kotlin/Processor.kt

@@ -127,7 +127,7 @@ class Processor(
                     addModifiers(KModifier.INLINE)
                     targetTypeAsGenericType ?.let {
                         addTypeVariable(it)
-                        returns(it)
+                        returns(it.copy(nullable = nullable))
                     } ?: returns(targetType)
                     addCode(
                         "return " + (if (nullable) {

koin/generator/test/src/commonMain/kotlin/GeneratedDefinitionsTest.kt

@@ -97,3 +97,28 @@ public inline fun <reified T : Any> Module.singleTest(createdAtStart: Boolean =
  */
 public inline fun <reified T : Any> Module.factoryTest(noinline definition: Definition<T>):
     KoinDefinition<T> = factory(named("test"), definition = definition)
+
+/**
+ * @return Definition by key "testNullable" with [parameters]
+ */
+public inline fun <reified T : Any> Scope.testNullable(noinline parameters: ParametersDefinition? =
+    null): T? = getOrNull(named("testNullable"), parameters)
+
+/**
+ * @return Definition by key "testNullable" with [parameters]
+ */
+public inline fun <reified T : Any> Koin.testNullable(noinline parameters: ParametersDefinition? =
+    null): T? = getOrNull(named("testNullable"), parameters)
+
+/**
+ * Will register [definition] with [org.koin.core.module.Module.single] and key "testNullable"
+ */
+public inline fun <reified T : Any> Module.singleTestNullable(createdAtStart: Boolean = false,
+    noinline definition: Definition<T>): KoinDefinition<T> = single(named("testNullable"),
+    createdAtStart = createdAtStart, definition = definition)
+
+/**
+ * Will register [definition] with [org.koin.core.module.Module.factory] and key "testNullable"
+ */
+public inline fun <reified T : Any> Module.factoryTestNullable(noinline definition: Definition<T>):
+    KoinDefinition<T> = factory(named("testNullable"), definition = definition)

koin/generator/test/src/commonMain/kotlin/Test.kt

@@ -1,5 +1,6 @@
 @file:GenerateKoinDefinition("sampleInfo", Test::class, String::class, nullable = false)
 @file:GenerateGenericKoinDefinition("test", nullable = false)
+@file:GenerateGenericKoinDefinition("testNullable", nullable = true)
 package dev.inmo.micro_utils.koin.generator.test
 
 import dev.inmo.micro_utils.koin.annotations.GenerateGenericKoinDefinition

repos/generator/build.gradle

@@ -14,3 +14,8 @@ dependencies {
     api libs.kotlin.poet
     api libs.ksp
 }
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}

repos/generator/src/main/kotlin/Processor.kt

@@ -100,7 +100,11 @@ class Processor(
                         primaryConstructor(
                             FunSpec.constructorBuilder().apply {
                                 ksClassProperties.forEach {
-                                    addParameter(it.simpleName.getShortName(), it.typeName)
+                                    addParameter(
+                                        ParameterSpec.builder(it.simpleName.getShortName(), it.typeName).apply {
+                                            annotations += it.annotations.map { it.toAnnotationSpec() }
+                                        }.build()
+                                    )
                                     typeBuilder.addProperty(
                                         PropertySpec.builder(it.simpleName.getShortName(), it.typeName, KModifier.OVERRIDE).apply {
                                             initializer(it.simpleName.getShortName())

repos/generator/test/src/commonMain/kotlin/GeneratedModelsTest.kt

@@ -11,18 +11,20 @@ import kotlinx.serialization.Serializable
 @Serializable
 @SerialName(value = "NewTest")
 public data class NewTest(
-  public override val property1: String,
-  public override val property2: Int,
-  public override val parent: ParentTypeId?,
+  override val property1: String,
+  override val property2: Int,
+  @Serializable
+  override val parent: ParentTypeId?,
 ) : Test
 
 @Serializable
 @SerialName(value = "RegisteredTest")
 public data class RegisteredTest(
-  public override val id: TestId,
-  public override val property1: String,
-  public override val property2: Int,
-  public override val parent: ParentTypeId?,
+  override val id: TestId,
+  override val property1: String,
+  override val property2: Int,
+  @Serializable
+  override val parent: ParentTypeId?,
 ) : Test, IRegisteredTest
 
 public fun Test.asNew(): NewTest = NewTest(property1, property2, parent)

repos/generator/test/src/commonMain/kotlin/Test.kt

@@ -17,6 +17,7 @@ typealias ParentTypeId = TestId
 sealed interface Test {
     val property1: String
     val property2: Int
+    @Serializable
     val parent: ParentTypeId?
 
     @GenerateCRUDModelExcludeOverride

versions_plugin_setup.gradle

@@ -0,0 +1,11 @@
+def isNonStable = { String version ->
+    def stableKeyword = ['RELEASE', 'FINAL', 'GA'].any { it -> version.toUpperCase().contains(it) }
+    def regex = /^[0-9,.v-]+(-r)?$/
+    return !stableKeyword && !(version ==~ regex)
+}
+
+tasks.named("dependencyUpdates").configure {
+    rejectVersionIf {
+        isNonStable(it.candidate.version)
+    }
+}