diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4d4c3c06..8f2c8771 100644 --- 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,6 +86,7 @@ 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 }} @@ -92,6 +94,7 @@ jobs: 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 }} \ No newline at end of file diff --git a/README.md b/README.md index 575776f2..d596bcc3 100644 --- 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 index d3cdad63..47bde092 100644 --- 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 index 14325fe0..c58cf4d4 100644 --- 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 index 48bc71b5..5cea9762 100644 --- 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") } }