diff --git a/README.md b/README.md index 87396220..49a24aa4 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ KOtlin DEpendency INjection **_KODEIN_** provides extensions to be integrable into: - [Android](https://developer.android.com/) -- [Compose (Android / Desktop / Web)](https://kosi-libs.org/kodein/7.21/framework/compose.html) +- [Compose (Android / Desktop / Web)](https://kosi-libs.org/kodein/7.22/framework/compose.html) - [Ktor](https://ktor.io/) An example is always better than a thousand words: @@ -89,7 +89,7 @@ Kotlin & JVM compatibility | 7.17.1 | 1.8.0 | min 1.8 | | 7.17.0 | 1.8.0 | min 1.8 | -> Full table can be found [here](https://kosi-libs.org/kodein/7.21/core/platform-and-genericity.html) +> Full table can be found [here](https://kosi-libs.org/kodein/7.22/core/platform-and-genericity.html) Support ------- diff --git a/build.gradle.kts b/build.gradle.kts index 1da277b2..7f856810 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,5 +5,5 @@ plugins { allprojects { group = "org.kodein.di" - version = "7.21.2" + version = "7.22.0" } diff --git a/doc/antora.yml b/doc/antora.yml index 44bc37d5..dec99b26 100644 --- a/doc/antora.yml +++ b/doc/antora.yml @@ -1,7 +1,7 @@ name: kodein title: Kodein -version: '7.21' -display_version: '7.21.1' +version: '7.22' +display_version: '7.22.0' nav: - modules/ROOT/nav.adoc - modules/core/nav.adoc @@ -10,7 +10,7 @@ nav: - modules/migration/nav.adoc asciidoc: attributes: - branch: '7.21' - version: '7.21.1' - kotlin: '1.9.21' - jdk: '1.8' \ No newline at end of file + branch: '7.22' + version: '7.22.0' + kotlin: '2.0.0' + jdk: '11' \ No newline at end of file diff --git a/doc/modules/ROOT/pages/platform-and-genericity.adoc b/doc/modules/ROOT/pages/platform-and-genericity.adoc index a520d600..06f4853a 100644 --- a/doc/modules/ROOT/pages/platform-and-genericity.adoc +++ b/doc/modules/ROOT/pages/platform-and-genericity.adoc @@ -16,6 +16,10 @@ Here is a table containing the version compatibility: |Kodein |Kotlin +|7.22.0 +|Compose 1.6.10 +|1.9.21 + |7.21.2 |Compose 1.6.0-alpha01 |1.9.21 diff --git a/doc/modules/framework/pages/compose.adoc b/doc/modules/framework/pages/compose.adoc index ab4dbbaf..a40e448e 100644 --- a/doc/modules/framework/pages/compose.adoc +++ b/doc/modules/framework/pages/compose.adoc @@ -16,6 +16,10 @@ Here is a table containing the version compatibility: |Compose compiler |Kotlin +|7.22.0 +|Compose 1.6.10 +|1.9.21 + |7.21.2 |Compose 1.6.0-alpha01 |1.9.21 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 28dfa8f1..0189a49f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] # Core -kaverit = "2.9.0-kotlin-2-SNAPSHOT" +kaverit = "2.9.0" # Android android-appcompat = "28.0.0" androidx-appcompat = "1.6.1" @@ -8,9 +8,9 @@ androidx-fragment = "1.6.2" androidx-lifecycle = "2.7.0" androidx-compose = "2.7.7" # Compose -jbCompose = "1.6.10-beta03" -compose-compiler = "2.0.0-RC2" -compose-bom = "2024.04.01" +jbCompose = "1.6.10" +compose-compiler = "2.0.0" +compose-bom = "2024.05.00" # KSP kotlinpoet = "1.14.2" ksp = "1.9.20-1.0.14" diff --git a/kodein-di/build.gradle.kts b/kodein-di/build.gradle.kts index 62132b00..2c8eddfd 100644 --- a/kodein-di/build.gradle.kts +++ b/kodein-di/build.gradle.kts @@ -19,13 +19,6 @@ kotlin.kodein { } } -//kotlin { -// @OptIn(ExperimentalKotlinGradlePluginApi::class) -// compilerOptions { -// freeCompilerArgs.add("-Xexpect-actual-classes") -// } -//} - kodeinUpload { name = "Kodein" description = "Kodein Core" diff --git a/settings.gradle.kts b/settings.gradle.kts index 3c332d92..c16c295c 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -8,7 +8,7 @@ buildscript { maven(url = "https://raw.githubusercontent.com/kosi-libs/kodein-internal-gradle-plugin/mvn-repo") } dependencies { - classpath("org.kodein.internal.gradle:kodein-internal-gradle-settings:8.7.0-kotlin-2.0.0-RC3-SNAPSHOT") + classpath("org.kodein.internal.gradle:kodein-internal-gradle-settings:8.7.0") } }