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
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public void simple() throws IOException, InterruptedException {
if (exitCode != 0)
System.err.println("Warning: " + javaBin + " -version command exited with code " + exitCode);

assertTrue(output.contains("openjdk version \"18\""));
assertTrue(output.contains("openjdk version \"18"));
assertTrue(output.contains("Zulu18"));
}
}
11 changes: 11 additions & 0 deletions interface/src/main/java/coursierapi/Version.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package coursierapi;

import coursier.internal.api.ApiHelper;

public final class Version {

public static int compare(String version0, String version1) {
return ApiHelper.compareVersions(version0, version1);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import coursier._
import coursierapi.{Credentials, Logger, SimpleLogger}
import coursier.cache.loggers.RefreshLogger
import coursier.cache.{ArchiveCache, CacheDefaults, CacheLogger, FileCache, UnArchiver}
import coursier.core.{Authentication, Configuration}
import coursier.core.{Authentication, Configuration, Version}
import coursier.error.{CoursierError, FetchError, ResolutionError}
import coursier.ivy.IvyRepository
import coursier.jvm.{JavaHome, JvmCache}
Expand Down Expand Up @@ -552,4 +552,7 @@ object ApiHelper {
javaHome.get(jvmId).unsafeRun()(jvmCache.archiveCache.cache.ec)
}

def compareVersions(version0: String, version1: String): Int =
Version(version0).compareTo(Version(version1))

}
20 changes: 20 additions & 0 deletions interface/src/test/scala/coursierapi/VersionTests.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package coursierapi

import utest._

object VersionTests extends TestSuite {

val tests = Tests {
test("simple") {
test {
assert(Version.compare("1.0.1", "1.2.3") < 0)
}
test {
assert(Version.compare("1.2.3", "1.0.1") > 0)
}
test {
assert(Version.compare("1.0.1", "1.0.1") == 0)
}
}
}
}