Skip to content

Commit

Permalink
Merge branch '3.6.0' of github.com:InsertKoinIO/koin into 3.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@arnaudgiuliani
arnaudgiuliani committed Jul 17, 2024
2 parents e54fa9a + bf8de08 commit 832880a
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 32 deletions.
44 changes: 24 additions & 20 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
![logo](./docs/img/koin_main_logo.png)

[![Kotlin](https://img.shields.io/badge/Kotlin-1.9.22-blue.svg?style=flat&logo=kotlin)](https://kotlinlang.org)
[![Kotlin](https://img.shields.io/badge/Kotlin-1.9.24-blue.svg?style=flat&logo=kotlin)](https://kotlinlang.org)
![Github Actions](https://github.com/InsertKoinIO/koin/actions/workflows/build.yml/badge.svg)
[![Apache 2 License](https://img.shields.io/github/license/InsertKoinIO/koin)](https://github.com/InsertKoinIO/koin/blob/main/LICENSE.txt)
[![Slack channel](https://img.shields.io/badge/Chat-Slack-orange.svg?style=flat&logo=slack)](https://kotlinlang.slack.com/messages/koin/)
Expand All @@ -15,29 +15,33 @@ Koin is a pragmatic lightweight dependency injection framework for Kotlin develo

## Setup & Current Version

Here are the current available Koin project versions:
- stable: `3.5.5`
- unstable: `3.6.0-Beta2`
Here are the current available Koin project versions: ![](https://img.shields.io/badge/stable-version-blue) ![](https://img.shields.io/badge/unstable-version-orange)

- Koin ![](https://img.shields.io/badge/3.5.6-blue) ![](https://img.shields.io/badge/3.6.0-Beta4-orange)
- Koin for Compose ![](https://img.shields.io/badge/1.1.5-blue) ![](https://img.shields.io/badge/1.2.0-Beta4-orange)
- Koin Annotations ![](https://img.shields.io/badge/1.3.1-blue) ![](https://img.shields.io/badge/1.4.0-Alpha1-orange)

## Koin Packages

| Project | Version |
| Project | Versions |
|----------|:-------------:|
| koin-bom | [![Maven Central](https://img.shields.io/maven-central/v/io.insert-koin/koin-bom)](https://mvnrepository.com/artifact/io.insert-koin/koin-bom) |
| koin-core | [![Maven Central](https://img.shields.io/maven-central/v/io.insert-koin/koin-core)](https://mvnrepository.com/artifact/io.insert-koin/koin-core) |
| koin-core-coroutines | [![Maven Central](https://img.shields.io/maven-central/v/io.insert-koin/koin-core-coroutines)](https://mvnrepository.com/artifact/io.insert-koin/koin-core-coroutines) |
| koin-test | [![Maven Central](https://img.shields.io/maven-central/v/io.insert-koin/koin-test)](https://mvnrepository.com/artifact/io.insert-koin/koin-test) |
| koin-android | [![Maven Central](https://img.shields.io/maven-central/v/io.insert-koin/koin-android)](https://mvnrepository.com/artifact/io.insert-koin/koin-android) |
| koin-android-test | [![Maven Central](https://img.shields.io/maven-central/v/io.insert-koin/koin-android-test)](https://mvnrepository.com/artifact/io.insert-koin/koin-android-test) |
| koin-android-compat | [![Maven Central](https://img.shields.io/maven-central/v/io.insert-koin/koin-android-compat)](https://mvnrepository.com/artifact/io.insert-koin/koin-android-compat) |
| koin-androidx-navigation | [![Maven Central](https://img.shields.io/maven-central/v/io.insert-koin/koin-androidx-navigation)](https://mvnrepository.com/artifact/io.insert-koin/koin-androidx-navigation) |
| koin-androidx-workmanager | [![Maven Central](https://img.shields.io/maven-central/v/io.insert-koin/koin-androidx-workmanager)](https://mvnrepository.com/artifact/io.insert-koin/koin-androidx-workmanager) |
| koin-androidx-compose | [![Maven Central](https://img.shields.io/maven-central/v/io.insert-koin/koin-androidx-compose)](https://mvnrepository.com/artifact/io.insert-koin/koin-androidx-compose) |
| koin-androidx-compose-navigation | [![Maven Central](https://img.shields.io/maven-central/v/io.insert-koin/koin-androidx-compose-navigation)](https://mvnrepository.com/artifact/io.insert-koin/koin-androidx-compose-navigation) |
| koin-compose | [![Maven Central](https://img.shields.io/maven-central/v/io.insert-koin/koin-compose)](https://mvnrepository.com/artifact/io.insert-koin/koin-compose) |
| koin-ktor | [![Maven Central](https://img.shields.io/maven-central/v/io.insert-koin/koin-ktor)](https://mvnrepository.com/artifact/io.insert-koin/koin-ktor) |
| koin-logger-slf4j | [![Maven Central](https://img.shields.io/maven-central/v/io.insert-koin/koin-logger-slf4j)](https://mvnrepository.com/artifact/io.insert-koin/koin-logger-slf4j) |
| koin-annotations | [![Maven Central](https://img.shields.io/maven-central/v/io.insert-koin/koin-annotations)](https://mvnrepository.com/artifact/io.insert-koin/koin-annotations) |
| [koin-bom](https://mvnrepository.com/artifact/io.insert-koin/koin-bom) | ![](https://img.shields.io/badge/3.5.6-blue) - ![](https://img.shields.io/badge/3.6.0-Beta4-orange) |
| [koin-core](https://mvnrepository.com/artifact/io.insert-koin/koin-core) | ![](https://img.shields.io/badge/3.5.6-blue) - ![](https://img.shields.io/badge/3.6.0-Beta4-orange) |
| [koin-core-coroutines](https://mvnrepository.com/artifact/io.insert-koin/koin-core-coroutines) | ![](https://img.shields.io/badge/3.5.6-blue) - ![](https://img.shields.io/badge/3.6.0-Beta4-orange) |
| [koin-test](https://mvnrepository.com/artifact/io.insert-koin/koin-test) | ![](https://img.shields.io/badge/3.5.6-blue) - ![](https://img.shields.io/badge/3.6.0-Beta4-orange) |
| [koin-android](https://mvnrepository.com/artifact/io.insert-koin/koin-android) | ![](https://img.shields.io/badge/3.5.6-blue) - ![](https://img.shields.io/badge/3.6.0-Beta4-orange) |
| [koin-android-test](https://mvnrepository.com/artifact/io.insert-koin/koin-android-test) | ![](https://img.shields.io/badge/3.5.6-blue) - ![](https://img.shields.io/badge/3.6.0-Beta4-orange) |
| [koin-android-compat](https://mvnrepository.com/artifact/io.insert-koin/koin-android-compat) | ![](https://img.shields.io/badge/3.5.6-blue) - ![](https://img.shields.io/badge/3.6.0-Beta4-orange) |
| [koin-android-navigation](https://mvnrepository.com/artifact/io.insert-koin/koin-android-navigation) | ![](https://img.shields.io/badge/3.5.6-blue) - ![](https://img.shields.io/badge/3.6.0-Beta4-orange) |
| [koin-android-workmanager](https://mvnrepository.com/artifact/io.insert-koin/koin-android-workmanager) | ![](https://img.shields.io/badge/3.5.6-blue) - ![](https://img.shields.io/badge/3.6.0-Beta4-orange) |
| [koin-android-compose](https://mvnrepository.com/artifact/io.insert-koin/koin-android-compose) | ![](https://img.shields.io/badge/3.5.6-blue) - ![](https://img.shields.io/badge/3.6.0-Beta4-orange) |
| [koin-android-compose-navigation](https://mvnrepository.com/artifact/io.insert-koin/koin-android-compose-navigation) | ![](https://img.shields.io/badge/3.5.6-blue) - ![](https://img.shields.io/badge/3.6.0-Beta4-orange) |
| [koin-ktor](https://mvnrepository.com/artifact/io.insert-koin/koin-ktor) | ![](https://img.shields.io/badge/3.5.6-blue) - ![](https://img.shields.io/badge/3.6.0-Beta4-orange) |
| [koin-compose](https://mvnrepository.com/artifact/io.insert-koin/koin-android-compose-navigation) | ![](https://img.shields.io/badge/1.1.5-blue) - ![](https://img.shields.io/badge/1.2.0-Beta4-orange) |
| [koin-compose-viewmodel](https://mvnrepository.com/artifact/io.insert-koin/koin-android-compose-navigation) | ![](https://img.shields.io/badge/1.2.0-Beta4-orange) |
| [koin-ktor](https://mvnrepository.com/artifact/io.insert-koin/koin-ktor) | ![](https://img.shields.io/badge/3.5.6-blue) - ![](https://img.shields.io/badge/3.6.0-Beta4-orange) |
| [koin-logger-slf4](https://mvnrepository.com/artifact/io.insert-koin/koin-logger-slf4) | ![](https://img.shields.io/badge/3.5.6-blue) - ![](https://img.shields.io/badge/3.6.0-Beta4-orange) |
| [koin-annotations](https://mvnrepository.com/artifact/io.insert-koin/koin-annotations) | ![](https://img.shields.io/badge/1.3.1-blue) - ![](https://img.shields.io/badge/1.4.0-alpha1-orange) |

🔎 Check the [latest changes](https://github.com/InsertKoinIO/koin/blob/main/CHANGELOG.md) to update your Koin project.

Expand Down
2 changes: 1 addition & 1 deletion docs/setup/koin.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ dependencies {
```

:::info
From now you can continue on Koin Tutorials to learn about using Koin: [Kotlin Multiplatform App Tutorial](/docs/quickstart/kmm)
From now you can continue on Koin Tutorials to learn about using Koin: [Kotlin Multiplatform App Tutorial](/docs/quickstart/kmp)
:::

### **Ktor**
Expand Down
18 changes: 9 additions & 9 deletions projects/android/koin-android/src/main/java/org/koin/android/ext/koin/KoinExt.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,15 @@ fun KoinApplication.androidContext(androidContext: Context): KoinApplication {
koin.logger.info("[init] declare Android Context")
}

if (androidContext is Application) {
koin.loadModules(listOf(module {
single { androidContext } bind Context::class
}))
} else {
koin.loadModules(listOf(module {
single { androidContext }
}))
}
koin.loadModules(listOf(
module {
if (androidContext is Application) {
single { androidContext } bind Context::class
} else {
single { androidContext }
}
}
))

return this
}
Expand Down
4 changes: 2 additions & 2 deletions projects/core/koin-core/src/commonMain/kotlin/org/koin/core/qualifier/Qualifier.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,6 @@ inline fun <reified T> qualifier() = TypeQualifier(T::class)
inline fun <reified T> _q() = TypeQualifier(T::class)

val <E : Enum<E>> Enum<E>.qualifier
get(): Qualifier {
return StringQualifier(this.toString().toLowerCase())
get() : Qualifier {
return StringQualifier(toString().lowercase())
}

0 comments on commit 832880a

Please sign in to comment.