Merge branch '4.0.2' into 4.1.0

# Conflicts: # examples/gradle/versions.gradle # projects/gradle.properties
InsertKoinIO · Jan 16, 2025 · 5f1f158 · 5f1f158
2 parents 8dca6a9 + 6329a4c
commit 5f1f158
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/docs/reference/koin-android/start.md b/docs/reference/koin-android/start.md
@@ -79,7 +79,7 @@ By using Gradle packge `koin-androidx-startup`, we can use `KoinStartup` interfa
 ```kotlin
 class MainApplication : Application(),KoinStartup {
 
-     override fun onKoinStartup(): KoinAppDeclaration = {
+     override fun onKoinStartup()= koinConfiguration {
         androidContext(this@MainApplication)
         modules(appModule)
     }
@@ -90,7 +90,7 @@ class MainApplication : Application(),KoinStartup {
 }
 ```
 
-This replaces the `startKoin` function that is usally used in `onCreate`. 
+This replaces the `startKoin` function that is usally used in `onCreate`. The `koinConfiguration` function is returning a `KoinConfiguration` instance.
 
 :::info
 `KoinStartup` avoid blocking main thread at for startup time, and offers better performances.

diff --git a/projects/gradle.properties b/projects/gradle.properties
@@ -1,10 +1,13 @@
 #Gradle
-org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx2048M"
+org.gradle.daemon=true
+org.gradle.jvmargs=-Xmx4096M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx2048M"
 org.gradle.caching=true
 org.gradle.configuration-cache=true
 org.gradle.parallel=true
 
 #Kotlin
+kotlin.incremental=true
+kotlin.incremental.multiplatform=true
 kotlin.code.style=official
 
 #Koin
@@ -18,5 +21,5 @@ org.jetbrains.compose.experimental.macos.enabled=true
 android.useAndroidX=true
 androidMinSDK=14
 androidCompileSDK=34
-#android.nonTransitiveRClass=true
+android.nonTransitiveRClass=true