Removed embedded dependencies (#132)

gmazzo · Dec 24, 2024 · 57320ca · 57320ca
1 parent e6f0a8d
commit 57320ca
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 43 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -17,7 +17,8 @@ slf4j = { module = "org.slf4j:slf4j-api", version = "2.0.16" }
 android-application = { id = "com.android.application", version.ref = "android" }
 android-library = { id = "com.android.library", version.ref = "android" }
 buildConfig = { id = "com.github.gmazzo.buildconfig", version = "5.5.1" }
-importClasses = { id = "io.github.gmazzo.importclasses", version = "1.0.2" }
+importClasses = { id = "io.github.gmazzo.importclasses", version = "1.0.3" }
+embeddedDependencies = { id = "io.github.gmazzo.dependencies.embedded", version = "1.0.3" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }

diff --git a/plugins/buildSrc/src/main/kotlin/embedded-dependencies.gradle.kts b/plugins/buildSrc/src/main/kotlin/embedded-dependencies.gradle.kts
diff --git a/plugins/kotlin-compiler/build.gradle.kts b/plugins/kotlin-compiler/build.gradle.kts
@@ -1,8 +1,8 @@
 plugins {
     alias(libs.plugins.kotlin.jvm)
+    alias(libs.plugins.embeddedDependencies)
     `compiler-arguments`
     `jvm-convention-module`
-    `embedded-dependencies`
 }
 
 description = "CodeOwners Kotlin Compiler Plugin"
@@ -16,5 +16,10 @@ buildConfig {
 dependencies {
     compileOnly(libs.kotlin.plugin.compiler.api)
 
-    embedded(projects.matcher)
+    // TODO for some strange reason, KMP sets `isTransitive = false` on the `kotlinCompilerPluginClasspathIosArm64Main` configuration
+    //  which causes any dependency to be ignored, so we have bundle them all here
+    //  https://scans.gradle.com/s/hdmdwh42uxmpy/dependencies?focusedDependency=WzUsNTYsNTA3LFs1LDU2LFs1MDddXV0&focusedDependencyView=dependencies_or_failure&toggled=W1s1XSxbNSwzN10sWzUsMzcsWzU1MV1dLFs1LDM3LFs1NTEsNTUyXV0sWzUsNTZdXQ
+    embedded(projects.matcher) {
+        exclude(group = "org.jetbrains.kotlin")
+    }
 }
diff --git a/plugins/kotlin-core/build.gradle.kts b/plugins/kotlin-core/build.gradle.kts
@@ -1,5 +1,3 @@
-import org.gradle.configurationcache.extensions.capitalized
-
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
     `jvm-convention-module`
@@ -23,7 +21,8 @@ dependencies {
 }
 
 publishing.publications.withType<MavenPublication>().configureEach pub@{
-    val javadocTask = tasks.register<Jar>("javadoc${this@pub.name.capitalized()}") {
+
+    val javadocTask = tasks.register<Jar>("javadoc${this@pub.name.replaceFirstChar { it.uppercase() }}") {
         archiveBaseName = "${project.name}-${this@pub.name}"
         archiveClassifier = "javadoc"
         from(tasks.dokkaHtml)

diff --git a/plugins/matcher/build.gradle.kts b/plugins/matcher/build.gradle.kts
@@ -2,7 +2,6 @@ plugins {
     alias(libs.plugins.kotlin.jvm)
     alias(libs.plugins.importClasses)
     `jvm-convention-module`
-    `embedded-dependencies`
 }
 
 description = "CodeOwners Matcher Library"
@@ -11,10 +10,7 @@ sourceSets.main {
     importClasses(libs.jgit) {
         repackageTo = "io.github.gmazzo.codeowners.matcher.jgit"
         keep("org.eclipse.jgit.ignore.FastIgnoreRule")
-
-        exclude("META-INF/**/module-info.class")
         include("**.class")
-        exclude("**.*")
     }
 }