Skip to content

Commit

Permalink
3.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
lihaoyi committed Apr 15, 2024
1 parent 49ba3cf commit d185446
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 32 deletions.
3 changes: 1 addition & 2 deletions .mill-version
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
0.11.1

0.11.7-29-f2e220
47 changes: 17 additions & 30 deletions build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,12 @@ import $ivy.`com.github.lolgab::mill-mima::0.0.23`
import de.tobiasroeser.mill.vcs.version.VcsVersion
import com.github.lolgab.mill.mima._

val scala33 = "3.3.1"
val scala32 = "3.2.2"
val scala3 = "3.3.1"
val scala213 = "2.13.10"
val scala212 = "2.12.17"
val scala211 = "2.11.12"
val scalaJS1 = "1.12.0"
val scalaNative04 = "0.4.9"
val crossVersions = Seq(scala33, scala32, scala213, scala212, scala211)
val scalaNativeCrossVersions = crossVersions.filterNot(v => v == scala32 || v == scala33 )
val scalaNative04 = "0.5.0"
val crossVersions = Seq(scala3, scala213, scala212)

object fastparse extends Module{
object jvm extends Cross[fastparseJvmModule](crossVersions)
Expand All @@ -48,7 +45,7 @@ object fastparse extends Module{
}


object native extends Cross[fastparseNativeModule](scalaNativeCrossVersions)
object native extends Cross[fastparseNativeModule](crossVersions)
trait fastparseNativeModule extends FastparseModule with ScalaNativeModule {
def scalaNativeVersion = scalaNative04

Expand All @@ -58,8 +55,8 @@ object fastparse extends Module{

trait FastparseModule extends CommonCrossModule with Mima{
def ivyDeps = Agg(
ivy"com.lihaoyi::sourcecode::0.3.0",
ivy"com.lihaoyi::geny::1.0.0"
ivy"com.lihaoyi::sourcecode::0.4.0",
ivy"com.lihaoyi::geny::1.1.0"
)

def compileIvyDeps =
Expand Down Expand Up @@ -122,7 +119,7 @@ object scalaparse extends Module{
object jvm extends Cross[ScalaParseJvmModule](crossVersions)
trait ScalaParseJvmModule extends ExampleParseJvmModule

object native extends Cross[ScalaParseNativeModule](scalaNativeCrossVersions)
object native extends Cross[ScalaParseNativeModule](crossVersions)
trait ScalaParseNativeModule extends ExampleParseNativeModule
}

Expand All @@ -133,7 +130,7 @@ object cssparse extends Module{
object jvm extends Cross[CssParseJvmModule](crossVersions)
trait CssParseJvmModule extends ExampleParseJvmModule

object native extends Cross[CssParseNativeModule](scalaNativeCrossVersions)
object native extends Cross[CssParseNativeModule](crossVersions)

trait CssParseNativeModule extends ExampleParseNativeModule
}
Expand All @@ -145,7 +142,7 @@ object pythonparse extends Module{
object jvm extends Cross[PythonParseJvmModule](crossVersions)
trait PythonParseJvmModule extends ExampleParseJvmModule

object native extends Cross[PythonParseNativeModule](scalaNativeCrossVersions)
object native extends Cross[PythonParseNativeModule](crossVersions)
trait PythonParseNativeModule extends ExampleParseNativeModule
}

Expand Down Expand Up @@ -196,12 +193,12 @@ trait CommonCrossModule extends CrossScalaModule with PublishModule with Platfor

def sources = T.sources {
super.sources() ++
Agg.when(scalaVersion() != scala211)(PathRef(millSourcePath / "src-2.12+"))
Agg(PathRef(millSourcePath / "src-2.12+"))
}
}

trait CommonTestModule extends ScalaModule with TestModule.Utest{
def ivyDeps = Agg(ivy"com.lihaoyi::utest::0.8.1")
def ivyDeps = Agg(ivy"com.lihaoyi::utest::0.8.3")

override def scalacOptions =
super.scalacOptions() ++
Expand All @@ -223,26 +220,16 @@ object perftests extends Module{
}

object benchScala33 extends PerfTestModule {
def scalaVersion0 = scala33
def scalaVersion0 = scala3
def sources = T.sources { bench2.sources() }
def moduleDeps = Seq(
scalaparse.jvm(scala33).test,
pythonparse.jvm(scala33).test,
cssparse.jvm(scala33).test,
fastparse.jvm(scala33).test,
scalaparse.jvm(scala3).test,
pythonparse.jvm(scala3).test,
cssparse.jvm(scala3).test,
fastparse.jvm(scala3).test,
)
}

object benchScala32 extends PerfTestModule {
def scalaVersion0 = scala32
def sources = T.sources{ bench2.sources() }
def moduleDeps = Seq(
scalaparse.jvm(scala32).test,
pythonparse.jvm(scala32).test,
cssparse.jvm(scala32).test,
fastparse.jvm(scala32).test,
)
}

object compare extends PerfTestModule {
def scalaVersion0 = scala212
Expand Down Expand Up @@ -275,7 +262,7 @@ object perftests extends Module{
fastparse.jvm(scalaVersion0).test.resources()
}

def ivyDeps = Agg(ivy"com.lihaoyi::utest::0.8.1")
def ivyDeps = Agg(ivy"com.lihaoyi::utest::0.8.3")
}
}

Expand Down
9 changes: 9 additions & 0 deletions readme/Changelog.scalatex
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
@import Main._
@sect{Change Log}

@sect{3.1.0}
@ul
@li
Support for Scala-Native 0.5.0
@li
Dropped support for Scala 3.x versions before 3.3.1
@li
Dropped support for Scala 2.x versions before 2.12.x

@sect{3.0.2}
@ul
@li
Expand Down

0 comments on commit d185446

Please sign in to comment.