sbl/gradle2nix
1
0
Fork 0
mirror of https://github.com/tadfisher/gradle2nix.git synced 2026-01-11 15:30:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Exclude project dependencies

Browse Source
This commit is contained in:
Tad Fisher
2019-06-04 13:56:44 -07:00
parent 09b5bfb11a
commit 7b0e167335
2 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
plugin/src/compatTest/kotlin/org/nixos/gradle2nix/SubprojectsTest.kt
View File

@@ -29,6 +29,7 @@ class SubprojectsTest {
}
dependencies {
implementation(project(":child-a"))
implementation("com.squareup.moshi:moshi:1.8.0")
}
""".trimIndent())
@@ -110,6 +111,14 @@ class SubprojectsTest {
pom("com.squareup.okio:okio-parent:1.16.0"),
jar("com.squareup.okio:okio:1.16.0"),
pom("com.squareup.okio:okio:1.16.0"),
jar("com.squareup.okio:okio:2.2.2"),
pom("com.squareup.okio:okio:2.2.2"),
jar("org.jetbrains.kotlin:kotlin-stdlib-common:1.2.60"),
pom("org.jetbrains.kotlin:kotlin-stdlib-common:1.2.60"),
jar("org.jetbrains.kotlin:kotlin-stdlib:1.2.60"),
pom("org.jetbrains.kotlin:kotlin-stdlib:1.2.60"),
jar("org.jetbrains:annotations:13.0"),
pom("org.jetbrains:annotations:13.0"),
pom("org.sonatype.oss:oss-parent:7"),
actual = artifacts
)
@@ -138,6 +147,7 @@ class SubprojectsTest {
}
dependencies {
implementation project(':child-a')
implementation 'com.squareup.moshi:moshi:1.8.0'
}
""".trimIndent())
@@ -217,6 +227,14 @@ class SubprojectsTest {
pom("com.squareup.okio:okio-parent:1.16.0"),
jar("com.squareup.okio:okio:1.16.0"),
pom("com.squareup.okio:okio:1.16.0"),
jar("com.squareup.okio:okio:2.2.2"),
pom("com.squareup.okio:okio:2.2.2"),
jar("org.jetbrains.kotlin:kotlin-stdlib-common:1.2.60"),
pom("org.jetbrains.kotlin:kotlin-stdlib-common:1.2.60"),
jar("org.jetbrains.kotlin:kotlin-stdlib:1.2.60"),
pom("org.jetbrains.kotlin:kotlin-stdlib:1.2.60"),
jar("org.jetbrains:annotations:13.0"),
pom("org.jetbrains:annotations:13.0"),
pom("org.sonatype.oss:oss-parent:7"),
actual = artifacts)
}

7
plugin/src/main/kotlin/org/nixos/gradle2nix/DependencyResolver.kt
View File

@@ -11,6 +11,7 @@ import org.gradle.api.artifacts.Configuration
import org.gradle.api.artifacts.ConfigurationContainer
import org.gradle.api.artifacts.Dependency
import org.gradle.api.artifacts.component.ModuleComponentIdentifier
import org.gradle.api.artifacts.component.ProjectComponentIdentifier
import org.gradle.api.artifacts.dsl.DependencyHandler
import org.gradle.api.artifacts.result.ResolvedArtifactResult
import org.gradle.api.logging.Logger
@@ -34,7 +35,9 @@ internal class DependencyResolver(
logger.warn("Cannot resolve configuration ${configuration.name}; ignoring.")
return emptySet()
}
return configuration.resolvedConfiguration.resolvedArtifacts.mapTo(sortedSetOf()) {
return configuration.resolvedConfiguration.resolvedArtifacts
.filterNot { it.id.componentIdentifier is ProjectComponentIdentifier }
.mapTo(sortedSetOf()) {
with (it) {
DefaultArtifact(
groupId = moduleVersion.id.group,
@@ -153,7 +156,7 @@ private class MavenPomResolver(
override fun addRepository(repository: Repository, replace: Boolean) {}
}
private val HEX = "0123456789ABCDEF"
private const val HEX = "0123456789abcdef"
private fun sha256(file: File): String = buildString {
MessageDigest.getInstance("SHA-256").digest(file.readBytes())