Merge branch '3.5.6/fix_gradle_deps' into 3.6.0

# Conflicts: # projects/gradle.properties
InsertKoinIO · Apr 11, 2024 · f960d85 · f960d85
2 parents 1d86518 + e075354
commit f960d85
Show file tree

Hide file tree

Showing 14 changed files with 44 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 ![logo](./docs/img/koin_main_logo.png)
 
-[![Kotlin](https://img.shields.io/badge/Kotlin-1.8.21-blue.svg?style=flat&logo=kotlin)](https://kotlinlang.org)
+[![Kotlin](https://img.shields.io/badge/Kotlin-1.9.22-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/)
@@ -15,7 +15,11 @@ Koin is a pragmatic lightweight dependency injection framework for Kotlin develo
 
 ## Setup & Current Version
 
-Here are the current available Koin projects versions:
+Here are the current available Koin project versions:
+- stable: `3.5.5`
+- unstable: `3.6.0-Beta2`
+
+## Koin Packages
 
 | Project   |      Version      |
 |----------|:-------------:|

diff --git a/projects/android/koin-android-compat/build.gradle.kts b/projects/android/koin-android-compat/build.gradle.kts
@@ -23,7 +23,13 @@ android {
 }
 
 dependencies {
-    implementation(project(":android:koin-android"))
+    api(project(":android:koin-android"))
+}
+
+// android sources
+val sourcesJar: TaskProvider<Jar> by tasks.registering(Jar::class) {
+    archiveClassifier.set("sources")
+    from(android.sourceSets.map { it.java.srcDirs })
 }
 
 // android sources

diff --git a/projects/android/koin-android-test/build.gradle.kts b/projects/android/koin-android-test/build.gradle.kts
@@ -23,10 +23,9 @@ android {
 }
 
 dependencies {
-    implementation(kotlin("reflect"))
-    implementation(project(":android:koin-android"))
-    implementation(project(":android:koin-androidx-workmanager"))
-    implementation(project(":core:koin-test"))
+    api(project(":android:koin-android"))
+    api(project(":android:koin-androidx-workmanager"))
+    api(project(":core:koin-test"))
     // Test
     testImplementation(libs.test.junit)
     testImplementation(libs.test.mockito)

diff --git a/projects/android/koin-androidx-navigation/build.gradle.kts b/projects/android/koin-androidx-navigation/build.gradle.kts
@@ -20,7 +20,7 @@ android {
 }
 
 dependencies {
-    implementation(project(":android:koin-android"))
+    api(project(":android:koin-android"))
     api(libs.androidx.navigation)
 }
 

diff --git a/projects/android/koin-androidx-workmanager/build.gradle.kts b/projects/android/koin-androidx-workmanager/build.gradle.kts
@@ -20,7 +20,7 @@ android {
 }
 
 dependencies {
-    implementation(project(":android:koin-android"))
+    api(project(":android:koin-android"))
     api(libs.androidx.workmanager)
 
     // Test

diff --git a/projects/compose/koin-androidx-compose-navigation/build.gradle.kts b/projects/compose/koin-androidx-compose-navigation/build.gradle.kts
@@ -24,8 +24,14 @@ android {
 }
 
 dependencies {
-    implementation(project(":compose:koin-androidx-compose"))
-    implementation(libs.androidx.composeNavigation)
+    api(project(":compose:koin-androidx-compose"))
+    api(libs.androidx.composeNavigation)
+}
+
+// android sources
+val sourcesJar: TaskProvider<Jar> by tasks.registering(Jar::class) {
+    archiveClassifier.set("sources")
+    from(android.sourceSets.map { it.java.srcDirs })
 }
 
 // android sources

diff --git a/projects/compose/koin-androidx-compose/build.gradle.kts b/projects/compose/koin-androidx-compose/build.gradle.kts
@@ -26,8 +26,14 @@ android {
 dependencies {
     api(project(":android:koin-android"))
     api(project(":compose:koin-compose"))
-    implementation(libs.androidx.composeRuntime)
-    implementation(libs.androidx.composeViewModel)
+    api(libs.androidx.composeRuntime)
+    api(libs.androidx.composeViewModel)
+}
+
+// android sources
+val sourcesJar: TaskProvider<Jar> by tasks.registering(Jar::class) {
+    archiveClassifier.set("sources")
+    from(android.sourceSets.map { it.java.srcDirs })
 }
 
 // android sources

diff --git a/projects/compose/koin-compose/build.gradle.kts b/projects/compose/koin-compose/build.gradle.kts
@@ -34,7 +34,7 @@ kotlin {
     sourceSets {
         commonMain.dependencies {
             api(project(":core:koin-core"))
-            implementation(libs.compose.jb)
+            api(libs.compose.jb)
         }
     }
 }

diff --git a/projects/core/koin-core-coroutines/build.gradle.kts b/projects/core/koin-core-coroutines/build.gradle.kts
@@ -35,7 +35,7 @@ kotlin {
     sourceSets {
         commonMain.dependencies {
             api(project(":core:koin-core"))
-            implementation(libs.kotlin.coroutines)
+            api(libs.kotlin.coroutines)
         }
         commonTest.dependencies {
             implementation(libs.kotlin.test)

diff --git a/projects/core/koin-core/build.gradle.kts b/projects/core/koin-core/build.gradle.kts
@@ -40,8 +40,8 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            implementation(libs.extras.stately)
-            implementation(libs.extras.stately.collections)
+            api(libs.extras.stately)
+            api(libs.extras.stately.collections)
         }
         commonTest.dependencies {
             implementation(libs.kotlin.test)

diff --git a/projects/core/koin-test-junit4/build.gradle.kts b/projects/core/koin-test-junit4/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 
 dependencies {
     api(project(":core:koin-test"))
-    implementation(libs.test.junit)
+    api(libs.test.junit)
     testImplementation(libs.kotlin.test)
     testImplementation(libs.test.mockito)
 }

diff --git a/projects/core/koin-test-junit5/build.gradle.kts b/projects/core/koin-test-junit5/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 
 dependencies {
     api(project(":core:koin-test"))
-    implementation(libs.test.jupiter)
+    api(libs.test.jupiter)
     testImplementation(libs.test.mockito)
 }
 

diff --git a/projects/core/koin-test/build.gradle.kts b/projects/core/koin-test/build.gradle.kts
@@ -40,9 +40,11 @@ kotlin {
     sourceSets {
         commonMain.dependencies {
             api(project(":core:koin-core"))
+            //TODO remove in 3.6
+            api(libs.kotlin.test)
         }
         jvmMain.dependencies {
-            implementation(kotlin("reflect"))
+            api(kotlin("reflect"))
         }
         commonTest.dependencies {
             implementation(libs.kotlin.test)

diff --git a/projects/ktor/koin-logger-slf4j/build.gradle.kts b/projects/ktor/koin-logger-slf4j/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 
 dependencies {
     api(project(":core:koin-core"))
-    implementation(libs.ktor.slf4j)
+    api(libs.ktor.slf4j)
 }
 
 tasks.withType<KotlinCompile>().all {