From ca6704b6b0cf0b47ef298744989ff58711b8dbc8 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Fri, 12 Aug 2022 09:38:06 -0400 Subject: [PATCH] Move out data classes to its own subproject --- build.sbt | 18 ++++++++++++++++-- .../lmcoursier/CoursierConfiguration.scala | 0 .../scala/lmcoursier/FallbackDependency.scala | 0 .../lmcoursier/credentials/Credentials.scala | 1 + .../credentials/DirectCredentials.scala | 0 .../credentials/FileCredentials.scala | 0 .../lmcoursier/definitions/Attributes.scala | 0 .../definitions/Authentication.scala | 0 .../lmcoursier/definitions/CacheLogger.scala | 1 + .../lmcoursier/definitions/CachePolicy.scala | 1 + .../lmcoursier/definitions/DateTime.scala | 0 .../lmcoursier/definitions/Definitions.scala | 1 + .../lmcoursier/definitions/Dependency.scala | 0 .../lmcoursier/definitions/Developer.scala | 0 .../lmcoursier/definitions/FromCoursier.scala | 1 + .../scala/lmcoursier/definitions/Info.scala | 0 .../scala/lmcoursier/definitions/Module.scala | 0 .../definitions/ModuleMatchers.scala | 0 .../scala/lmcoursier/definitions/Project.scala | 0 .../lmcoursier/definitions/Publication.scala | 0 .../definitions/Reconciliation.scala | 1 + .../scala/lmcoursier/definitions/Strict.scala | 0 .../lmcoursier/definitions/CachePolicy.scala | 2 +- 23 files changed, 23 insertions(+), 3 deletions(-) rename modules/{lm-coursier => definitions}/src/main/scala/lmcoursier/CoursierConfiguration.scala (100%) rename modules/{lm-coursier => definitions}/src/main/scala/lmcoursier/FallbackDependency.scala (100%) create mode 120000 modules/definitions/src/main/scala/lmcoursier/credentials/Credentials.scala rename modules/{lm-coursier => definitions}/src/main/scala/lmcoursier/credentials/DirectCredentials.scala (100%) rename modules/{lm-coursier => definitions}/src/main/scala/lmcoursier/credentials/FileCredentials.scala (100%) rename modules/{lm-coursier => definitions}/src/main/scala/lmcoursier/definitions/Attributes.scala (100%) rename modules/{lm-coursier => definitions}/src/main/scala/lmcoursier/definitions/Authentication.scala (100%) create mode 120000 modules/definitions/src/main/scala/lmcoursier/definitions/CacheLogger.scala create mode 120000 modules/definitions/src/main/scala/lmcoursier/definitions/CachePolicy.scala rename modules/{lm-coursier => definitions}/src/main/scala/lmcoursier/definitions/DateTime.scala (100%) create mode 120000 modules/definitions/src/main/scala/lmcoursier/definitions/Definitions.scala rename modules/{lm-coursier => definitions}/src/main/scala/lmcoursier/definitions/Dependency.scala (100%) rename modules/{lm-coursier => definitions}/src/main/scala/lmcoursier/definitions/Developer.scala (100%) create mode 120000 modules/definitions/src/main/scala/lmcoursier/definitions/FromCoursier.scala rename modules/{lm-coursier => definitions}/src/main/scala/lmcoursier/definitions/Info.scala (100%) rename modules/{lm-coursier => definitions}/src/main/scala/lmcoursier/definitions/Module.scala (100%) rename modules/{lm-coursier => definitions}/src/main/scala/lmcoursier/definitions/ModuleMatchers.scala (100%) rename modules/{lm-coursier => definitions}/src/main/scala/lmcoursier/definitions/Project.scala (100%) rename modules/{lm-coursier => definitions}/src/main/scala/lmcoursier/definitions/Publication.scala (100%) create mode 120000 modules/definitions/src/main/scala/lmcoursier/definitions/Reconciliation.scala rename modules/{lm-coursier => definitions}/src/main/scala/lmcoursier/definitions/Strict.scala (100%) diff --git a/build.sbt b/build.sbt index 65331d7b4..afea3ec86 100644 --- a/build.sbt +++ b/build.sbt @@ -26,8 +26,23 @@ def lmIvy = Def.setting { } } +lazy val definitions = project + .in(file("modules/definitions")) + .disablePlugins(MimaPlugin) + .settings( + shared, + crossScalaVersions := Seq(scala212, scala213), + libraryDependencies ++= Seq( + "io.get-coursier" %% "coursier" % coursierVersion0, + "io.github.alexarchambault" %% "data-class" % "0.2.5" % Provided, + lmIvy.value, + ), + dontPublish, + ) + lazy val `lm-coursier` = project .in(file("modules/lm-coursier")) + .dependsOn(definitions) .settings( shared, crossScalaVersions := Seq(scala212, scala213), @@ -35,7 +50,6 @@ lazy val `lm-coursier` = project Mima.lmCoursierFilters, libraryDependencies ++= Seq( "io.get-coursier" %% "coursier" % coursierVersion0, - "io.github.alexarchambault" %% "data-class" % "0.2.5" % Provided, // We depend on librarymanagement-ivy rather than just // librarymanagement-core to handle the ModuleDescriptor passed // to DependencyResolutionInterface.update, which is an @@ -61,6 +75,7 @@ lazy val `lm-coursier` = project lazy val `lm-coursier-shaded` = project .in(file("modules/lm-coursier/target/shaded-module")) .enablePlugins(ShadingPlugin) + .dependsOn(definitions) .settings( shared, crossScalaVersions := Seq(scala212, scala213), @@ -101,7 +116,6 @@ lazy val `lm-coursier-shaded` = project }, libraryDependencies ++= Seq( "io.get-coursier" %% "coursier" % coursierVersion0, - "io.github.alexarchambault" %% "data-class" % "0.2.5" % Provided, "org.scala-lang.modules" %% "scala-collection-compat" % "2.8.1", "org.scala-lang.modules" %% "scala-xml" % "1.3.0", // depending on that one so that it doesn't get shaded lmIvy.value, diff --git a/modules/lm-coursier/src/main/scala/lmcoursier/CoursierConfiguration.scala b/modules/definitions/src/main/scala/lmcoursier/CoursierConfiguration.scala similarity index 100% rename from modules/lm-coursier/src/main/scala/lmcoursier/CoursierConfiguration.scala rename to modules/definitions/src/main/scala/lmcoursier/CoursierConfiguration.scala diff --git a/modules/lm-coursier/src/main/scala/lmcoursier/FallbackDependency.scala b/modules/definitions/src/main/scala/lmcoursier/FallbackDependency.scala similarity index 100% rename from modules/lm-coursier/src/main/scala/lmcoursier/FallbackDependency.scala rename to modules/definitions/src/main/scala/lmcoursier/FallbackDependency.scala diff --git a/modules/definitions/src/main/scala/lmcoursier/credentials/Credentials.scala b/modules/definitions/src/main/scala/lmcoursier/credentials/Credentials.scala new file mode 120000 index 000000000..cd85138e1 --- /dev/null +++ b/modules/definitions/src/main/scala/lmcoursier/credentials/Credentials.scala @@ -0,0 +1 @@ +../../../../../../lm-coursier/src/main/scala/lmcoursier/credentials/Credentials.scala \ No newline at end of file diff --git a/modules/lm-coursier/src/main/scala/lmcoursier/credentials/DirectCredentials.scala b/modules/definitions/src/main/scala/lmcoursier/credentials/DirectCredentials.scala similarity index 100% rename from modules/lm-coursier/src/main/scala/lmcoursier/credentials/DirectCredentials.scala rename to modules/definitions/src/main/scala/lmcoursier/credentials/DirectCredentials.scala diff --git a/modules/lm-coursier/src/main/scala/lmcoursier/credentials/FileCredentials.scala b/modules/definitions/src/main/scala/lmcoursier/credentials/FileCredentials.scala similarity index 100% rename from modules/lm-coursier/src/main/scala/lmcoursier/credentials/FileCredentials.scala rename to modules/definitions/src/main/scala/lmcoursier/credentials/FileCredentials.scala diff --git a/modules/lm-coursier/src/main/scala/lmcoursier/definitions/Attributes.scala b/modules/definitions/src/main/scala/lmcoursier/definitions/Attributes.scala similarity index 100% rename from modules/lm-coursier/src/main/scala/lmcoursier/definitions/Attributes.scala rename to modules/definitions/src/main/scala/lmcoursier/definitions/Attributes.scala diff --git a/modules/lm-coursier/src/main/scala/lmcoursier/definitions/Authentication.scala b/modules/definitions/src/main/scala/lmcoursier/definitions/Authentication.scala similarity index 100% rename from modules/lm-coursier/src/main/scala/lmcoursier/definitions/Authentication.scala rename to modules/definitions/src/main/scala/lmcoursier/definitions/Authentication.scala diff --git a/modules/definitions/src/main/scala/lmcoursier/definitions/CacheLogger.scala b/modules/definitions/src/main/scala/lmcoursier/definitions/CacheLogger.scala new file mode 120000 index 000000000..24bba6949 --- /dev/null +++ b/modules/definitions/src/main/scala/lmcoursier/definitions/CacheLogger.scala @@ -0,0 +1 @@ +../../../../../../lm-coursier/src/main/scala/lmcoursier/definitions/CacheLogger.scala \ No newline at end of file diff --git a/modules/definitions/src/main/scala/lmcoursier/definitions/CachePolicy.scala b/modules/definitions/src/main/scala/lmcoursier/definitions/CachePolicy.scala new file mode 120000 index 000000000..f78933cc5 --- /dev/null +++ b/modules/definitions/src/main/scala/lmcoursier/definitions/CachePolicy.scala @@ -0,0 +1 @@ +../../../../../../lm-coursier/src/main/scala/lmcoursier/definitions/CachePolicy.scala \ No newline at end of file diff --git a/modules/lm-coursier/src/main/scala/lmcoursier/definitions/DateTime.scala b/modules/definitions/src/main/scala/lmcoursier/definitions/DateTime.scala similarity index 100% rename from modules/lm-coursier/src/main/scala/lmcoursier/definitions/DateTime.scala rename to modules/definitions/src/main/scala/lmcoursier/definitions/DateTime.scala diff --git a/modules/definitions/src/main/scala/lmcoursier/definitions/Definitions.scala b/modules/definitions/src/main/scala/lmcoursier/definitions/Definitions.scala new file mode 120000 index 000000000..3b8d411c7 --- /dev/null +++ b/modules/definitions/src/main/scala/lmcoursier/definitions/Definitions.scala @@ -0,0 +1 @@ +../../../../../../lm-coursier/src/main/scala/lmcoursier/definitions/Definitions.scala \ No newline at end of file diff --git a/modules/lm-coursier/src/main/scala/lmcoursier/definitions/Dependency.scala b/modules/definitions/src/main/scala/lmcoursier/definitions/Dependency.scala similarity index 100% rename from modules/lm-coursier/src/main/scala/lmcoursier/definitions/Dependency.scala rename to modules/definitions/src/main/scala/lmcoursier/definitions/Dependency.scala diff --git a/modules/lm-coursier/src/main/scala/lmcoursier/definitions/Developer.scala b/modules/definitions/src/main/scala/lmcoursier/definitions/Developer.scala similarity index 100% rename from modules/lm-coursier/src/main/scala/lmcoursier/definitions/Developer.scala rename to modules/definitions/src/main/scala/lmcoursier/definitions/Developer.scala diff --git a/modules/definitions/src/main/scala/lmcoursier/definitions/FromCoursier.scala b/modules/definitions/src/main/scala/lmcoursier/definitions/FromCoursier.scala new file mode 120000 index 000000000..e79438aa1 --- /dev/null +++ b/modules/definitions/src/main/scala/lmcoursier/definitions/FromCoursier.scala @@ -0,0 +1 @@ +../../../../../../lm-coursier/src/main/scala/lmcoursier/definitions/FromCoursier.scala \ No newline at end of file diff --git a/modules/lm-coursier/src/main/scala/lmcoursier/definitions/Info.scala b/modules/definitions/src/main/scala/lmcoursier/definitions/Info.scala similarity index 100% rename from modules/lm-coursier/src/main/scala/lmcoursier/definitions/Info.scala rename to modules/definitions/src/main/scala/lmcoursier/definitions/Info.scala diff --git a/modules/lm-coursier/src/main/scala/lmcoursier/definitions/Module.scala b/modules/definitions/src/main/scala/lmcoursier/definitions/Module.scala similarity index 100% rename from modules/lm-coursier/src/main/scala/lmcoursier/definitions/Module.scala rename to modules/definitions/src/main/scala/lmcoursier/definitions/Module.scala diff --git a/modules/lm-coursier/src/main/scala/lmcoursier/definitions/ModuleMatchers.scala b/modules/definitions/src/main/scala/lmcoursier/definitions/ModuleMatchers.scala similarity index 100% rename from modules/lm-coursier/src/main/scala/lmcoursier/definitions/ModuleMatchers.scala rename to modules/definitions/src/main/scala/lmcoursier/definitions/ModuleMatchers.scala diff --git a/modules/lm-coursier/src/main/scala/lmcoursier/definitions/Project.scala b/modules/definitions/src/main/scala/lmcoursier/definitions/Project.scala similarity index 100% rename from modules/lm-coursier/src/main/scala/lmcoursier/definitions/Project.scala rename to modules/definitions/src/main/scala/lmcoursier/definitions/Project.scala diff --git a/modules/lm-coursier/src/main/scala/lmcoursier/definitions/Publication.scala b/modules/definitions/src/main/scala/lmcoursier/definitions/Publication.scala similarity index 100% rename from modules/lm-coursier/src/main/scala/lmcoursier/definitions/Publication.scala rename to modules/definitions/src/main/scala/lmcoursier/definitions/Publication.scala diff --git a/modules/definitions/src/main/scala/lmcoursier/definitions/Reconciliation.scala b/modules/definitions/src/main/scala/lmcoursier/definitions/Reconciliation.scala new file mode 120000 index 000000000..46a1687de --- /dev/null +++ b/modules/definitions/src/main/scala/lmcoursier/definitions/Reconciliation.scala @@ -0,0 +1 @@ +../../../../../../lm-coursier/src/main/scala/lmcoursier/definitions/Reconciliation.scala \ No newline at end of file diff --git a/modules/lm-coursier/src/main/scala/lmcoursier/definitions/Strict.scala b/modules/definitions/src/main/scala/lmcoursier/definitions/Strict.scala similarity index 100% rename from modules/lm-coursier/src/main/scala/lmcoursier/definitions/Strict.scala rename to modules/definitions/src/main/scala/lmcoursier/definitions/Strict.scala diff --git a/modules/lm-coursier/src/main/scala/lmcoursier/definitions/CachePolicy.scala b/modules/lm-coursier/src/main/scala/lmcoursier/definitions/CachePolicy.scala index 6ad3acc1e..a0c479f4a 100644 --- a/modules/lm-coursier/src/main/scala/lmcoursier/definitions/CachePolicy.scala +++ b/modules/lm-coursier/src/main/scala/lmcoursier/definitions/CachePolicy.scala @@ -6,7 +6,7 @@ object CachePolicy { /* NOTE: the following comments are copied from coursier.cache.CachePolicy for the benefit of users within an IDE that reads the javadocs. Please keep in sync from the original ADT. */ - + /** Only pick local files, possibly from the cache. Don't try to download anything. */ case object LocalOnly extends CachePolicy