chore: internal plugin dependencies optimization

xpdustry · Mar 21, 2024 · d343f6b · d343f6b
1 parent a14be64
commit d343f6b
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 27 deletions.
diff --git a/distributor-build-logic/src/main/kotlin/distributor.mindustry-conventions.gradle.kts b/distributor-build-logic/src/main/kotlin/distributor.mindustry-conventions.gradle.kts
@@ -1,5 +1,6 @@
 import fr.xpdustry.toxopid.dsl.mindustryDependencies
 import fr.xpdustry.toxopid.spec.ModMetadata
+import kotlin.reflect.cast
 
 plugins {
  id("net.kyori.indra")
@@ -18,27 +19,18 @@ dependencies {
  mindustryDependencies()
 }
 
-afterEvaluate {
- dependencies {
- for (dependency in extension.dependencies.get()) {
- compileOnly(dependency)
- }
- }
+val pluginCompileOnlyApi: Configuration by configurations.creating
+
+configurations.compileOnlyApi {
+ extendsFrom(pluginCompileOnlyApi)
 }
 
 tasks.runMindustryClient {
  mods.setFrom()
 }
 
 tasks.runMindustryServer {
- mods.from(tasks.shadowJar)
-}
-
-// Cursed way to collect dependent distributor modules
-gradle.projectsEvaluated {
- tasks.runMindustryServer {
- mods.from(collectAllPluginDependencies())
- }
+ mods.from(tasks.shadowJar, collectAllPluginDependencies())
 }
 
 tasks.shadowJar {
@@ -56,7 +48,7 @@ tasks.shadowJar {
  java = true,
  hidden = true,
  dependencies =
- extension.dependencies.get()
+ pluginCompileOnlyApi.dependencies.map(ProjectDependency::class::cast)
  .map { it.dependencyProject.extensions.getByType<DistributorModuleExtension>().identifier.get() }
  .toMutableList(),
  )

diff --git a/distributor-build-logic/src/main/kotlin/extensions.kt b/distributor-build-logic/src/main/kotlin/extensions.kt
@@ -4,11 +4,12 @@ import org.gradle.accessors.dm.LibrariesForLibs
 import org.gradle.api.Project
 import org.gradle.api.artifacts.ProjectDependency
 import org.gradle.api.plugins.ExtensionContainer
+import org.gradle.api.provider.Provider
 import org.gradle.api.tasks.TaskProvider
 import org.gradle.kotlin.dsl.named
 import org.gradle.kotlin.dsl.property
-import org.gradle.kotlin.dsl.setProperty
 import org.gradle.kotlin.dsl.the
+import kotlin.reflect.cast
 
 internal val Project.libs: LibrariesForLibs get() = the()
 
@@ -19,19 +20,18 @@ open class DistributorModuleExtension(project: Project) {
  val display = project.objects.property<String>()
  val main = project.objects.property<String>()
  val description = project.objects.property<String>()
- val dependencies = project.objects.setProperty<ProjectDependency>()
 
  companion object {
  const val EXTENSION_NAME = "distributorModule"
  }
 }
 
-fun Project.collectAllPluginDependencies(): Set<TaskProvider<out ShadowJar>> {
- val dependencies = mutableSetOf<TaskProvider<out ShadowJar>>()
- val extension = extensions.findOrCreateExtension<DistributorModuleExtension>(DistributorModuleExtension.EXTENSION_NAME)
- for (dependency in extension.dependencies.get()) {
- dependencies += dependency.dependencyProject.tasks.named<ShadowJar>("shadowJar")
- dependencies += dependency.dependencyProject.collectAllPluginDependencies()
+fun Project.collectAllPluginDependencies(): Provider<Set<TaskProvider<out ShadowJar>>> =
+ configurations.named("pluginCompileOnlyApi").flatMap { configuration ->
+ configuration.dependencies.map(ProjectDependency::class::cast)
+ .fold(project.providers.provider(::emptySet)) { provider, dependency ->
+ provider
+ .map { it + setOf(dependency.dependencyProject.tasks.named<ShadowJar>("shadowJar")) }
+ .zip(dependency.dependencyProject.collectAllPluginDependencies(), Set<TaskProvider<out ShadowJar>>::plus)
+ }
  }
- return dependencies
-}
diff --git a/distributor-core/build.gradle.kts b/distributor-core/build.gradle.kts
@@ -9,10 +9,10 @@ distributorModule {
  display = "DistributorCore"
  main = "com.xpdustry.distributor.core.DistributorCorePlugin"
  description = "Core classes of distributor."
- dependencies = setOf(projects.distributorLoggingSimple)
 }
 
 dependencies {
+ pluginCompileOnlyApi(projects.distributorLoggingSimple)
  compileOnlyApi(libs.immutables.annotations)
  annotationProcessor(libs.immutables.processor)
  compileOnlyApi(libs.slf4j.api)

diff --git a/distributor-permission-rank/build.gradle.kts b/distributor-permission-rank/build.gradle.kts
@@ -9,10 +9,10 @@ distributorModule {
  display = "DistributorPermissionRank"
  main = "com.xpdustry.distributor.permission.rank.DistributorPermissionRankPlugin"
  description = "Simple permission system based on ranks."
- dependencies = setOf(projects.distributorCore)
 }
 
 dependencies {
+ pluginCompileOnlyApi(projects.distributorCore)
  implementation(libs.configurate.core)
  implementation(libs.configurate.yaml)
 }