Merge pull request #1850 from InsertKoinIO/3.5.5/fix_sources_export

3.5.5/fix sources export
InsertKoinIO · Apr 11, 2024 · 62e8aa4 · 62e8aa4
2 parents 22b4ccf + 2af10be
commit 62e8aa4
Show file tree

Hide file tree

Showing 11 changed files with 48 additions and 23 deletions.
diff --git a/projects/android/koin-android-compat/build.gradle.kts b/projects/android/koin-android-compat/build.gradle.kts
@@ -26,4 +26,10 @@ dependencies {
     implementation(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 })
+}
+
 apply(from = file("../../gradle/publish-android.gradle.kts"))
diff --git a/projects/android/koin-android-test/build.gradle.kts b/projects/android/koin-android-test/build.gradle.kts
@@ -32,4 +32,10 @@ dependencies {
     testImplementation(libs.test.mockito)
 }
 
+// android sources
+val sourcesJar: TaskProvider<Jar> by tasks.registering(Jar::class) {
+    archiveClassifier.set("sources")
+    from(android.sourceSets.map { it.java.srcDirs })
+}
+
 apply(from = file("../../gradle/publish-android.gradle.kts"))
diff --git a/projects/android/koin-android/build.gradle.kts b/projects/android/koin-android/build.gradle.kts
@@ -39,4 +39,10 @@ dependencies {
     testImplementation(libs.test.mockk)
 }
 
+// android sources
+val sourcesJar: TaskProvider<Jar> by tasks.registering(Jar::class) {
+    archiveClassifier.set("sources")
+    from(android.sourceSets.map { it.java.srcDirs })
+}
+
 apply(from = file("../../gradle/publish-android.gradle.kts"))
diff --git a/projects/android/koin-androidx-navigation/build.gradle.kts b/projects/android/koin-androidx-navigation/build.gradle.kts
@@ -24,4 +24,10 @@ dependencies {
     api(libs.androidx.navigation)
 }
 
+// android sources
+val sourcesJar: TaskProvider<Jar> by tasks.registering(Jar::class) {
+    archiveClassifier.set("sources")
+    from(android.sourceSets.map { it.java.srcDirs })
+}
+
 apply(from = file("../../gradle/publish-android.gradle.kts"))
diff --git a/projects/android/koin-androidx-workmanager/build.gradle.kts b/projects/android/koin-androidx-workmanager/build.gradle.kts
@@ -28,4 +28,10 @@ dependencies {
     testImplementation(libs.test.mockito)
 }
 
+// android sources
+val sourcesJar: TaskProvider<Jar> by tasks.registering(Jar::class) {
+    archiveClassifier.set("sources")
+    from(android.sourceSets.map { it.java.srcDirs })
+}
+
 apply(from = file("../../gradle/publish-android.gradle.kts"))
diff --git a/projects/compose/koin-androidx-compose-navigation/build.gradle.kts b/projects/compose/koin-androidx-compose-navigation/build.gradle.kts
@@ -28,4 +28,10 @@ dependencies {
     implementation(libs.androidx.composeNavigation)
 }
 
+// android sources
+val sourcesJar: TaskProvider<Jar> by tasks.registering(Jar::class) {
+    archiveClassifier.set("sources")
+    from(android.sourceSets.map { it.java.srcDirs })
+}
+
 apply(from = file("../../gradle/publish-android.gradle.kts"))
diff --git a/projects/compose/koin-androidx-compose/build.gradle.kts b/projects/compose/koin-androidx-compose/build.gradle.kts
@@ -30,4 +30,10 @@ dependencies {
     implementation(libs.androidx.composeViewModel)
 }
 
+// android sources
+val sourcesJar: TaskProvider<Jar> by tasks.registering(Jar::class) {
+    archiveClassifier.set("sources")
+    from(android.sourceSets.map { it.java.srcDirs })
+}
+
 apply(from = file("../../gradle/publish-android.gradle.kts"))
diff --git a/projects/core/koin-test/build.gradle.kts b/projects/core/koin-test/build.gradle.kts
@@ -34,6 +34,8 @@ kotlin {
     sourceSets {
         commonMain.dependencies {
             api(project(":core:koin-core"))
+            //TODO remove in 3.6
+            implementation(libs.kotlin.test)
         }
         jvmMain.dependencies {
             implementation(kotlin("reflect"))

diff --git a/projects/gradle.properties b/projects/gradle.properties
@@ -8,8 +8,8 @@ org.gradle.parallel=true
 kotlin.code.style=official
 
 #Koin
-koinVersion=3.5.4
-koinComposeVersion=1.1.3
+koinVersion=3.5.5
+koinComposeVersion=1.1.4
 
 #Compose
 composeCompiler=1.5.10

diff --git a/projects/gradle/publish-android.gradle.kts b/projects/gradle/publish-android.gradle.kts
@@ -1,10 +1,12 @@
 apply(plugin = "maven-publish")
 
 val javadocJar = tasks.getByName("javadocJar")
+val sourcesJar = tasks.getByName("sourcesJar")
 
 configure<PublishingExtension> {
     publications {
         register<MavenPublication>("release") {
+            artifact(sourcesJar)
             artifact(javadocJar)
             afterEvaluate {
                 from(components["release"])

diff --git a/projects/ktor/koin-logger-slf4j/build.gradle_ b/projects/ktor/koin-logger-slf4j/build.gradle_