Add ResolutionParams.scalaVersion (#111)

coursier · Mar 19, 2020 · d5eb4d2 · d5eb4d2
1 parent daddc15
commit d5eb4d2
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 8 deletions.
diff --git a/interface/src/main/java/coursierapi/ResolutionParams.java b/interface/src/main/java/coursierapi/ResolutionParams.java
@@ -12,6 +12,7 @@ public class ResolutionParams implements Serializable {
     private final HashSet<Map.Entry<String, String>> exclusions;
     private boolean useSystemOsInfo;
     private boolean useSystemJdkVersion;
+    private String scalaVersion;
 
     private ResolutionParams() {
         maxIterations = null;
@@ -21,6 +22,7 @@ private ResolutionParams() {
         exclusions = new HashSet<>();
         useSystemOsInfo = true;
         useSystemJdkVersion = true;
+        scalaVersion = null;
     }
 
     @Override
@@ -31,14 +33,15 @@ public boolean equals(Object obj) {
                     this.forcedProperties.equals(other.forcedProperties) &&
                     this.profiles.equals(other.profiles) && this.exclusions.equals(other.exclusions) &&
                     Objects.equals(this.useSystemOsInfo, other.useSystemOsInfo) &&
-                    Objects.equals(this.useSystemJdkVersion, other.useSystemJdkVersion);
+                    Objects.equals(this.useSystemJdkVersion, other.useSystemJdkVersion) &&
+                    Objects.equals(this.scalaVersion, other.scalaVersion);
         }
         return false;
     }
 
     @Override
     public int hashCode() {
-        return 37 * (37 * (37 * (37 * (37 * (37 * (17 + Objects.hashCode(maxIterations)) + forceVersions.hashCode()) + forcedProperties.hashCode()) + profiles.hashCode()) + exclusions.hashCode()) + Boolean.hashCode(useSystemOsInfo)) + Boolean.hashCode(useSystemJdkVersion);
+        return 37 * (37 * (37 * (37 * (37 * (37 * (37 * (17 + Objects.hashCode(maxIterations)) + forceVersions.hashCode()) + forcedProperties.hashCode()) + profiles.hashCode()) + exclusions.hashCode()) + Boolean.hashCode(useSystemOsInfo)) + Boolean.hashCode(useSystemJdkVersion)) + Objects.hashCode(scalaVersion);
     }
 
     @Override
@@ -133,14 +136,14 @@ public String toString() {
         b.append("useSystemOsInfo=");
         b.append(useSystemOsInfo);
 
-        if (needSep)
-            b.append(", ");
-        else
-            needSep = true;
-
         b.append("useSystemJdkVersion=");
         b.append(useSystemJdkVersion);
 
+        if (scalaVersion != null) {
+            b.append(", scalaVersion=");
+            b.append(scalaVersion);
+        }
+
         b.append(")");
         return b.toString();
     }
@@ -157,7 +160,8 @@ public static ResolutionParams of(ResolutionParams params) {
                 .withProfiles(params.profiles)
                 .withExclusions(params.exclusions)
                 .withUseSystemOsInfo(params.useSystemOsInfo)
-                .withUseSystemJdkVersion(params.useSystemJdkVersion);
+                .withUseSystemJdkVersion(params.useSystemJdkVersion)
+                .withScalaVersion(params.scalaVersion);
     }
 
     public ResolutionParams withMaxIterations(Integer maxIterations) {
@@ -236,6 +240,11 @@ public ResolutionParams withUseSystemJdkVersion(boolean useSystemJdkVersion) {
         return this;
     }
 
+    public ResolutionParams withScalaVersion(String scalaVersion) {
+        this.scalaVersion = scalaVersion;
+        return this;
+    }
+
     public Integer getMaxIterations() {
         return maxIterations;
     }
@@ -263,4 +272,8 @@ public boolean getUseSystemOsInfo() {
     public boolean getUseSystemJdkVersion() {
         return useSystemJdkVersion;
     }
+
+    public String getScalaVersion() {
+        return scalaVersion;
+    }
 }
diff --git a/interface/src/main/scala/coursier/internal/api/ApiHelper.scala b/interface/src/main/scala/coursier/internal/api/ApiHelper.scala
@@ -187,6 +187,7 @@ object ApiHelper {
       .withExclusions(params.exclusions.map { case (o, n) => new ju.AbstractMap.SimpleEntry(o.value, n.value): ju.Map.Entry[String, String] }.asJava)
       .withUseSystemOsInfo(params.useSystemOsInfo)
       .withUseSystemJdkVersion(params.useSystemJdkVersion)
+      .withScalaVersion(params.scalaVersionOpt.orNull)
   }
 
   def resolutionParams(params: coursierapi.ResolutionParams): ResolutionParams = {
@@ -200,6 +201,7 @@ object ApiHelper {
       .withExclusions(params.getExclusions.asScala.map { e => (Organization(e.getKey), ModuleName(e.getValue)) }.toSet)
       .withUseSystemOsInfo(params.getUseSystemOsInfo)
       .withUseSystemJdkVersion(params.getUseSystemJdkVersion)
+      .withScalaVersionOpt(Option(params.getScalaVersion))
   }
 
   def cache(cache: coursierapi.Cache): FileCache[Task] = {

diff --git a/interface/src/test/scala/coursierapi/ResolutionParamsTests.scala b/interface/src/test/scala/coursierapi/ResolutionParamsTests.scala
@@ -48,6 +48,7 @@ object ResolutionParamsTests extends TestSuite {
           .addExclusion("org.scala-lang.modules", "*")
           .withUseSystemOsInfo(true)
           .withUseSystemJdkVersion(true)
+          .withScalaVersion("2.14.3")
         val params0 = ApiHelper.resolutionParams(ApiHelper.resolutionParams(params))
 
         assert(params != ResolutionParams.create())