From f595f2bc86b704ad7be1c630feaa6e4ea559a7fe Mon Sep 17 00:00:00 2001 From: Johannes Rudolph Date: Mon, 6 Apr 2020 14:26:34 +0200 Subject: [PATCH] actor: streamline cross source directory usage With 2.12 and 2.13 being the last releases of the 2.x series, it's hard to say if we currently still need the 2.13+/- directories. For now it seems more explicit to use simple 2.12/2.13 directories. --- .../akka/dispatch/internal/SameThreadExecutionContext.scala | 0 .../main/{scala-2.13- => scala-2.12}/akka/util/ByteString.scala | 0 .../akka/util/ccompat/CompatImpl.scala | 0 .../akka/util/ccompat/ccompatUsedUntil213.scala | 0 .../{scala-2.13- => scala-2.12}/akka/util/ccompat/package.scala | 0 .../akka/dispatch/internal/SameThreadExecutionContext.scala | 0 .../main/{scala-2.13+ => scala-2.13}/akka/util/ByteIterator.scala | 0 .../main/{scala-2.13+ => scala-2.13}/akka/util/ByteString.scala | 0 .../akka/util/ccompat/ccompatUsedUntil213.scala | 0 .../{scala-2.13+ => scala-2.13}/akka/util/ccompat/package.scala | 0 10 files changed, 0 insertions(+), 0 deletions(-) rename akka-actor/src/main/{scala-2.13- => scala-2.12}/akka/dispatch/internal/SameThreadExecutionContext.scala (100%) rename akka-actor/src/main/{scala-2.13- => scala-2.12}/akka/util/ByteString.scala (100%) rename akka-actor/src/main/{scala-2.13- => scala-2.12}/akka/util/ccompat/CompatImpl.scala (100%) rename akka-actor/src/main/{scala-2.13+ => scala-2.12}/akka/util/ccompat/ccompatUsedUntil213.scala (100%) rename akka-actor/src/main/{scala-2.13- => scala-2.12}/akka/util/ccompat/package.scala (100%) rename akka-actor/src/main/{scala-2.13+ => scala-2.13}/akka/dispatch/internal/SameThreadExecutionContext.scala (100%) rename akka-actor/src/main/{scala-2.13+ => scala-2.13}/akka/util/ByteIterator.scala (100%) rename akka-actor/src/main/{scala-2.13+ => scala-2.13}/akka/util/ByteString.scala (100%) rename akka-actor/src/main/{scala-2.13- => scala-2.13}/akka/util/ccompat/ccompatUsedUntil213.scala (100%) rename akka-actor/src/main/{scala-2.13+ => scala-2.13}/akka/util/ccompat/package.scala (100%) diff --git a/akka-actor/src/main/scala-2.13-/akka/dispatch/internal/SameThreadExecutionContext.scala b/akka-actor/src/main/scala-2.12/akka/dispatch/internal/SameThreadExecutionContext.scala similarity index 100% rename from akka-actor/src/main/scala-2.13-/akka/dispatch/internal/SameThreadExecutionContext.scala rename to akka-actor/src/main/scala-2.12/akka/dispatch/internal/SameThreadExecutionContext.scala diff --git a/akka-actor/src/main/scala-2.13-/akka/util/ByteString.scala b/akka-actor/src/main/scala-2.12/akka/util/ByteString.scala similarity index 100% rename from akka-actor/src/main/scala-2.13-/akka/util/ByteString.scala rename to akka-actor/src/main/scala-2.12/akka/util/ByteString.scala diff --git a/akka-actor/src/main/scala-2.13-/akka/util/ccompat/CompatImpl.scala b/akka-actor/src/main/scala-2.12/akka/util/ccompat/CompatImpl.scala similarity index 100% rename from akka-actor/src/main/scala-2.13-/akka/util/ccompat/CompatImpl.scala rename to akka-actor/src/main/scala-2.12/akka/util/ccompat/CompatImpl.scala diff --git a/akka-actor/src/main/scala-2.13+/akka/util/ccompat/ccompatUsedUntil213.scala b/akka-actor/src/main/scala-2.12/akka/util/ccompat/ccompatUsedUntil213.scala similarity index 100% rename from akka-actor/src/main/scala-2.13+/akka/util/ccompat/ccompatUsedUntil213.scala rename to akka-actor/src/main/scala-2.12/akka/util/ccompat/ccompatUsedUntil213.scala diff --git a/akka-actor/src/main/scala-2.13-/akka/util/ccompat/package.scala b/akka-actor/src/main/scala-2.12/akka/util/ccompat/package.scala similarity index 100% rename from akka-actor/src/main/scala-2.13-/akka/util/ccompat/package.scala rename to akka-actor/src/main/scala-2.12/akka/util/ccompat/package.scala diff --git a/akka-actor/src/main/scala-2.13+/akka/dispatch/internal/SameThreadExecutionContext.scala b/akka-actor/src/main/scala-2.13/akka/dispatch/internal/SameThreadExecutionContext.scala similarity index 100% rename from akka-actor/src/main/scala-2.13+/akka/dispatch/internal/SameThreadExecutionContext.scala rename to akka-actor/src/main/scala-2.13/akka/dispatch/internal/SameThreadExecutionContext.scala diff --git a/akka-actor/src/main/scala-2.13+/akka/util/ByteIterator.scala b/akka-actor/src/main/scala-2.13/akka/util/ByteIterator.scala similarity index 100% rename from akka-actor/src/main/scala-2.13+/akka/util/ByteIterator.scala rename to akka-actor/src/main/scala-2.13/akka/util/ByteIterator.scala diff --git a/akka-actor/src/main/scala-2.13+/akka/util/ByteString.scala b/akka-actor/src/main/scala-2.13/akka/util/ByteString.scala similarity index 100% rename from akka-actor/src/main/scala-2.13+/akka/util/ByteString.scala rename to akka-actor/src/main/scala-2.13/akka/util/ByteString.scala diff --git a/akka-actor/src/main/scala-2.13-/akka/util/ccompat/ccompatUsedUntil213.scala b/akka-actor/src/main/scala-2.13/akka/util/ccompat/ccompatUsedUntil213.scala similarity index 100% rename from akka-actor/src/main/scala-2.13-/akka/util/ccompat/ccompatUsedUntil213.scala rename to akka-actor/src/main/scala-2.13/akka/util/ccompat/ccompatUsedUntil213.scala diff --git a/akka-actor/src/main/scala-2.13+/akka/util/ccompat/package.scala b/akka-actor/src/main/scala-2.13/akka/util/ccompat/package.scala similarity index 100% rename from akka-actor/src/main/scala-2.13+/akka/util/ccompat/package.scala rename to akka-actor/src/main/scala-2.13/akka/util/ccompat/package.scala