Skip to content

Commit

Permalink
fix release version
Browse files Browse the repository at this point in the history
  • Loading branch information
alstanchev committed Oct 11, 2023
1 parent 70d127c commit 53eaa1d
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion project/ProjectSettings.scala
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ object ProjectSettings extends AutoPlugin {

licenses := Seq(("Apache-2.0", new URL("https://www.apache.org/licenses/LICENSE-2.0.txt"))),

) ++ compilerSettings ++ resolverSettings ++ librarySettings ++ testSettings
) ++ compilerSettings ++ resolverSettings ++ scalariFormSettings ++ librarySettings ++ testSettings

lazy val librarySettings: Seq[Def.Setting[Seq[ModuleID]]] = Seq(
libraryDependencies += "org.apache.pekko" %% "pekko-actor" % PekkoV,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ class InMemoryJournalStorage(serialization: Serialization) extends Actor with Ac
.mapValues(_.filter(_.sequenceNr <= toSequenceNr).map { journalEntry =>
val updatedRepr: PersistentRepr = journalEntry.repr.update(deleted = true)
val byteArray: Array[Byte] = serialization.serialize(updatedRepr) match {
case scala.util.Success(arr) => arr
case scala.util.Success(arr) => arr
case scala.util.Failure(cause) => throw cause
}
journalEntry.copy(deleted = true).copy(serialized = byteArray).copy(repr = updatedRepr)
Expand Down Expand Up @@ -148,13 +148,13 @@ class InMemoryJournalStorage(serialization: Serialization) extends Actor with Ac
}

override def receive: Receive = LoggingReceive {
case PersistenceIds => allPersistenceIds(sender())
case HighestSequenceNr(persistenceId, fromSequenceNr) => highestSequenceNr(sender(), persistenceId, fromSequenceNr)
case EventsByTag(tag, offset) => eventsByTag(sender(), tag, offset)
case WriteList(xs) => writelist(sender(), xs)
case Delete(persistenceId, toSequenceNr) => delete(sender(), persistenceId, toSequenceNr)
case PersistenceIds => allPersistenceIds(sender())
case HighestSequenceNr(persistenceId, fromSequenceNr) => highestSequenceNr(sender(), persistenceId, fromSequenceNr)
case EventsByTag(tag, offset) => eventsByTag(sender(), tag, offset)
case WriteList(xs) => writelist(sender(), xs)
case Delete(persistenceId, toSequenceNr) => delete(sender(), persistenceId, toSequenceNr)
case GetJournalEntriesExceptDeleted(persistenceId, fromSequenceNr, toSequenceNr, max) => messages(sender(), persistenceId, fromSequenceNr, toSequenceNr, max, all = false)
case GetAllJournalEntries(persistenceId, fromSequenceNr, toSequenceNr, max) => messages(sender(), persistenceId, fromSequenceNr, toSequenceNr, max, all = true)
case ClearJournal => clear(sender())
case GetAllJournalEntries(persistenceId, fromSequenceNr, toSequenceNr, max) => messages(sender(), persistenceId, fromSequenceNr, toSequenceNr, max, all = true)
case ClearJournal => clear(sender())
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class InMemoryAsyncWriteJournal(config: Config) extends AsyncWriteJournal {
val source = Source(immutable.Iterable(messages));

Source(messages).via(serializer).mapAsync(1) {
case Success(xs) => (journal ? InMemoryJournalStorage.WriteList(xs)).map(_ => Success(()))
case Success(xs) => (journal ? InMemoryJournalStorage.WriteList(xs)).map(_ => Success(()))
case Failure(cause) => Future.successful(Failure(cause))
}.runWith(Sink.seq)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ class InMemoryReadJournal(config: Config, journal: ActorRef)(implicit val system
Source.unfoldAsync[Offset, Seq[EventEnvelope]](offset) { (from: Offset) =>
def nextFromOffset(xs: Seq[EventEnvelope]): Offset = {
if (xs.isEmpty) from else xs.last.offset match {
case Sequence(n) => Sequence(n)
case Sequence(n) => Sequence(n)
case TimeBasedUUID(time) => TimeBasedUUID(UUIDs.startOf(UUIDs.unixTimestamp(time) + 1))
}
}
Expand Down Expand Up @@ -172,10 +172,10 @@ class InMemoryReadJournal(config: Config, journal: ActorRef)(implicit val system
def sequence = Sequence(entry.offset.getOrElse(throw new IllegalStateException("No offset in stream")))

offset match {
case _: Sequence => sequence
case _: TimeBasedUUID => entry.timestamp
case _: Sequence => sequence
case _: TimeBasedUUID => entry.timestamp
case _ if offsetMode.contains("sequence") => sequence
case _ => entry.timestamp
case _ => entry.timestamp
}
}

Expand Down
2 changes: 1 addition & 1 deletion version.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version := "1.1.0-SNAPSHOT"
version := "1.1.0"

0 comments on commit 53eaa1d

Please sign in to comment.