Skip to content

Commit

Permalink
Kotlin 1.7.20
Browse files Browse the repository at this point in the history
  • Loading branch information
romainbsl committed Sep 29, 2022
1 parent 62dc622 commit dc6ca8f
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 6 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ Kotlin & JVM compatibility

| Kodein | Kotlin | JDK | Compose |
|:-----------:|:------:|:-------:|:----------:|
| 7.15.0 | 1.7.20 | min 1.8 | No |
| 7.14.0 | 1.7.10 | min 1.8 | Compatible |
| 7.13.1 | 1.7.0 | min 1.8 | Compatible |
| 7.13.0 | 1.7.0 | min 1.8 | No |
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ plugins {

allprojects {
group = "org.kodein.di"
version = "7.15.0-kotlin-1.7.20-RC"
version = "7.15.0"
}
8 changes: 4 additions & 4 deletions doc/antora.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: kodein-di
title: Kodein-DI
version: '7.15.0-kotlin-1.7.20-RC'
display_version: '7.15.0-kotlin-1.7.20-RC'
version: '7.15'
display_version: '7.15.0'
nav:
- modules/ROOT/nav.adoc
- modules/core/nav.adoc
Expand All @@ -10,6 +10,6 @@ nav:
- modules/migration/nav.adoc
asciidoc:
attributes:
version: '7.15.0-kotlin-1.7.20-RC'
kotlin: '1.7.20-RC'
version: '7.15.0'
kotlin: '1.7.20'
jdk: '1.8'
4 changes: 4 additions & 0 deletions doc/modules/framework/pages/compose.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ Here is a table containing the version compatibility:
|===
|Kodein-DI |Compose compiler |Kotlin

|7.15.0
|NOT COMPATIBLE
|1.7.20

|7.15.0-kotlin-1.7.20-RC
|NOT COMPATIBLE
|1.7.20
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ kodein {
}

add(kodeinTargets.js.ir.js)

// iosX32 not supported by jetbrains compose
add(kodeinTargets.native.iosX64)
add(kodeinTargets.native.iosArm64)
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package org.kodein.di.compose

import org.kodein.di.DI


internal actual fun diFromAppContext(): DI = error("Missing DI container!")
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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.20.2-kotlin-1.7.20-RC")
classpath("org.kodein.internal.gradle:kodein-internal-gradle-settings:6.21.0")
}
}

Expand Down

0 comments on commit dc6ca8f

Please sign in to comment.