Skip to content

Commit

Permalink
Merge 87c0224 into 0c2e682
Browse files Browse the repository at this point in the history
  • Loading branch information
@OdysseusLives
OdysseusLives committed Jul 12, 2018
2 parents 0c2e682 + 87c0224 commit 819888d
Show file tree
Hide file tree
Showing 6 changed files with 91 additions and 80 deletions.
1 change: 0 additions & 1 deletion build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ dependencies {
compile 'com.netflix.nebula:nebula-gradle-interop:latest.release'
compile 'com.netflix.nebula:gradle-scm-plugin:latest.release'
compile 'com.netflix.nebula:gradle-metrics-plugin:5.+', optional
compile 'com.netflix.nebula:nebula-dependency-base-plugin:latest.release'
compile 'org.codehaus.groovy.modules.http-builder:http-builder:0.7.1'

testCompile 'com.netflix.nebula:gradle-git-scm-plugin:latest.release'
Expand Down
68 changes: 8 additions & 60 deletions dependencies.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@
"locked": "3.0.1",
"requested": "latest.release"
},
"com.netflix.nebula:nebula-dependency-base-plugin": {
"locked": "0.4.0",
"requested": "latest.release"
},
"com.netflix.nebula:nebula-gradle-interop": {
"locked": "0.5.0",
"requested": "latest.release"
Expand All @@ -34,10 +30,6 @@
"locked": "3.0.1",
"requested": "latest.release"
},
"com.netflix.nebula:nebula-dependency-base-plugin": {
"locked": "0.4.0",
"requested": "latest.release"
},
"com.netflix.nebula:nebula-gradle-interop": {
"locked": "0.5.0",
"requested": "latest.release"
Expand All @@ -60,10 +52,6 @@
"locked": "3.0.1",
"requested": "latest.release"
},
"com.netflix.nebula:nebula-dependency-base-plugin": {
"locked": "0.4.0",
"requested": "latest.release"
},
"com.netflix.nebula:nebula-gradle-interop": {
"locked": "0.5.0",
"requested": "latest.release"
Expand Down Expand Up @@ -94,16 +82,12 @@
"locked": "3.0.1",
"requested": "latest.release"
},
"com.netflix.nebula:nebula-dependency-base-plugin": {
"locked": "0.4.0",
"requested": "latest.release"
},
"com.netflix.nebula:nebula-gradle-interop": {
"locked": "0.5.0",
"requested": "latest.release"
},
"com.netflix.nebula:nebula-test": {
"locked": "6.7.0",
"locked": "6.7.1",
"requested": "6.+"
},
"org.ajoberstar:grgit": {
Expand Down Expand Up @@ -136,16 +120,12 @@
"locked": "3.0.1",
"requested": "latest.release"
},
"com.netflix.nebula:nebula-dependency-base-plugin": {
"locked": "0.4.0",
"requested": "latest.release"
},
"com.netflix.nebula:nebula-gradle-interop": {
"locked": "0.5.0",
"requested": "latest.release"
},
"com.netflix.nebula:nebula-test": {
"locked": "6.7.0",
"locked": "6.7.1",
"requested": "6.+"
},
"org.ajoberstar:grgit": {
Expand Down Expand Up @@ -178,16 +158,12 @@
"locked": "3.0.1",
"requested": "latest.release"
},
"com.netflix.nebula:nebula-dependency-base-plugin": {
"locked": "0.4.0",
"requested": "latest.release"
},
"com.netflix.nebula:nebula-gradle-interop": {
"locked": "0.5.0",
"requested": "latest.release"
},
"com.netflix.nebula:nebula-test": {
"locked": "6.7.0",
"locked": "6.7.1",
"requested": "6.+"
},
"org.ajoberstar:grgit": {
Expand Down Expand Up @@ -220,16 +196,12 @@
"locked": "3.0.1",
"requested": "latest.release"
},
"com.netflix.nebula:nebula-dependency-base-plugin": {
"locked": "0.4.0",
"requested": "latest.release"
},
"com.netflix.nebula:nebula-gradle-interop": {
"locked": "0.5.0",
"requested": "latest.release"
},
"com.netflix.nebula:nebula-test": {
"locked": "6.7.0",
"locked": "6.7.1",
"requested": "6.+"
},
"org.ajoberstar:grgit": {
Expand Down Expand Up @@ -282,10 +254,6 @@
"locked": "3.0.1",
"requested": "latest.release"
},
"com.netflix.nebula:nebula-dependency-base-plugin": {
"locked": "0.4.0",
"requested": "latest.release"
},
"com.netflix.nebula:nebula-gradle-interop": {
"locked": "0.5.0",
"requested": "latest.release"
Expand All @@ -308,10 +276,6 @@
"locked": "3.0.1",
"requested": "latest.release"
},
"com.netflix.nebula:nebula-dependency-base-plugin": {
"locked": "0.4.0",
"requested": "latest.release"
},
"com.netflix.nebula:nebula-gradle-interop": {
"locked": "0.5.0",
"requested": "latest.release"
Expand Down Expand Up @@ -342,16 +306,12 @@
"locked": "3.0.1",
"requested": "latest.release"
},
"com.netflix.nebula:nebula-dependency-base-plugin": {
"locked": "0.4.0",
"requested": "latest.release"
},
"com.netflix.nebula:nebula-gradle-interop": {
"locked": "0.5.0",
"requested": "latest.release"
},
"com.netflix.nebula:nebula-test": {
"locked": "6.7.0",
"locked": "6.7.1",
"requested": "6.+"
},
"org.ajoberstar:grgit": {
Expand Down Expand Up @@ -384,16 +344,12 @@
"locked": "3.0.1",
"requested": "latest.release"
},
"com.netflix.nebula:nebula-dependency-base-plugin": {
"locked": "0.4.0",
"requested": "latest.release"
},
"com.netflix.nebula:nebula-gradle-interop": {
"locked": "0.5.0",
"requested": "latest.release"
},
"com.netflix.nebula:nebula-test": {
"locked": "6.7.0",
"locked": "6.7.1",
"requested": "6.+"
},
"org.ajoberstar:grgit": {
Expand Down Expand Up @@ -426,16 +382,12 @@
"locked": "3.0.1",
"requested": "latest.release"
},
"com.netflix.nebula:nebula-dependency-base-plugin": {
"locked": "0.4.0",
"requested": "latest.release"
},
"com.netflix.nebula:nebula-gradle-interop": {
"locked": "0.5.0",
"requested": "latest.release"
},
"com.netflix.nebula:nebula-test": {
"locked": "6.7.0",
"locked": "6.7.1",
"requested": "6.+"
},
"org.ajoberstar:grgit": {
Expand Down Expand Up @@ -468,16 +420,12 @@
"locked": "3.0.1",
"requested": "latest.release"
},
"com.netflix.nebula:nebula-dependency-base-plugin": {
"locked": "0.4.0",
"requested": "latest.release"
},
"com.netflix.nebula:nebula-gradle-interop": {
"locked": "0.5.0",
"requested": "latest.release"
},
"com.netflix.nebula:nebula-test": {
"locked": "6.7.0",
"locked": "6.7.1",
"requested": "6.+"
},
"org.ajoberstar:grgit": {
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-rc-1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
24 changes: 11 additions & 13 deletions src/main/kotlin/nebula/plugin/dependencylock/DependencyLockPlugin.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,12 @@
*/
package nebula.plugin.dependencylock

import com.netflix.nebula.dependencybase.DependencyBasePlugin
import com.netflix.nebula.dependencybase.DependencyManagement
import com.netflix.nebula.interop.onResolve
import nebula.plugin.dependencylock.exceptions.DependencyLockException
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.api.artifacts.*
import org.gradle.api.internal.artifacts.DefaultModuleVersionSelector
import org.gradle.api.artifacts.Configuration
import org.gradle.api.artifacts.DependencyResolveDetails
import org.gradle.api.logging.Logger
import org.gradle.api.logging.Logging
import org.gradle.util.NameMatcher
Expand Down Expand Up @@ -51,16 +49,13 @@ class DependencyLockPlugin : Plugin<Project> {

lateinit var project: Project
lateinit var lockReader: DependencyLockReader
lateinit var insight: DependencyManagement
lateinit var lockUsed: String
val reasons: MutableSet<String> = mutableSetOf()

override fun apply(project: Project) {
this.project = project
this.lockReader = DependencyLockReader(project)

project.plugins.apply(DependencyBasePlugin::class.java)
this.insight = project.extensions.extraProperties.get("nebulaDependencyBase") as DependencyManagement

val extension = project.extensions.create(EXTENSION_NAME, DependencyLockExtension::class.java)
var commitExtension = project.rootProject.extensions.findByType(DependencyLockCommitExtension::class.java)
if (commitExtension == null) {
Expand Down Expand Up @@ -117,7 +112,7 @@ class DependencyLockPlugin : Plugin<Project> {
}

lockUsed = dependenciesLock.name
insight.addPluginMessage("nebula.dependency-lock locked with: $lockUsed")
reasons.add("nebula.dependency-lock locked with: $lockUsed")

if (!DependencyLockTaskConfigurer.shouldIgnoreDependencyLock(project)) {
val taskNames = project.gradle.startParameter.taskNames
Expand Down Expand Up @@ -192,11 +187,11 @@ class DependencyLockPlugin : Plugin<Project> {
private fun applyOverrides(conf: Configuration, overrides: Map<*, *>) {
if (project.hasProperty(OVERRIDE_FILE)) {
LOGGER.info("Using override file ${project.property(OVERRIDE_FILE)} to lock dependencies")
insight.addPluginMessage("nebula.dependency-lock using override file: ${project.property(OVERRIDE_FILE)}")
reasons.add("nebula.dependency-lock using override file: ${project.property(OVERRIDE_FILE)}")
}
if (project.hasProperty(OVERRIDE)) {
LOGGER.info("Using command line overrides ${project.property(OVERRIDE)}")
insight.addPluginMessage("nebula.dependency-lock using override: ${project.property(OVERRIDE)}")
reasons.add("nebula.dependency-lock using override: ${project.property(OVERRIDE)}")
}

val overrideDeps = overrides.map {
Expand All @@ -212,8 +207,9 @@ class DependencyLockPlugin : Plugin<Project> {
val moduleKey = details.toKey()
val module = selectorsByKey[moduleKey]
if (module != null) {
details.useTarget(module.toMap())
insight.addLock(conf.name, moduleKey.toModuleString(), module.version, lockUsed, "nebula.dependency-lock")
details.because("${moduleKey.toModuleString()} locked to ${module.version}\n" +
"\twith reasons: ${reasons.joinToString()}")
.useTarget(module.toMap())
}
}
}
Expand All @@ -231,12 +227,14 @@ class DependencyLockPlugin : Plugin<Project> {
return ModuleVersionSelectorKey(group, name, version as String)
}
}

override fun hashCode(): Int = Objects.hash(group, name)

override fun equals(other: Any?): Boolean = when (other) {
is ModuleVersionSelectorKey -> group == other.group && name == other.name
else -> false
}

fun toMap(): Map<String, String> = mapOf("group" to group, "name" to name, "version" to version)
fun toModuleString(): String = "$group:$name"
override fun toString(): String = "$group:$name:$version"
Expand Down

0 comments on commit 819888d

Please sign in to comment.