From 9a82a44dc76633d3ebaabb977d8febefb3cd9d5a Mon Sep 17 00:00:00 2001 From: Julien Richard-Foy Date: Mon, 28 Oct 2019 09:46:23 +0100 Subject: [PATCH 1/2] Move the collectionContrib project to a collection-contrib subdirectory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is a tentative to address #51 At least now, the `package` task builds a .jar file that contains .class files. The `publishLocal` task, however, still does not build a .jar file containing the .class files. I’ve noticed that `collectionContribJS/publishLocal` builds a correct .jar file. The only difference between the JS and JVM projects is that the JVM project applies the `scalaModuleSettingsJVM` settings, which does something with sbt-osgi, which I didn’t dig into… --- build.sbt | 2 +- .../src}/main/scala/scala/collection/MultiDict.scala | 0 .../src}/main/scala/scala/collection/MultiSet.scala | 0 .../src}/main/scala/scala/collection/SortedMultiDict.scala | 0 .../src}/main/scala/scala/collection/SortedMultiSet.scala | 0 .../scala/scala/collection/decorators/BitSetDecorator.scala | 0 .../scala/scala/collection/decorators/IterableDecorator.scala | 0 .../scala/scala/collection/decorators/IteratorDecorator.scala | 0 .../main/scala/scala/collection/decorators/MapDecorator.scala | 0 .../scala/collection/decorators/MutableBitSetDecorator.scala | 0 .../main/scala/scala/collection/decorators/SeqDecorator.scala | 0 .../src}/main/scala/scala/collection/decorators/package.scala | 0 .../src}/main/scala/scala/collection/decorators/views.scala | 0 .../src}/main/scala/scala/collection/immutable/MultiDict.scala | 0 .../src}/main/scala/scala/collection/immutable/MultiSet.scala | 0 .../main/scala/scala/collection/immutable/SortedMultiDict.scala | 0 .../main/scala/scala/collection/immutable/SortedMultiSet.scala | 0 .../src}/main/scala/scala/collection/mutable/MultiDict.scala | 0 .../src}/main/scala/scala/collection/mutable/MultiSet.scala | 0 .../main/scala/scala/collection/mutable/SortedMultiDict.scala | 0 .../main/scala/scala/collection/mutable/SortedMultiSet.scala | 0 .../src}/test/scala/scala/collection/MultiDictTest.scala | 0 .../src}/test/scala/scala/collection/MultiSetTest.scala | 0 .../src}/test/scala/scala/collection/SortedMultiMapTest.scala | 0 .../src}/test/scala/scala/collection/SortedMultiSetTest.scala | 0 .../scala/scala/collection/decorators/BitSetDecoratorTest.scala | 0 .../scala/collection/decorators/IterableDecoratorTest.scala | 0 .../scala/collection/decorators/IteratorDecoratorTest.scala | 0 .../scala/scala/collection/decorators/MapDecoratorTest.scala | 0 .../collection/decorators/MutableBitSetDecoratorTest.scala | 0 .../scala/scala/collection/decorators/SeqDecoratorTest.scala | 0 .../test/scala/scala/collection/immutable/MultiMapTest.scala | 0 .../test/scala/scala/collection/immutable/MultiSetTest.scala | 0 .../scala/scala/collection/immutable/SortedMultiMapTest.scala | 0 .../scala/scala/collection/immutable/SortedMultiSetTest.scala | 0 .../src}/test/scala/scala/collection/mutable/MultiMapTest.scala | 0 .../src}/test/scala/scala/collection/mutable/MultiSetTest.scala | 0 .../scala/scala/collection/mutable/SortedMultiMapTest.scala | 0 .../scala/scala/collection/mutable/SortedMultiSetTest.scala | 0 39 files changed, 1 insertion(+), 1 deletion(-) rename {src => collection-contrib/src}/main/scala/scala/collection/MultiDict.scala (100%) rename {src => collection-contrib/src}/main/scala/scala/collection/MultiSet.scala (100%) rename {src => collection-contrib/src}/main/scala/scala/collection/SortedMultiDict.scala (100%) rename {src => collection-contrib/src}/main/scala/scala/collection/SortedMultiSet.scala (100%) rename {src => collection-contrib/src}/main/scala/scala/collection/decorators/BitSetDecorator.scala (100%) rename {src => collection-contrib/src}/main/scala/scala/collection/decorators/IterableDecorator.scala (100%) rename {src => collection-contrib/src}/main/scala/scala/collection/decorators/IteratorDecorator.scala (100%) rename {src => collection-contrib/src}/main/scala/scala/collection/decorators/MapDecorator.scala (100%) rename {src => collection-contrib/src}/main/scala/scala/collection/decorators/MutableBitSetDecorator.scala (100%) rename {src => collection-contrib/src}/main/scala/scala/collection/decorators/SeqDecorator.scala (100%) rename {src => collection-contrib/src}/main/scala/scala/collection/decorators/package.scala (100%) rename {src => collection-contrib/src}/main/scala/scala/collection/decorators/views.scala (100%) rename {src => collection-contrib/src}/main/scala/scala/collection/immutable/MultiDict.scala (100%) rename {src => collection-contrib/src}/main/scala/scala/collection/immutable/MultiSet.scala (100%) rename {src => collection-contrib/src}/main/scala/scala/collection/immutable/SortedMultiDict.scala (100%) rename {src => collection-contrib/src}/main/scala/scala/collection/immutable/SortedMultiSet.scala (100%) rename {src => collection-contrib/src}/main/scala/scala/collection/mutable/MultiDict.scala (100%) rename {src => collection-contrib/src}/main/scala/scala/collection/mutable/MultiSet.scala (100%) rename {src => collection-contrib/src}/main/scala/scala/collection/mutable/SortedMultiDict.scala (100%) rename {src => collection-contrib/src}/main/scala/scala/collection/mutable/SortedMultiSet.scala (100%) rename {src => collection-contrib/src}/test/scala/scala/collection/MultiDictTest.scala (100%) rename {src => collection-contrib/src}/test/scala/scala/collection/MultiSetTest.scala (100%) rename {src => collection-contrib/src}/test/scala/scala/collection/SortedMultiMapTest.scala (100%) rename {src => collection-contrib/src}/test/scala/scala/collection/SortedMultiSetTest.scala (100%) rename {src => collection-contrib/src}/test/scala/scala/collection/decorators/BitSetDecoratorTest.scala (100%) rename {src => collection-contrib/src}/test/scala/scala/collection/decorators/IterableDecoratorTest.scala (100%) rename {src => collection-contrib/src}/test/scala/scala/collection/decorators/IteratorDecoratorTest.scala (100%) rename {src => collection-contrib/src}/test/scala/scala/collection/decorators/MapDecoratorTest.scala (100%) rename {src => collection-contrib/src}/test/scala/scala/collection/decorators/MutableBitSetDecoratorTest.scala (100%) rename {src => collection-contrib/src}/test/scala/scala/collection/decorators/SeqDecoratorTest.scala (100%) rename {src => collection-contrib/src}/test/scala/scala/collection/immutable/MultiMapTest.scala (100%) rename {src => collection-contrib/src}/test/scala/scala/collection/immutable/MultiSetTest.scala (100%) rename {src => collection-contrib/src}/test/scala/scala/collection/immutable/SortedMultiMapTest.scala (100%) rename {src => collection-contrib/src}/test/scala/scala/collection/immutable/SortedMultiSetTest.scala (100%) rename {src => collection-contrib/src}/test/scala/scala/collection/mutable/MultiMapTest.scala (100%) rename {src => collection-contrib/src}/test/scala/scala/collection/mutable/MultiSetTest.scala (100%) rename {src => collection-contrib/src}/test/scala/scala/collection/mutable/SortedMultiMapTest.scala (100%) rename {src => collection-contrib/src}/test/scala/scala/collection/mutable/SortedMultiSetTest.scala (100%) diff --git a/build.sbt b/build.sbt index dab1f19..ac93033 100644 --- a/build.sbt +++ b/build.sbt @@ -7,7 +7,7 @@ Test/sources := Nil lazy val collectionContrib = crossProject(JVMPlatform, JSPlatform) .withoutSuffixFor(JVMPlatform) .crossType(CrossType.Pure) - .in(file(".")) + .in(file("collection-contrib")) .settings(ScalaModulePlugin.scalaModuleSettings) // as per #71, we are not currently attempting to support OSGi in this repo .disablePlugins(SbtOsgi) diff --git a/src/main/scala/scala/collection/MultiDict.scala b/collection-contrib/src/main/scala/scala/collection/MultiDict.scala similarity index 100% rename from src/main/scala/scala/collection/MultiDict.scala rename to collection-contrib/src/main/scala/scala/collection/MultiDict.scala diff --git a/src/main/scala/scala/collection/MultiSet.scala b/collection-contrib/src/main/scala/scala/collection/MultiSet.scala similarity index 100% rename from src/main/scala/scala/collection/MultiSet.scala rename to collection-contrib/src/main/scala/scala/collection/MultiSet.scala diff --git a/src/main/scala/scala/collection/SortedMultiDict.scala b/collection-contrib/src/main/scala/scala/collection/SortedMultiDict.scala similarity index 100% rename from src/main/scala/scala/collection/SortedMultiDict.scala rename to collection-contrib/src/main/scala/scala/collection/SortedMultiDict.scala diff --git a/src/main/scala/scala/collection/SortedMultiSet.scala b/collection-contrib/src/main/scala/scala/collection/SortedMultiSet.scala similarity index 100% rename from src/main/scala/scala/collection/SortedMultiSet.scala rename to collection-contrib/src/main/scala/scala/collection/SortedMultiSet.scala diff --git a/src/main/scala/scala/collection/decorators/BitSetDecorator.scala b/collection-contrib/src/main/scala/scala/collection/decorators/BitSetDecorator.scala similarity index 100% rename from src/main/scala/scala/collection/decorators/BitSetDecorator.scala rename to collection-contrib/src/main/scala/scala/collection/decorators/BitSetDecorator.scala diff --git a/src/main/scala/scala/collection/decorators/IterableDecorator.scala b/collection-contrib/src/main/scala/scala/collection/decorators/IterableDecorator.scala similarity index 100% rename from src/main/scala/scala/collection/decorators/IterableDecorator.scala rename to collection-contrib/src/main/scala/scala/collection/decorators/IterableDecorator.scala diff --git a/src/main/scala/scala/collection/decorators/IteratorDecorator.scala b/collection-contrib/src/main/scala/scala/collection/decorators/IteratorDecorator.scala similarity index 100% rename from src/main/scala/scala/collection/decorators/IteratorDecorator.scala rename to collection-contrib/src/main/scala/scala/collection/decorators/IteratorDecorator.scala diff --git a/src/main/scala/scala/collection/decorators/MapDecorator.scala b/collection-contrib/src/main/scala/scala/collection/decorators/MapDecorator.scala similarity index 100% rename from src/main/scala/scala/collection/decorators/MapDecorator.scala rename to collection-contrib/src/main/scala/scala/collection/decorators/MapDecorator.scala diff --git a/src/main/scala/scala/collection/decorators/MutableBitSetDecorator.scala b/collection-contrib/src/main/scala/scala/collection/decorators/MutableBitSetDecorator.scala similarity index 100% rename from src/main/scala/scala/collection/decorators/MutableBitSetDecorator.scala rename to collection-contrib/src/main/scala/scala/collection/decorators/MutableBitSetDecorator.scala diff --git a/src/main/scala/scala/collection/decorators/SeqDecorator.scala b/collection-contrib/src/main/scala/scala/collection/decorators/SeqDecorator.scala similarity index 100% rename from src/main/scala/scala/collection/decorators/SeqDecorator.scala rename to collection-contrib/src/main/scala/scala/collection/decorators/SeqDecorator.scala diff --git a/src/main/scala/scala/collection/decorators/package.scala b/collection-contrib/src/main/scala/scala/collection/decorators/package.scala similarity index 100% rename from src/main/scala/scala/collection/decorators/package.scala rename to collection-contrib/src/main/scala/scala/collection/decorators/package.scala diff --git a/src/main/scala/scala/collection/decorators/views.scala b/collection-contrib/src/main/scala/scala/collection/decorators/views.scala similarity index 100% rename from src/main/scala/scala/collection/decorators/views.scala rename to collection-contrib/src/main/scala/scala/collection/decorators/views.scala diff --git a/src/main/scala/scala/collection/immutable/MultiDict.scala b/collection-contrib/src/main/scala/scala/collection/immutable/MultiDict.scala similarity index 100% rename from src/main/scala/scala/collection/immutable/MultiDict.scala rename to collection-contrib/src/main/scala/scala/collection/immutable/MultiDict.scala diff --git a/src/main/scala/scala/collection/immutable/MultiSet.scala b/collection-contrib/src/main/scala/scala/collection/immutable/MultiSet.scala similarity index 100% rename from src/main/scala/scala/collection/immutable/MultiSet.scala rename to collection-contrib/src/main/scala/scala/collection/immutable/MultiSet.scala diff --git a/src/main/scala/scala/collection/immutable/SortedMultiDict.scala b/collection-contrib/src/main/scala/scala/collection/immutable/SortedMultiDict.scala similarity index 100% rename from src/main/scala/scala/collection/immutable/SortedMultiDict.scala rename to collection-contrib/src/main/scala/scala/collection/immutable/SortedMultiDict.scala diff --git a/src/main/scala/scala/collection/immutable/SortedMultiSet.scala b/collection-contrib/src/main/scala/scala/collection/immutable/SortedMultiSet.scala similarity index 100% rename from src/main/scala/scala/collection/immutable/SortedMultiSet.scala rename to collection-contrib/src/main/scala/scala/collection/immutable/SortedMultiSet.scala diff --git a/src/main/scala/scala/collection/mutable/MultiDict.scala b/collection-contrib/src/main/scala/scala/collection/mutable/MultiDict.scala similarity index 100% rename from src/main/scala/scala/collection/mutable/MultiDict.scala rename to collection-contrib/src/main/scala/scala/collection/mutable/MultiDict.scala diff --git a/src/main/scala/scala/collection/mutable/MultiSet.scala b/collection-contrib/src/main/scala/scala/collection/mutable/MultiSet.scala similarity index 100% rename from src/main/scala/scala/collection/mutable/MultiSet.scala rename to collection-contrib/src/main/scala/scala/collection/mutable/MultiSet.scala diff --git a/src/main/scala/scala/collection/mutable/SortedMultiDict.scala b/collection-contrib/src/main/scala/scala/collection/mutable/SortedMultiDict.scala similarity index 100% rename from src/main/scala/scala/collection/mutable/SortedMultiDict.scala rename to collection-contrib/src/main/scala/scala/collection/mutable/SortedMultiDict.scala diff --git a/src/main/scala/scala/collection/mutable/SortedMultiSet.scala b/collection-contrib/src/main/scala/scala/collection/mutable/SortedMultiSet.scala similarity index 100% rename from src/main/scala/scala/collection/mutable/SortedMultiSet.scala rename to collection-contrib/src/main/scala/scala/collection/mutable/SortedMultiSet.scala diff --git a/src/test/scala/scala/collection/MultiDictTest.scala b/collection-contrib/src/test/scala/scala/collection/MultiDictTest.scala similarity index 100% rename from src/test/scala/scala/collection/MultiDictTest.scala rename to collection-contrib/src/test/scala/scala/collection/MultiDictTest.scala diff --git a/src/test/scala/scala/collection/MultiSetTest.scala b/collection-contrib/src/test/scala/scala/collection/MultiSetTest.scala similarity index 100% rename from src/test/scala/scala/collection/MultiSetTest.scala rename to collection-contrib/src/test/scala/scala/collection/MultiSetTest.scala diff --git a/src/test/scala/scala/collection/SortedMultiMapTest.scala b/collection-contrib/src/test/scala/scala/collection/SortedMultiMapTest.scala similarity index 100% rename from src/test/scala/scala/collection/SortedMultiMapTest.scala rename to collection-contrib/src/test/scala/scala/collection/SortedMultiMapTest.scala diff --git a/src/test/scala/scala/collection/SortedMultiSetTest.scala b/collection-contrib/src/test/scala/scala/collection/SortedMultiSetTest.scala similarity index 100% rename from src/test/scala/scala/collection/SortedMultiSetTest.scala rename to collection-contrib/src/test/scala/scala/collection/SortedMultiSetTest.scala diff --git a/src/test/scala/scala/collection/decorators/BitSetDecoratorTest.scala b/collection-contrib/src/test/scala/scala/collection/decorators/BitSetDecoratorTest.scala similarity index 100% rename from src/test/scala/scala/collection/decorators/BitSetDecoratorTest.scala rename to collection-contrib/src/test/scala/scala/collection/decorators/BitSetDecoratorTest.scala diff --git a/src/test/scala/scala/collection/decorators/IterableDecoratorTest.scala b/collection-contrib/src/test/scala/scala/collection/decorators/IterableDecoratorTest.scala similarity index 100% rename from src/test/scala/scala/collection/decorators/IterableDecoratorTest.scala rename to collection-contrib/src/test/scala/scala/collection/decorators/IterableDecoratorTest.scala diff --git a/src/test/scala/scala/collection/decorators/IteratorDecoratorTest.scala b/collection-contrib/src/test/scala/scala/collection/decorators/IteratorDecoratorTest.scala similarity index 100% rename from src/test/scala/scala/collection/decorators/IteratorDecoratorTest.scala rename to collection-contrib/src/test/scala/scala/collection/decorators/IteratorDecoratorTest.scala diff --git a/src/test/scala/scala/collection/decorators/MapDecoratorTest.scala b/collection-contrib/src/test/scala/scala/collection/decorators/MapDecoratorTest.scala similarity index 100% rename from src/test/scala/scala/collection/decorators/MapDecoratorTest.scala rename to collection-contrib/src/test/scala/scala/collection/decorators/MapDecoratorTest.scala diff --git a/src/test/scala/scala/collection/decorators/MutableBitSetDecoratorTest.scala b/collection-contrib/src/test/scala/scala/collection/decorators/MutableBitSetDecoratorTest.scala similarity index 100% rename from src/test/scala/scala/collection/decorators/MutableBitSetDecoratorTest.scala rename to collection-contrib/src/test/scala/scala/collection/decorators/MutableBitSetDecoratorTest.scala diff --git a/src/test/scala/scala/collection/decorators/SeqDecoratorTest.scala b/collection-contrib/src/test/scala/scala/collection/decorators/SeqDecoratorTest.scala similarity index 100% rename from src/test/scala/scala/collection/decorators/SeqDecoratorTest.scala rename to collection-contrib/src/test/scala/scala/collection/decorators/SeqDecoratorTest.scala diff --git a/src/test/scala/scala/collection/immutable/MultiMapTest.scala b/collection-contrib/src/test/scala/scala/collection/immutable/MultiMapTest.scala similarity index 100% rename from src/test/scala/scala/collection/immutable/MultiMapTest.scala rename to collection-contrib/src/test/scala/scala/collection/immutable/MultiMapTest.scala diff --git a/src/test/scala/scala/collection/immutable/MultiSetTest.scala b/collection-contrib/src/test/scala/scala/collection/immutable/MultiSetTest.scala similarity index 100% rename from src/test/scala/scala/collection/immutable/MultiSetTest.scala rename to collection-contrib/src/test/scala/scala/collection/immutable/MultiSetTest.scala diff --git a/src/test/scala/scala/collection/immutable/SortedMultiMapTest.scala b/collection-contrib/src/test/scala/scala/collection/immutable/SortedMultiMapTest.scala similarity index 100% rename from src/test/scala/scala/collection/immutable/SortedMultiMapTest.scala rename to collection-contrib/src/test/scala/scala/collection/immutable/SortedMultiMapTest.scala diff --git a/src/test/scala/scala/collection/immutable/SortedMultiSetTest.scala b/collection-contrib/src/test/scala/scala/collection/immutable/SortedMultiSetTest.scala similarity index 100% rename from src/test/scala/scala/collection/immutable/SortedMultiSetTest.scala rename to collection-contrib/src/test/scala/scala/collection/immutable/SortedMultiSetTest.scala diff --git a/src/test/scala/scala/collection/mutable/MultiMapTest.scala b/collection-contrib/src/test/scala/scala/collection/mutable/MultiMapTest.scala similarity index 100% rename from src/test/scala/scala/collection/mutable/MultiMapTest.scala rename to collection-contrib/src/test/scala/scala/collection/mutable/MultiMapTest.scala diff --git a/src/test/scala/scala/collection/mutable/MultiSetTest.scala b/collection-contrib/src/test/scala/scala/collection/mutable/MultiSetTest.scala similarity index 100% rename from src/test/scala/scala/collection/mutable/MultiSetTest.scala rename to collection-contrib/src/test/scala/scala/collection/mutable/MultiSetTest.scala diff --git a/src/test/scala/scala/collection/mutable/SortedMultiMapTest.scala b/collection-contrib/src/test/scala/scala/collection/mutable/SortedMultiMapTest.scala similarity index 100% rename from src/test/scala/scala/collection/mutable/SortedMultiMapTest.scala rename to collection-contrib/src/test/scala/scala/collection/mutable/SortedMultiMapTest.scala diff --git a/src/test/scala/scala/collection/mutable/SortedMultiSetTest.scala b/collection-contrib/src/test/scala/scala/collection/mutable/SortedMultiSetTest.scala similarity index 100% rename from src/test/scala/scala/collection/mutable/SortedMultiSetTest.scala rename to collection-contrib/src/test/scala/scala/collection/mutable/SortedMultiSetTest.scala From eb93d213264ca7254d54fe231753df77efd80bb2 Mon Sep 17 00:00:00 2001 From: Julien Richard-Foy Date: Wed, 1 Jan 2020 14:56:44 +0100 Subject: [PATCH 2/2] Remove unnecessary settings --- build.sbt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/build.sbt b/build.sbt index ac93033..5e846dd 100644 --- a/build.sbt +++ b/build.sbt @@ -1,9 +1,5 @@ import sbtcrossproject.CrossPlugin.autoImport.{CrossType, crossProject} -// With CrossType.Pure, the root project also picks up the sources in `src` -Compile/sources := Nil -Test/sources := Nil - lazy val collectionContrib = crossProject(JVMPlatform, JSPlatform) .withoutSuffixFor(JVMPlatform) .crossType(CrossType.Pure)