Skip to content

Fixed new compile issue #6 (wrong artifact for sbt.io) #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 15, 2017
Merged

Fixed new compile issue #6 (wrong artifact for sbt.io) #7

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bfde837
Moved RateLimiter.scala (without any CircuitBreaker mind you) back to…
phderome Apr 2, 2017
6bb506b
Merge branch 'master' into master
rkuhn Apr 13, 2017
ef65d18
Merge remote-tracking branch 'upstream/master'
phderome Apr 13, 2017
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions ...esignpatterns/chapter13/RateLimiter.scala → ...esignpatterns/chapter12/RateLimiter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package com.reactivedesignpatterns.chapter13
package com.reactivedesignpatterns.chapter12

import scala.concurrent.duration.FiniteDuration
import scala.concurrent.duration.Deadline
import scala.concurrent.Future
import scala.concurrent.duration.{Deadline, FiniteDuration}

case object RateLimitExceeded extends RuntimeException

Expand Down
4 changes: 0 additions & 4 deletions chapter13/src/main/scala/com/reactivedesignpatterns/chapter13/ActivePassive.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,13 @@
*/
package com.reactivedesignpatterns.chapter13

import sbt.IO
import play.api.libs.json._
import java.io.File
import akka.actor._
import scala.collection.mutable.Queue
import akka.cluster.Cluster
import scala.concurrent.duration._
import scala.collection.immutable.TreeMap
import scala.concurrent.forkjoin.ThreadLocalRandom
import scala.util.Random
import scala.annotation.tailrec
import akka.cluster.singleton.ClusterSingletonManager
import akka.cluster.singleton.ClusterSingletonProxy
import akka.cluster.singleton.ClusterSingletonManagerSettings
Expand Down
2 changes: 1 addition & 1 deletion chapter13/src/main/scala/com/reactivedesignpatterns/chapter13/KVStoreUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package com.reactivedesignpatterns.chapter13

import play.api.libs.json.JsValue
import java.io.File
import sbt.IO
import sbt.io.IO
import play.api.libs.json.Json
import akka.actor.ActorRef

Expand Down
0 ...terns/chapter12/MultiMasterCRDTSpec.scala → ...terns/chapter13/MultiMasterCRDTSpec.scala
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion project/Build.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ object Build {

val amazonAWS = "com.amazonaws" % "aws-java-sdk" % "1.11.109"

val sbtIO = "org.scala-sbt" %% "io" % "0.13.8"
val sbtIO = "org.scala-sbt" %% "io" % "1.0.0-M9"

val scalaAsync = "org.scala-lang.modules" %% "scala-async" % "0.9.2"
val scalaJava8 = "org.scala-lang.modules" %% "scala-java8-compat" % "0.7.0"
Expand Down