diff --git a/.gitignore b/.gitignore index f7d6b44db2..9681290485 100644 --- a/.gitignore +++ b/.gitignore @@ -144,3 +144,5 @@ node_modules actor-sdk/sdk-api/api-language/solutions/im.actor.api/source_gen actor-sdk/sdk-api/api-language/solutions/im.actor.api/source_gen.caches actor-sdk/sdk-api/api-language/solutions/im.actor.api/classes_gen + +.DS_Store diff --git a/actor-server/README.md b/actor-server/README.md index 8039c1d144..840a57a3fe 100644 --- a/actor-server/README.md +++ b/actor-server/README.md @@ -1,3 +1,3 @@ # Actor Open Source Server -Actor Platform's Server, for installation instructions visit https://developer.actor.im/ +Actor Platform's Server, for installation instructions visit https://actor.readme.io/docs/welcome diff --git a/actor-server/project/Resolvers.scala b/actor-server/project/Resolvers.scala index 4669f10809..783d285a9d 100644 --- a/actor-server/project/Resolvers.scala +++ b/actor-server/project/Resolvers.scala @@ -18,6 +18,8 @@ object Resolvers { // for akka-rabbitmq (needed by op-rabbit) "SpinGo OSS" at "http://spingo-oss.s3.amazonaws.com/repositories/releases", - Resolver.sonatypeRepo("snapshots") + Resolver.sonatypeRepo("snapshots"), + + "Typesafe" at "https://repo.typesafe.com/typesafe/maven-releases/" ) } diff --git a/actor-server/project/build.properties b/actor-server/project/build.properties index 35c88bab7d..8e682c526d 100644 --- a/actor-server/project/build.properties +++ b/actor-server/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.12 +sbt.version=0.13.18 diff --git a/actor-server/project/lib/sbt-github-release-0.3.0.jar b/actor-server/project/lib/sbt-github-release-0.3.0.jar new file mode 100644 index 0000000000..dc09fb420b Binary files /dev/null and b/actor-server/project/lib/sbt-github-release-0.3.0.jar differ diff --git a/actor-server/project/plugins.sbt b/actor-server/project/plugins.sbt index 37c0933811..5bf74d90f5 100644 --- a/actor-server/project/plugins.sbt +++ b/actor-server/project/plugins.sbt @@ -4,8 +4,8 @@ resolvers ++= Seq( "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/", Resolver.url("actor-sbt-plugins", url("https://dl.bintray.com/actor/sbt-plugins"))(Resolver.ivyStylePatterns), "Flyway" at "http://flywaydb.org/repo", - "Era7 maven releases" at "https://s3-eu-west-1.amazonaws.com/releases.era7.com", - Classpaths.sbtPluginReleases + Classpaths.sbtPluginReleases, + "Github-API" at "http://repo.jenkins-ci.org/public/" ) addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.7.5") @@ -24,7 +24,8 @@ addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.0") addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.0.6") -addSbtPlugin("ohnosequences" % "sbt-github-release" % "0.3.0") +// This version is no longer available in any resolver, so the jar has to be added as an unmanaged dependency +addSbtPlugin("ohnosequences" % "sbt-github-release" % "0.3.0" from "file:///./lib/sbt-github-release-0.3.0.jar") addSbtPlugin("com.typesafe.sbt" % "sbt-aspectj" % "0.10.0") @@ -33,5 +34,6 @@ addSbtPlugin("im.actor" % "actor-sbt-houserules" % "0.1.9") addSbtPlugin("com.typesafe.sbt" % "sbt-multi-jvm" % "0.3.8") libraryDependencies ++= Seq( - "com.github.os72" % "protoc-jar" % "3.0.0-b3" + "com.github.os72" % "protoc-jar" % "3.0.0-b3", + "org.kohsuke" % "github-api" % "1.77" )