From f84268513026c230bba9069740752a8581a633df Mon Sep 17 00:00:00 2001 From: Romain Boisselle Date: Tue, 4 Apr 2023 09:17:15 +0200 Subject: [PATCH] rename Android Compose modules... --- build.gradle.kts | 2 +- doc/antora.yml | 4 ++-- .../build.gradle.kts | 4 ++-- .../gradle.properties | 0 .../src/androidMain/AndroidManifest.xml | 0 .../di/compose/android/navigation/navGraphViewModel.kt | 0 .../build.gradle.kts | 2 +- .../gradle.properties | 0 .../src/androidMain/AndroidManifest.xml | 0 .../di/compose/android/KodeinViewModelScopedFactory.kt | 0 .../kotlin/org/kodein/di/compose/android/viewModel.kt | 0 settings.gradle.kts | 6 +++--- 12 files changed, 9 insertions(+), 9 deletions(-) rename framework/compose/{kodein-di-framework-compose-android-navigation => kodein-di-framework-android-x-compose-navigation}/build.gradle.kts (84%) rename framework/compose/{kodein-di-framework-compose-android-navigation => kodein-di-framework-android-x-compose-navigation}/gradle.properties (100%) rename framework/compose/{kodein-di-framework-compose-android-navigation => kodein-di-framework-android-x-compose-navigation}/src/androidMain/AndroidManifest.xml (100%) rename framework/compose/{kodein-di-framework-compose-android-navigation => kodein-di-framework-android-x-compose-navigation}/src/androidMain/kotlin/org/kodein/di/compose/android/navigation/navGraphViewModel.kt (100%) rename framework/compose/{kodein-di-framework-compose-android => kodein-di-framework-android-x-compose}/build.gradle.kts (87%) rename framework/compose/{kodein-di-framework-compose-android => kodein-di-framework-android-x-compose}/gradle.properties (100%) rename framework/compose/{kodein-di-framework-compose-android => kodein-di-framework-android-x-compose}/src/androidMain/AndroidManifest.xml (100%) rename framework/compose/{kodein-di-framework-compose-android => kodein-di-framework-android-x-compose}/src/androidMain/kotlin/org/kodein/di/compose/android/KodeinViewModelScopedFactory.kt (100%) rename framework/compose/{kodein-di-framework-compose-android => kodein-di-framework-android-x-compose}/src/androidMain/kotlin/org/kodein/di/compose/android/viewModel.kt (100%) diff --git a/build.gradle.kts b/build.gradle.kts index 5f95876e..a8e0f143 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,5 +5,5 @@ plugins { allprojects { group = "org.kodein.di" - version = "7.20.0" + version = "7.20.1" } diff --git a/doc/antora.yml b/doc/antora.yml index 4d6be090..136af211 100644 --- a/doc/antora.yml +++ b/doc/antora.yml @@ -1,7 +1,7 @@ name: kodein title: Kodein version: '7.20' -display_version: '7.20.0' +display_version: '7.20.2' nav: - modules/ROOT/nav.adoc - modules/core/nav.adoc @@ -11,6 +11,6 @@ nav: asciidoc: attributes: branch: '7.20' - version: '7.20.0' + version: '7.20.1' kotlin: '1.8.10' jdk: '1.8' \ No newline at end of file diff --git a/framework/compose/kodein-di-framework-compose-android-navigation/build.gradle.kts b/framework/compose/kodein-di-framework-android-x-compose-navigation/build.gradle.kts similarity index 84% rename from framework/compose/kodein-di-framework-compose-android-navigation/build.gradle.kts rename to framework/compose/kodein-di-framework-android-x-compose-navigation/build.gradle.kts index 10c0cbeb..717e6ba4 100644 --- a/framework/compose/kodein-di-framework-compose-android-navigation/build.gradle.kts +++ b/framework/compose/kodein-di-framework-android-x-compose-navigation/build.gradle.kts @@ -12,7 +12,7 @@ kodein { add(kodeinTargets.jvm.android) { main.dependencies { - api(projects.framework.compose.kodeinDiFrameworkComposeAndroid) + api(projects.framework.compose.kodeinDiFrameworkAndroidXCompose) implementation(libs.android.x.lifecycle.viewmodel.compose) implementation(libs.android.compose.navigation) } @@ -22,5 +22,5 @@ kodein { kodeinUpload { name = "Kodein-Framework-Compose-Android-Navigation" - description = "Kodein extensions for Jetpack Compose Navigation scoped ViewModels" + description = "Kodein extensions for AndroidX navigation scoped ViewModels using Jetpack Compose" } \ No newline at end of file diff --git a/framework/compose/kodein-di-framework-compose-android-navigation/gradle.properties b/framework/compose/kodein-di-framework-android-x-compose-navigation/gradle.properties similarity index 100% rename from framework/compose/kodein-di-framework-compose-android-navigation/gradle.properties rename to framework/compose/kodein-di-framework-android-x-compose-navigation/gradle.properties diff --git a/framework/compose/kodein-di-framework-compose-android-navigation/src/androidMain/AndroidManifest.xml b/framework/compose/kodein-di-framework-android-x-compose-navigation/src/androidMain/AndroidManifest.xml similarity index 100% rename from framework/compose/kodein-di-framework-compose-android-navigation/src/androidMain/AndroidManifest.xml rename to framework/compose/kodein-di-framework-android-x-compose-navigation/src/androidMain/AndroidManifest.xml diff --git a/framework/compose/kodein-di-framework-compose-android-navigation/src/androidMain/kotlin/org/kodein/di/compose/android/navigation/navGraphViewModel.kt b/framework/compose/kodein-di-framework-android-x-compose-navigation/src/androidMain/kotlin/org/kodein/di/compose/android/navigation/navGraphViewModel.kt similarity index 100% rename from framework/compose/kodein-di-framework-compose-android-navigation/src/androidMain/kotlin/org/kodein/di/compose/android/navigation/navGraphViewModel.kt rename to framework/compose/kodein-di-framework-android-x-compose-navigation/src/androidMain/kotlin/org/kodein/di/compose/android/navigation/navGraphViewModel.kt diff --git a/framework/compose/kodein-di-framework-compose-android/build.gradle.kts b/framework/compose/kodein-di-framework-android-x-compose/build.gradle.kts similarity index 87% rename from framework/compose/kodein-di-framework-compose-android/build.gradle.kts rename to framework/compose/kodein-di-framework-android-x-compose/build.gradle.kts index 24a0e893..ebd82912 100644 --- a/framework/compose/kodein-di-framework-compose-android/build.gradle.kts +++ b/framework/compose/kodein-di-framework-android-x-compose/build.gradle.kts @@ -21,5 +21,5 @@ kodein { kodeinUpload { name = "Kodein-Framework-Compose-Android" - description = "Kodein extensions for Jetpack Compose ViewModels" + description = "Kodein extensions for AndroidX ViewModels using Jetpack Compose" } \ No newline at end of file diff --git a/framework/compose/kodein-di-framework-compose-android/gradle.properties b/framework/compose/kodein-di-framework-android-x-compose/gradle.properties similarity index 100% rename from framework/compose/kodein-di-framework-compose-android/gradle.properties rename to framework/compose/kodein-di-framework-android-x-compose/gradle.properties diff --git a/framework/compose/kodein-di-framework-compose-android/src/androidMain/AndroidManifest.xml b/framework/compose/kodein-di-framework-android-x-compose/src/androidMain/AndroidManifest.xml similarity index 100% rename from framework/compose/kodein-di-framework-compose-android/src/androidMain/AndroidManifest.xml rename to framework/compose/kodein-di-framework-android-x-compose/src/androidMain/AndroidManifest.xml diff --git a/framework/compose/kodein-di-framework-compose-android/src/androidMain/kotlin/org/kodein/di/compose/android/KodeinViewModelScopedFactory.kt b/framework/compose/kodein-di-framework-android-x-compose/src/androidMain/kotlin/org/kodein/di/compose/android/KodeinViewModelScopedFactory.kt similarity index 100% rename from framework/compose/kodein-di-framework-compose-android/src/androidMain/kotlin/org/kodein/di/compose/android/KodeinViewModelScopedFactory.kt rename to framework/compose/kodein-di-framework-android-x-compose/src/androidMain/kotlin/org/kodein/di/compose/android/KodeinViewModelScopedFactory.kt diff --git a/framework/compose/kodein-di-framework-compose-android/src/androidMain/kotlin/org/kodein/di/compose/android/viewModel.kt b/framework/compose/kodein-di-framework-android-x-compose/src/androidMain/kotlin/org/kodein/di/compose/android/viewModel.kt similarity index 100% rename from framework/compose/kodein-di-framework-compose-android/src/androidMain/kotlin/org/kodein/di/compose/android/viewModel.kt rename to framework/compose/kodein-di-framework-android-x-compose/src/androidMain/kotlin/org/kodein/di/compose/android/viewModel.kt diff --git a/settings.gradle.kts b/settings.gradle.kts index 7164de0e..1dd6eb8b 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -47,7 +47,7 @@ framework("tfx").include( ) framework("compose").include( - ":framework:compose:kodein-di-framework-compose", - ":framework:compose:kodein-di-framework-compose-android", - ":framework:compose:kodein-di-framework-compose-android-navigation", + ":framework:compose:kodein-di-framework-compose", + ":framework:compose:kodein-di-framework-android-x-compose", + ":framework:compose:kodein-di-framework-android-x-compose-navigation", )