Changed repository URL for downloading Hydra. Fix #27

triplequote · Nov 9, 2017 · 61dc697 · 61dc697
1 parent a9fa4ef
commit 61dc697
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/scala/scala-impl/src/org/jetbrains/plugins/hydra/HydraDownloader.scala b/scala/scala-impl/src/org/jetbrains/plugins/hydra/HydraDownloader.scala
@@ -68,7 +68,7 @@ object HydraDownloader {
     Seq(
       s"""set scalaVersion := "${version.split("_")(0)}"""",
       s"""set credentials := Seq(Credentials("${repositorySettings.repositoryRealm}", "${repositorySettings.repositoryName}", "${repositorySettings.login}", "${repositorySettings.password}"))""",
-      s"""set resolvers := Seq(Resolver.url("Triplequote Plugins Ivy Releases", url("${repositorySettings.repositoryURL}/ivy-releases/"))(Resolver.ivyStylePatterns), Resolver.url("Triplequote sbt-plugin-relseases", url("${repositorySettings.repositoryURL}/sbt-plugins-release/"))(Resolver.ivyStylePatterns),  "Triplequote Plugins Releases" at "${repositorySettings.repositoryURL}/libs-release-local/")""",
+      s"""set resolvers := Seq("Triplequote Plugins Ivy Releases" at "${repositorySettings.repositoryURL}")""",
       s"""set libraryDependencies := Seq("com.triplequote" % "hydra_${version.split("_")(0)}" % "${version.split("_")(1)}", ("com.triplequote" % "hydra-bridge_1_0" % "${version.split("_")(1)}").sources())""",
       "updateClassifiers",
       "show dependencyClasspath")

diff --git a/scala/scala-impl/src/org/jetbrains/plugins/hydra/HydraVersions.scala b/scala/scala-impl/src/org/jetbrains/plugins/hydra/HydraVersions.scala
@@ -19,9 +19,9 @@ object HydraVersions {
   private val CompilerRegex = """.*scala-compiler-(\d+\.\d+\.\d+)(-SNAPSHOT)?\.jar""".r
 
   private val Pattern = ".+>(.*\\d+\\.\\d+\\.\\d+.*)/<.*".r
-  private val HydraURL = "ivy-releases/com.triplequote/"
-  private val MinHydraVersion = Version("0.9.5")
-  private val HardcodedHydraVersions = Seq("0.9.5")
+  private val HydraURL = "com/triplequote/"
+  private val MinHydraVersion = Version("0.9.7")
+  private val HardcodedHydraVersions = Seq(MinHydraVersion.presentation)
 
   private final val Log: Logger = Logger.getInstance(this.getClass.getName)
 

diff --git a/scala/scala-impl/src/org/jetbrains/plugins/hydra/settings/HydraApplicationSettings.scala b/scala/scala-impl/src/org/jetbrains/plugins/hydra/settings/HydraApplicationSettings.scala
@@ -85,7 +85,7 @@ class HydraApplicationSettingsState {
 }
 
 object HydraApplicationSettings {
-  val DefaultHydraRepositoryUrl = "https://repo.triplequote.com/artifactory/"
+  val DefaultHydraRepositoryUrl = "https://repo.triplequote.com/artifactory/libs-release/"
   val DefaultHydraRepositoryRealm = "Artifactory Realm"
   def getInstance(): HydraApplicationSettings = ServiceManager.getService(classOf[HydraApplicationSettings])
 }