Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Sep 17 03:10:52 EDT 2025
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
8 changes: 7 additions & 1 deletion src/main/kotlin/io/github/atriusx/Compositor.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package io.github.atriusx
import org.gradle.api.Plugin
import org.gradle.api.artifacts.DependencySubstitutions
import org.gradle.api.initialization.Settings
import org.gradle.internal.cc.base.logger
import io.github.atriusx.config.CompositesConfig
import io.github.atriusx.util.CompositesUtil.getCompositesFile
import io.github.atriusx.util.YamlUtil
import org.slf4j.LoggerFactory

/**
* @author Atrius
Expand Down Expand Up @@ -63,4 +63,10 @@ class Compositor : Plugin<Settings> {
private fun Settings.applyProjectPlugin() = gradle.beforeProject {
it.pluginManager.apply(CompositorProjectAuto::class.java)
}

companion object {

private val logger = LoggerFactory
.getLogger(Compositor::class.java)
}
}
8 changes: 7 additions & 1 deletion src/main/kotlin/io/github/atriusx/CompositorProjectAuto.kt
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ package io.github.atriusx

import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.internal.cc.base.logger
import io.github.atriusx.config.CompositesConfig
import io.github.atriusx.util.CompositesUtil
import io.github.atriusx.util.CompositesUtil.getCompositesFile
import io.github.atriusx.util.YamlUtil
import org.slf4j.LoggerFactory
import java.io.File

/**
Expand Down Expand Up @@ -74,4 +74,10 @@ class CompositorProjectAuto : Plugin<Project> {
// Save content back to file
YamlUtil.write(file, composites)
}

companion object {

private val logger = LoggerFactory
.getLogger(CompositorProjectAuto::class.java.name)
}
}
5 changes: 4 additions & 1 deletion src/main/kotlin/io/github/atriusx/util/YamlUtil.kt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package io.github.atriusx.util

import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator
import com.fasterxml.jackson.dataformat.yaml.YAMLMapper
import org.gradle.internal.cc.base.logger
import org.slf4j.LoggerFactory
import java.io.File
import java.io.IOException
import kotlin.reflect.KClass
Expand All @@ -28,4 +28,7 @@ object YamlUtil {
logger.debug("Writing provided content to ${file.name}...")
yaml.writeValue(file, value)
}

private val logger = LoggerFactory
.getLogger(YamlUtil::class.java)
}
23 changes: 23 additions & 0 deletions src/test/kotlin/io/github/atriusx/config/CompositesConfigTest.kt
Original file line number Diff line number Diff line change
Expand Up @@ -139,5 +139,28 @@ class CompositesConfigTest : DescribeSpec({
)
}
}

describe("When importing multiple subprojects") {
val content = """
|composites:
| foo.bar.baz:
| dependency-a: "../multi:dependency-a"
| dependency-b: "../multi:dependency-b"
""".trimMargin()
val composites = yaml
.readValue(content, CompositesConfig::class.java)
.processQualifiers()

it("Should resolve multiple composites") {
composites.size shouldBe 2
}

it("Should resolve the correct mappings") {
composites
.shouldContain("foo.bar.baz:dependency-a" to "../multi:dependency-a",)
composites
.shouldContain("foo.bar.baz:dependency-b" to "../multi:dependency-b",)
}
}
}
})