kotlin 1.6.10 + Compose 1.0.1-rc2

kosi-libs · Dec 19, 2021 · a8cc77d · a8cc77d
1 parent 596b89a
commit a8cc77d
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 21 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -14,6 +14,7 @@ jobs:
       - id: create
         uses: nexus-actions/create-nexus-staging-repo@v1.1
         with:
+          base_url: https://s01.oss.sonatype.org/service/local/
           username: ${{ secrets.SONATYPE_USERNAME }}
           password: ${{ secrets.SONATYPE_PASSWORD }}
           staging_profile_id: ${{ secrets.SONATYPE_PROFILE_ID }}
@@ -85,13 +86,15 @@ jobs:
         if: ${{ needs.build-upload.result != 'success' }}
         uses: nexus-actions/drop-nexus-staging-repo@v1
         with:
+          base_url: https://s01.oss.sonatype.org/service/local/
           username: ${{ secrets.SONATYPE_USERNAME }}
           password: ${{ secrets.SONATYPE_PASSWORD }}
           staging_repository_id: ${{ needs.create-staging-repository.outputs.repository_id }}
       - name: Release
         if: ${{ needs.build-upload.result == 'success' }}
         uses: nexus-actions/release-nexus-staging-repo@v1
         with:
+          base_url: https://s01.oss.sonatype.org/service/local/
           username: ${{ secrets.SONATYPE_USERNAME }}
           password: ${{ secrets.SONATYPE_PASSWORD }}
           staging_repository_id: ${{ needs.create-staging-repository.outputs.repository_id }}
diff --git a/README.md b/README.md
@@ -61,23 +61,25 @@ class Controller(private di: DI) {
 Kotlin & JVM compatibility
 ---------
 
-|Kodein-DI|Kotlin|JDK
-|:---:|:---:|:---:|
-|7.6+|1.5+|min 1.8
-|7.1+|1.4+|min 1.8
-|7.0+|1.3.72|min 1.8
-|6.5.5|1.3.72|min 1.8
-|6.5.4|1.3.71|min 1.8
-|6.5.3|1.3.70|min 1.8
-|6.5.0|1.3.61|min 1.8
-|6.4.1|1.3.50|min 1.8
-|6.3+|1.3.40|min 1.8
-|6.2+|1.3.30|1.6
-|6.1+|1.3.20|1.6
-|6.0+|1.3.0|1.6
-|5.0+|1.2.30|1.6
-|4.1+|1.1.3|1.6
-|4.0.0-beta2|1.1.0|1.6
+|  Kodein-DI  | Kotlin  |JDK|Compose
+|:-----------:|:-------:|:---:|:---:|
+|   7.10.0   | 1.6.10 |min 1.8| NO
+|    7.7+     |  1.5+   |min 1.8| Compatible
+|    7.6+     |  1.5+   |min 1.8| -
+|    7.1+     |  1.4+   |min 1.8| -
+|    7.0+     | 1.3.72  |min 1.8| -
+|    6.5.5    | 1.3.72  |min 1.8| -
+|    6.5.4    | 1.3.71  |min 1.8| -
+|    6.5.3    | 1.3.70  |min 1.8| -
+|    6.5.0    | 1.3.61  |min 1.8| -
+|    6.4.1    | 1.3.50  |min 1.8| -
+|    6.3+     | 1.3.40  |min 1.8| -
+|    6.2+     | 1.3.30  |1.6| -
+|    6.1+     | 1.3.20  |1.6| -
+|    6.0+     |  1.3.0  |1.6| -
+|    5.0+     | 1.2.30  |1.6| -
+|    4.1+     |  1.1.3  |1.6| -
+| 4.0.0-beta2 |  1.1.0  |1.6| -
 
 Demo Projects
 ---------

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.0.0-beta1"
+    id("org.jetbrains.compose") version "1.0.1-rc2"
     id("org.kodein.library.mpp-with-android")
 }
 
@@ -17,7 +17,7 @@ kodein {
         add(kodeinTargets.jvm.android) {
             main.dependencies {
                 api(project(":framework:android:kodein-di-framework-android-x"))
-                api("androidx.lifecycle:lifecycle-viewmodel-compose:2.4.0-rc01")
+                api("androidx.lifecycle:lifecycle-viewmodel-compose:2.4.0")
             }
         }
 

diff --git a/kodein-di/build.gradle.kts b/kodein-di/build.gradle.kts
@@ -7,7 +7,7 @@ kodein {
 
         common {
             main.dependencies {
-                api("org.kodein.type:kodein-type:1.11.0")
+                api("org.kodein.type:kodein-type:1.12.0")
             }
             test.dependencies {
                 implementation(project(":test-utils"))

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -6,7 +6,7 @@ buildscript {
         maven(url = "https://raw.githubusercontent.com/Kodein-Framework/kodein-internal-gradle-plugin/mvn-repo")
     }
     dependencies {
-        classpath("org.kodein.internal.gradle:kodein-internal-gradle-settings:6.12.0")
+        classpath("org.kodein.internal.gradle:kodein-internal-gradle-settings:6.15.1")
     }
 }