diff --git a/djsbdfjbdf b/djsbdfjbdf new file mode 100644 index 000000000..0689cfc1e --- /dev/null +++ b/djsbdfjbdf @@ -0,0 +1,87 @@ +f049b7f0 (HEAD -> add-compiler-plugin-model, origin/add-compiler-plugin-model) Handle CompilerPlugin in all pattern matches in Artifact.scalaaaa +6201ba08 Handle CompilerPlugin in all pattern matches in Artifact.scalaA +1a915bd5 Handle CompilerPlugin in all pattern matches in Artifact.scala +8658787e Add CompilerPlugin to Platform model and update filters +a64b54c3 (origin/main, origin/HEAD, main, add-compiler-plugin-fix) Merge pull request #1605 from vidishagawas121/making-changes +58d678ca docs: add GSoC midterm evaluation post to README +d4e3a3ff Merge pull request #1604 from adpi2/fix-jetbrains-org +163cebe0 Fix test +272518a4 Switch prod to icvm0032 +10a92951 Fix indexing of sbt plugin +39743fbf Merge pull request #1588 from JD557/support-ssh-scm-urls +9b4484af Merge pull request #1591 from scalacenter/update/pekko-actor-typed-1.1.4 +9292260b Merge pull request #1599 from scalacenter/update/jsoup-1.21.1 +6f503f78 Merge pull request #1601 from scalacenter/update/elasticsearch-1.21.3 +fd43ecbd Merge pull request #1600 from scalacenter/update/sbt-twirl-2.0.9 +c89619a3 (origin/update/jsoup-1.21.1) Merge branch 'main' into update/jsoup-1.21.1 +26b68d2d Merge pull request #1597 from scalacenter/update/maven-model-builder-4.0.0-rc-4 +856007af (origin/update/pekko-actor-typed-1.1.4) Merge branch 'main' into update/pekko-actor-typed-1.1.4 +d940c19c Merge pull request #1586 from scalacenter/update/pekko-http-1.2.0 +b0751924 Merge pull request #1581 from scalacenter/update/sbt-scalajs-1.19.0 +ea0d3074 Merge pull request #1575 from scalacenter/update/swagger-ui-5.20.7 +e974d021 Merge pull request #1570 from scalacenter/update/sbt-1.10.11 +9be52119 Merge pull request #1567 from scalacenter/update/circe-core-0.14.12 +d27496ac Merge pull request #1565 from scalacenter/update/logback-classic-1.5.18 +67ddfbe2 Merge pull request #1602 from adpi2/fix-1593 +4212eb11 Split by Project ref to compute latest artifacts +e8ea26de Merge pull request #1595 from vidishagawas121/add-gsoc-section +ae47c246 Remove outdated email +d2f1c982 (origin/update/elasticsearch-1.21.3) Update elasticsearch, postgresql to 1.21.3 +17baae9d (origin/update/sbt-twirl-2.0.9) Update sbt-twirl, twirl-api to 2.0.9 +ea8b74d7 Update jsoup to 1.21.1 +13e7129d (origin/update/maven-model-builder-4.0.0-rc-4) Update maven-model-builder to 4.0.0-rc-4 +72c72887 Fixed the typo of the link +53354c79 Few changes made +dedf0498 Add GSoC 2024 & 2025 section with contributor and blog links +d31085b2 Update pekko-actor-typed, ... to 1.1.4 +c37bcd41 Add support for explicit SSH connections in SCM URLs +fb361b0c (origin/update/pekko-http-1.2.0) Update pekko-http, pekko-http-core, ... to 1.2.0 +20890962 (origin/update/sbt-scalajs-1.19.0) Update sbt-scalajs, scalajs-library_2.13, ... to 1.19.0 +e202a050 (origin/update/swagger-ui-5.20.7) Update swagger-ui to 5.20.7 +6a05c39c (origin/update/sbt-1.10.11) Update sbt, scripted-plugin to 1.10.11 +f4b654c9 (origin/update/circe-core-0.14.12) Update circe-core, circe-generic, ... to 0.14.12 +36ddbf36 (origin/update/logback-classic-1.5.18) Update logback-classic to 1.5.18 +85fd08b3 Merge pull request #1560 from scalacenter/update/jsoup-1.19.1 +d8496049 Merge pull request #1563 from scalacenter/update/elasticsearch-1.20.6 +92a44444 Merge pull request #1562 from scalacenter/update/scalafmt-core-3.9.4 +1db7c009 Merge pull request #1561 from scalacenter/update/sbt-1.10.10 +fc7b0ba1 (origin/update/jsoup-1.19.1) Merge branch 'main' into update/jsoup-1.19.1 +2a0e5843 Merge pull request #1558 from scalacenter/update/maven-model-builder-4.0.0-rc-3 +459770bd Merge pull request #1557 from scalacenter/update/elastic4s-client-esjava-8.17.0 +e6ac81c9 Merge pull request #1556 from scalacenter/update/pekko-http-circe-3.0.1 +23e83659 (origin/update/elasticsearch-1.20.6) Update elasticsearch, postgresql to 1.20.6 +9edd14db (origin/update/scalafmt-core-3.9.4) Update scalafmt-core to 3.9.4 +dfbab4c2 (origin/update/sbt-1.10.10) Update sbt, scripted-plugin to 1.10.10 +f72620b4 Update jsoup to 1.19.1 +0b1fe3a8 (origin/update/maven-model-builder-4.0.0-rc-3) Update maven-model-builder to 4.0.0-rc-3 +516999ed (origin/update/elastic4s-client-esjava-8.17.0) Update elastic4s-client-esjava to 8.17.0 +5cf9f47f (origin/update/pekko-http-circe-3.0.1) Update pekko-http-circe to 3.0.1 +9eb2c213 Merge pull request #1553 from scalacenter/update/swagger-ui-5.20.0 +c6ebcc45 Merge pull request #1552 from scalacenter/update/elasticsearch-1.20.5 +c3dce9bc Merge pull request #1551 from scalacenter/update/jcl-over-slf4j-2.0.17 +cec9351f Merge pull request #1550 from scalacenter/update/scalafmt-core-3.9.2 +98c97c6c Merge pull request #1549 from scalacenter/update/sbt-twirl-2.0.8 +5cc9734d Merge pull request #1547 from scalacenter/update/logback-classic-1.5.17 +f43a14dd Merge pull request #1546 from scalacenter/update/sbt-scalafix-0.14.2 +dae432c8 (origin/update/swagger-ui-5.20.0) Update swagger-ui to 5.20.0 +7bff5996 (origin/update/elasticsearch-1.20.5) Update elasticsearch, postgresql to 1.20.5 +f83b2cc8 (origin/update/jcl-over-slf4j-2.0.17) Update jcl-over-slf4j to 2.0.17 +b8c004d9 (origin/update/scalafmt-core-3.9.2) Update scalafmt-core to 3.9.2 +97325c5f (origin/update/sbt-twirl-2.0.8) Update sbt-twirl, twirl-api to 2.0.8 +8d08dc9a (origin/update/logback-classic-1.5.17) Update logback-classic to 1.5.17 +4b990dfd (origin/update/sbt-scalafix-0.14.2) Update sbt-scalafix to 0.14.2 +99844118 Merge pull request #1544 from scalacenter/update/sbt-native-packager-1.11.1 +f6e12cfb (origin/update/sbt-native-packager-1.11.1) Update sbt-native-packager to 1.11.1 +8348a00b Merge pull request #1542 from scalacenter/update/swagger-ui-5.18.3 +15aaf3b4 Merge pull request #1541 from scalacenter/update/font-awesome-6.7.2 +d80029d6 Merge pull request #1540 from scalacenter/update/scalafmt-core-3.8.6 +6553715a Merge pull request #1539 from scalacenter/update/scala3-library-3.3.5 +25fff1d6 Merge pull request #1538 from scalacenter/update/sbt-scalajs-1.18.2 +24bd13ea (origin/update/swagger-ui-5.18.3) Update swagger-ui to 5.18.3 +18a8062c (origin/update/font-awesome-6.7.2) Update font-awesome to 6.7.2 +c99f4294 (origin/update/scalafmt-core-3.8.6) Update scalafmt-core to 3.8.6 +0349f2b5 (origin/update/scala3-library-3.3.5) Update scala3-library, ... to 3.3.5 +a0aa7f3e (origin/update/sbt-scalajs-1.18.2) Update sbt-scalajs, scalajs-library_2.13, ... to 1.18.2 +0c4ee715 Merge pull request #1527 from scalacenter/update/sbt-scalafix-0.14.0 +fce77bc0 Merge pull request #1536 from scalacenter/update/scalafmt-core-3.8.4 +72a6a128 Merge pull request #1535 from scalacenter/update/scala-parallel-collections-1.2 \ No newline at end of file diff --git a/modules/core/shared/src/main/scala/scaladex/core/model/Artifact.scala b/modules/core/shared/src/main/scala/scaladex/core/model/Artifact.scala index 48bc659a8..22f42a974 100644 --- a/modules/core/shared/src/main/scala/scaladex/core/model/Artifact.scala +++ b/modules/core/shared/src/main/scala/scaladex/core/model/Artifact.scala @@ -229,20 +229,20 @@ case class Artifact( end Artifact object Artifact: - private val dateFormatter = DateTimeFormatter.ofPattern("MMM d, uuuu").withZone(ZoneOffset.UTC) + val dateFormatter = DateTimeFormatter.ofPattern("MMM d, uuuu").withZone(ZoneOffset.UTC) - case class Name(value: String) extends AnyVal: + final case class Name(value: String) extends AnyVal: override def toString: String = value object Name: given ordering: Ordering[Name] = Ordering.by(_.value) - case class GroupId(value: String) extends AnyVal: + final case class GroupId(value: String) extends AnyVal: override def toString: String = value def mavenUrl: String = value.replace('.', '/') object GroupId: given ordering: Ordering[GroupId] = Ordering.by(_.value) - case class ArtifactId(name: Name, binaryVersion: BinaryVersion): + final case class ArtifactId(name: Name, binaryVersion: BinaryVersion): override def toString = value def value: String = s"$name${binaryVersion.asSuffix}" def isScala: Boolean = binaryVersion.language.isScala @@ -264,7 +264,7 @@ object Artifact: tryParse(artifactId, x => FullParser(x)).getOrElse(ArtifactId(Name(artifactId), BinaryVersion(Jvm, Java))) end ArtifactId - case class Reference(groupId: GroupId, artifactId: ArtifactId, version: Version): + final case class Reference(groupId: GroupId, artifactId: ArtifactId, version: Version): override def toString(): String = s"$groupId:$artifactId:$version" def name: Name = artifactId.name diff --git a/modules/core/shared/src/main/scala/scaladex/core/model/Platform.scala b/modules/core/shared/src/main/scala/scaladex/core/model/Platform.scala index 67f732ef5..3430ef350 100644 --- a/modules/core/shared/src/main/scala/scaladex/core/model/Platform.scala +++ b/modules/core/shared/src/main/scala/scaladex/core/model/Platform.scala @@ -73,13 +73,19 @@ object MillPlugin: given ordering: Ordering[MillPlugin] = Ordering.by(p => p.asInstanceOf[Platform]) +case object CompilerPlugin extends Platform: + override def toString: String = "Compiler Plugin" + override def value: String = "compiler-plugin" + override def isValid: Boolean = true + object Platform: given ordering: Ordering[Platform] = Ordering.by { - case Jvm => (5, None) - case ScalaJs(version) => (4, Some(version)) - case ScalaNative(version) => (3, Some(version)) - case SbtPlugin(version) => (2, Some(version)) - case MillPlugin(version) => (1, Some(version)) + case Jvm => (6, None) + case ScalaJs(version) => (5, Some(version)) + case ScalaNative(version) => (4, Some(version)) + case SbtPlugin(version) => (3, Some(version)) + case MillPlugin(version) => (2, Some(version)) + case CompilerPlugin => (1, None) } def parse(input: String): Option[Platform] = @@ -89,5 +95,6 @@ object Platform: case s"native$version" => Version.parseSemantically(version).map(ScalaNative.apply) case s"sbt$version" => Version.parseSemantically(version).map(SbtPlugin.apply) case s"mill$version" => Version.parseSemantically(version).map(MillPlugin.apply) + case "compiler-plugin" => Some(CompilerPlugin) case _ => None end Platform diff --git a/modules/core/shared/src/main/scala/scaladex/core/model/ProjectHeader.scala b/modules/core/shared/src/main/scala/scaladex/core/model/ProjectHeader.scala index 50753885f..8a71b9544 100644 --- a/modules/core/shared/src/main/scala/scaladex/core/model/ProjectHeader.scala +++ b/modules/core/shared/src/main/scala/scaladex/core/model/ProjectHeader.scala @@ -105,4 +105,5 @@ final case class ProjectHeader( def latestScalaNativeVersions: Seq[ScalaNative] = latestPlatforms.collect { case v: ScalaNative => v } def latestSbtVersions: Seq[SbtPlugin] = latestPlatforms.collect { case v: SbtPlugin => v } def latestMillVersions: Seq[MillPlugin] = latestPlatforms.collect { case v: MillPlugin => v } + def latestCompilerPluginVersions: Seq[CompilerPlugin] = latestPlatforms.collect { case v: CompilerPlugin => v } end ProjectHeader diff --git a/modules/core/shared/src/test/scala/scaladex/core/model/PlatformTests.scala b/modules/core/shared/src/test/scala/scaladex/core/model/PlatformTests.scala index 06de22c4c..a7a2642d5 100644 --- a/modules/core/shared/src/test/scala/scaladex/core/model/PlatformTests.scala +++ b/modules/core/shared/src/test/scala/scaladex/core/model/PlatformTests.scala @@ -16,5 +16,6 @@ class PlatformTests extends AnyFunSpec with Matchers: Version.SemanticLike(2, Some(0), Some(0), preRelease = Some(Milestone(2))) ) Platform.parse("mill0.10").get shouldBe MillPlugin.`0.10` + Platform.parse("compiler-plugin").get shouldBe CompilerPlugin } end PlatformTests diff --git a/modules/template/src/main/twirl/scaladex/view/project/headproject.scala.html b/modules/template/src/main/twirl/scaladex/view/project/headproject.scala.html index cc54efcbe..48b48c02c 100644 --- a/modules/template/src/main/twirl/scaladex/view/project/headproject.scala.html +++ b/modules/template/src/main/twirl/scaladex/view/project/headproject.scala.html @@ -96,13 +96,22 @@

} @if(header.latestMillVersions.nonEmpty){ -
{Artifact, BinaryVersion, Project, Version, UserState, Env} +
Mill plugins: @for(platform <- header.latestMillVersions.sorted.reverse) { @platform.version }
} + + @if(header.latestCompilerPluginVersions.nonEmpty){ +
+ Compiler plugins: + @for(platform <- header.latestCompilerPluginVersions.sorted.reverse) { + @platform.toString + } +
+ }
}