Issue uber#375 - Add jar classifiers to the dependency cache.

cwoodwar6 · Feb 3, 2017 · 0fd23c9 · 0fd23c9
1 parent 16888cf
commit 0fd23c9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/buildSrc/src/main/groovy/com/uber/okbuck/core/dependency/DependencyCache.groovy b/buildSrc/src/main/groovy/com/uber/okbuck/core/dependency/DependencyCache.groovy
@@ -97,7 +97,7 @@ class DependencyCache {
         }
 
         superConfiguration.resolvedConfiguration.resolvedArtifacts.each { ResolvedArtifact artifact ->
-            ExternalDependency dependency = new ExternalDependency(artifact.moduleVersion.id, artifact.file)
+            ExternalDependency dependency = new ExternalDependency(artifact.moduleVersion.id, artifact.file, artifact.type, artifact.classifier)
             if (!projectDeps.containsKey(dependency)) {
                 externalDeps.put(dependency, dependency)
             }

diff --git a/buildSrc/src/main/groovy/com/uber/okbuck/core/dependency/ExternalDependency.groovy b/buildSrc/src/main/groovy/com/uber/okbuck/core/dependency/ExternalDependency.groovy
@@ -14,7 +14,7 @@ class ExternalDependency extends VersionlessDependency {
     final DefaultArtifactVersion version
     final File depFile
 
-    ExternalDependency(ModuleVersionIdentifier identifier, File depFile) {
+    ExternalDependency(ModuleVersionIdentifier identifier, File depFile, String artifactType, String artifactClassifier) {
         super(identifier)
         if (identifier.version) {
             version = new DefaultArtifactVersion(identifier.version)
@@ -23,6 +23,10 @@ class ExternalDependency extends VersionlessDependency {
         }
 
         this.depFile = depFile
+
+        if (artifactType == "jar") {
+            this.classifier = artifactClassifier
+        }
     }
 
     @Override
@@ -53,6 +57,6 @@ class ExternalDependency extends VersionlessDependency {
                 baseName,
                 baseName,
                 LOCAL_DEP_VERSION)
-        return new ExternalDependency(identifier, localDep)
+        return new ExternalDependency(identifier, localDep, null, null)
     }
 }
diff --git a/buildSrc/src/main/groovy/com/uber/okbuck/core/dependency/VersionlessDependency.groovy b/buildSrc/src/main/groovy/com/uber/okbuck/core/dependency/VersionlessDependency.groovy
@@ -10,13 +10,18 @@ class VersionlessDependency {
     final String group
     final String name
 
+    String classifier
+
     VersionlessDependency(ModuleVersionIdentifier identifier) {
         group = identifier.group
         name = identifier.name
     }
 
     @Override
     String toString() {
+        if (classifier) {
+            return "${this.group}:${this.name}-${this.classifier}"
+        }
         return "${this.group}:${this.name}"
     }