Merge branch 'master' into parse_in_synchronizer

hyperledger-labs · Sep 27, 2020 · 960e8db · 960e8db
2 parents 69975ec + ac24a65
commit 960e8db
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/build.sbt b/build.sbt
@@ -5,6 +5,8 @@ name := "scorex-core"
 lazy val commonSettings = Seq(
   scalaVersion := "2.12.10",
   resolvers += Resolver.sonatypeRepo("public"),
+  resolvers += "Maven Central Server" at "https://repo1.maven.org/maven2",
+  resolvers += "Typesafe Server" at "https://repo.typesafe.com/typesafe/releases",
   wartremoverErrors ++= Seq(
     Wart.Recursion,
     Wart.TraversableOps,

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -2,7 +2,7 @@
 logLevel := Level.Warn
 
 // The Typesafe repository
-resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/"
+resolvers += "Typesafe repository" at "https://repo.typesafe.com/typesafe/releases/"
 
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.5")