Merge branch '7.13'

# Conflicts: # README.md
kosi-libs · Jul 7, 2022 · a5f72f3 · a5f72f3
2 parents 227f10b + 149102b
commit a5f72f3
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -63,6 +63,7 @@ Kotlin & JVM compatibility
 
 |   Kodein    | Kotlin |   JDK   |  Compose   |
 |:-----------:|:------:|:-------:|:----------:|
+|   7.13.1    | 1.7.0  | min 1.8 | Compatible |
 |   7.13.0    | 1.7.0  | min 1.8 |     No     |
 |   7.12.0    | 1.6.21 | min 1.8 | Compatible |
 |   7.10.0    | 1.6.10 | min 1.8 | Compatible |

diff --git a/doc/modules/framework/pages/compose.adoc b/doc/modules/framework/pages/compose.adoc
@@ -13,6 +13,10 @@ Here is a table containing the version compatibility:
 |===
 |Kodein-DI |Compose compiler |Kotlin
 
+|7.13.1
+1.2.0-alpha01-dev741
+|1.7.0
+
 |7.10.0
 |1.0.1-rc2
 |1.6.10

diff --git a/framework/compose/kodein-di-framework-compose/build.gradle.kts b/framework/compose/kodein-di-framework-compose/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("org.jetbrains.compose") version "1.2.0-alpha01-dev683"
+    id("org.jetbrains.compose") version "1.2.0-alpha01-dev741"
     id("org.kodein.library.mpp-with-android")
 }
 

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -6,7 +6,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:6.18.3")
+        classpath("org.kodein.internal.gradle:kodein-internal-gradle-settings:6.18.2")
     }
 }
 
@@ -39,6 +39,6 @@ framework("tfx").include(
         ":framework:tornadofx:kodein-di-framework-tornadofx-jvm"
 )
 
-//framework("compose").include(
-//        ":framework:compose:kodein-di-framework-compose"
-//)
+framework("compose").include(
+        ":framework:compose:kodein-di-framework-compose"
+)