From b9a26530663fd5b34268aa47f46977aa65278508 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 19 Oct 2024 13:41:25 +0600 Subject: [PATCH 1/3] start 0.22.7 --- CHANGELOG.md | 2 ++ gradle.properties | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6af660b0f2e..4dbb9e081da 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog +## 0.22.7 + ## 0.22.6 * `KSP`: diff --git a/gradle.properties b/gradle.properties index e78b60bf1e5..aaa620af696 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,5 +15,5 @@ crypto_js_version=4.1.1 # Project data group=dev.inmo -version=0.22.6 -android_code_version=272 +version=0.22.7 +android_code_version=273 From 4625dfb85713d47f0a51f13f186df2dfe5ff0e30 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 19 Oct 2024 13:44:37 +0600 Subject: [PATCH 2/3] replace GenerateSealedWorkaround --- CHANGELOG.md | 4 ++++ ksp/sealed/generator/src/main/kotlin/Processor.kt | 2 +- ksp/sealed/generator/test/src/commonMain/kotlin/Test.kt | 2 +- .../src/commonMain/kotlin/GenerateSealedWorkaround.kt | 2 +- .../src/commonMain/kotlin/OldGenerateSealedWorkaround.kt | 6 ++++++ 5 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 ksp/sealed/src/commonMain/kotlin/OldGenerateSealedWorkaround.kt diff --git a/CHANGELOG.md b/CHANGELOG.md index 4dbb9e081da..09ecd3d7af9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## 0.22.7 +* `KSP`: + * `Sealed`: + * Change package of `GenerateSealedWorkaround`. Migration: replace `dev.inmo.microutils.kps.sealed.GenerateSealedWorkaround` -> `dev.inmo.micro_utils.ksp.sealed.GenerateSealedWorkaround` + ## 0.22.6 * `KSP`: diff --git a/ksp/sealed/generator/src/main/kotlin/Processor.kt b/ksp/sealed/generator/src/main/kotlin/Processor.kt index 99196279576..bf716e02840 100644 --- a/ksp/sealed/generator/src/main/kotlin/Processor.kt +++ b/ksp/sealed/generator/src/main/kotlin/Processor.kt @@ -19,7 +19,7 @@ import dev.inmo.micro_ksp.generator.buildSubFileName import dev.inmo.micro_ksp.generator.companion import dev.inmo.micro_ksp.generator.findSubClasses import dev.inmo.micro_ksp.generator.writeFile -import dev.inmo.microutils.kps.sealed.GenerateSealedWorkaround +import dev.inmo.micro_utils.ksp.sealed.GenerateSealedWorkaround import java.io.File class Processor( diff --git a/ksp/sealed/generator/test/src/commonMain/kotlin/Test.kt b/ksp/sealed/generator/test/src/commonMain/kotlin/Test.kt index b88dc45e563..01c9e8e90b4 100644 --- a/ksp/sealed/generator/test/src/commonMain/kotlin/Test.kt +++ b/ksp/sealed/generator/test/src/commonMain/kotlin/Test.kt @@ -1,6 +1,6 @@ package dev.inmo.micro_utils.ksp.sealed.generator.test -import dev.inmo.microutils.kps.sealed.GenerateSealedWorkaround +import dev.inmo.micro_utils.ksp.sealed.GenerateSealedWorkaround @GenerateSealedWorkaround sealed interface Test { diff --git a/ksp/sealed/src/commonMain/kotlin/GenerateSealedWorkaround.kt b/ksp/sealed/src/commonMain/kotlin/GenerateSealedWorkaround.kt index c98eed90d8e..2146dff9346 100644 --- a/ksp/sealed/src/commonMain/kotlin/GenerateSealedWorkaround.kt +++ b/ksp/sealed/src/commonMain/kotlin/GenerateSealedWorkaround.kt @@ -1,4 +1,4 @@ -package dev.inmo.microutils.kps.sealed +package dev.inmo.micro_utils.ksp.sealed @Retention(AnnotationRetention.BINARY) @Target(AnnotationTarget.CLASS) diff --git a/ksp/sealed/src/commonMain/kotlin/OldGenerateSealedWorkaround.kt b/ksp/sealed/src/commonMain/kotlin/OldGenerateSealedWorkaround.kt new file mode 100644 index 00000000000..2a317c5a476 --- /dev/null +++ b/ksp/sealed/src/commonMain/kotlin/OldGenerateSealedWorkaround.kt @@ -0,0 +1,6 @@ +package dev.inmo.microutils.kps.sealed + +import dev.inmo.micro_utils.ksp.sealed.GenerateSealedWorkaround + +@Deprecated("Replaced", ReplaceWith("GenerateSealedWorkaround", "dev.inmo.micro_utils.ksp.sealed.GenerateSealedWorkaround")) +typealias GenerateSealedWorkaround = GenerateSealedWorkaround \ No newline at end of file From ee2521cb017e6377ce2a4bedec280ef7e495fac7 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 19 Oct 2024 15:21:00 +0600 Subject: [PATCH 3/3] update dependencies --- CHANGELOG.md | 3 +++ gradle/libs.versions.toml | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 09ecd3d7af9..9581a6a2102 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## 0.22.7 +* `Versions`: + * `Kotlin`: `2.0.20` -> `2.0.21` + * `Compose`: `1.7.0-rc01` -> `1.7.0` * `KSP`: * `Sealed`: * Change package of `GenerateSealedWorkaround`. Migration: replace `dev.inmo.microutils.kps.sealed.GenerateSealedWorkaround` -> `dev.inmo.micro_utils.ksp.sealed.GenerateSealedWorkaround` diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9fafdeb524d..d4e846e8f23 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,12 +1,12 @@ [versions] -kt = "2.0.20" +kt = "2.0.21" kt-serialization = "1.7.3" kt-coroutines = "1.9.0" kslog = "1.3.6" -jb-compose = "1.7.0-rc01" +jb-compose = "1.7.0" jb-exposed = "0.55.0" jb-dokka = "1.9.20" @@ -23,7 +23,7 @@ koin = "4.0.0" okio = "3.9.1" -ksp = "2.0.20-1.0.25" +ksp = "2.0.21-1.0.25" kotlin-poet = "1.18.1" versions = "0.51.0"