From 0ccfc111c908fb16593ab0a4dd08f2eb6509bf17 Mon Sep 17 00:00:00 2001 From: Arnaud Giuliani Date: Thu, 11 Apr 2024 10:55:18 +0200 Subject: [PATCH 1/2] add sources jar for android project (kts fix) --- .../koin-android-compat/build.gradle.kts | 6 ++++++ .../koin-android-test/build.gradle.kts | 6 ++++++ .../android/koin-android/build.gradle.kts | 6 ++++++ .../koin-androidx-navigation/build.gradle.kts | 6 ++++++ .../build.gradle.kts | 6 ++++++ .../build.gradle.kts | 6 ++++++ .../koin-androidx-compose/build.gradle.kts | 6 ++++++ projects/gradle/publish-android.gradle.kts | 2 ++ projects/ktor/koin-logger-slf4j/build.gradle_ | 21 ------------------- 9 files changed, 44 insertions(+), 21 deletions(-) delete mode 100644 projects/ktor/koin-logger-slf4j/build.gradle_ diff --git a/projects/android/koin-android-compat/build.gradle.kts b/projects/android/koin-android-compat/build.gradle.kts index b90b3cea8..e4104107e 100644 --- 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 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 index 7ccf86e1c..873c639fa 100644 --- 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 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 index 2aaeb27e4..7039f3305 100644 --- 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 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 index 7827db5f3..66836c1a5 100644 --- 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 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 index 5b62720af..bac3eaae5 100644 --- 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 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 index 6d9815a58..d24c11495 100644 --- 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 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 index 01f1ab75f..e80988ca3 100644 --- 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 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/gradle/publish-android.gradle.kts b/projects/gradle/publish-android.gradle.kts index 3c2110791..01db65aee 100644 --- 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 { publications { register("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_ deleted file mode 100644 index fe1b9d816..000000000 --- a/projects/ktor/koin-logger-slf4j/build.gradle_ +++ /dev/null @@ -1,21 +0,0 @@ -apply plugin: 'kotlin' - -archivesBaseName = 'koin-logger-slf4j' - -dependencies { - - // Koin - api "io.insert-koin:koin-core:$koin_version" - // SLF4J - //TODO Update 2.0.x - api "org.slf4j:slf4j-api:1.7.36" -} - -// Ensure "org.gradle.jvm.version" is set to "8" in Gradle metadata. -compileJava { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - - -apply from: '../../gradle/publish-to-central.gradle' \ No newline at end of file From 2af10be3f210c3655cc0af47e20681f9498333ba Mon Sep 17 00:00:00 2001 From: Arnaud Giuliani Date: Thu, 11 Apr 2024 12:08:28 +0200 Subject: [PATCH 2/2] Koin 3.5.5 / 1.1.4 --- projects/core/koin-test/build.gradle.kts | 2 ++ projects/gradle.properties | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/projects/core/koin-test/build.gradle.kts b/projects/core/koin-test/build.gradle.kts index 1e6df8230..5f4ec041a 100644 --- 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 index 952b2f26c..47982c4e8 100644 --- 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