Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Scala 3.5.0 and tasty-query 1.4.0. #59

Merged
merged 2 commits into from
Oct 2, 2024
Merged

Upgrade to Scala 3.5.0 and tasty-query 1.4.0. #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44d2a1d
Set version policy intention to BinaryCompatible for the upgrades.
sjrd Oct 2, 2024
e316ce9
Upgrade to Scala 3.5.0 and tasty-query 1.4.0.
sjrd Oct 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ val rtJarOpt = taskKey[Option[String]]("Path to rt.jar if it exists")
val javalibEntry = taskKey[String]("Path to rt.jar or \"jrt:/\"")

inThisBuild(Def.settings(
crossScalaVersions := Seq("3.4.0"),
crossScalaVersions := Seq("3.5.0"),
scalaVersion := crossScalaVersions.value.head,

scalacOptions ++= Seq(
Expand All @@ -28,9 +28,12 @@ inThisBuild(Def.settings(
Developer("bishabosha", "Jamie Thompson", "bishbashboshjt@gmail.com", url("https://github.com/bishabosha")),
),

versionPolicyIntention := Compatibility.BinaryAndSourceCompatible,
versionPolicyIntention := Compatibility.BinaryCompatible,
// Ignore dependencies to internal modules whose version is like `1.2.3+4...` (see https://github.com/scalacenter/sbt-version-policy#how-to-integrate-with-sbt-dynver)
versionPolicyIgnoredInternalDependencyVersions := Some("^\\d+\\.\\d+\\.\\d+\\+\\d+".r),

// Temporary until we upgrade to an sbt-tasty-mima that supports Scala 3.5.x out of the box
tastyMiMaTastyQueryVersionOverride := Some("1.4.0"),
))

val commonSettings = Seq(
Expand All @@ -44,7 +47,7 @@ val strictCompileSettings = Seq(
scalacOptions ++= Seq(
"-Xfatal-warnings",
"-Yexplicit-nulls",
"-Ysafe-init",
"-Wsafe-init",
"-source:future",
),
)
Expand Down Expand Up @@ -94,7 +97,7 @@ lazy val tastyMiMa =
testFrameworks += new TestFramework("munit.Framework")
)
.settings(
libraryDependencies += "ch.epfl.scala" %% "tasty-query" % "1.3.0",
libraryDependencies += "ch.epfl.scala" %% "tasty-query" % "1.4.0",

Test / rtJarOpt := {
for (bootClasspath <- Option(System.getProperty("sun.boot.class.path"))) yield {
Expand Down
3 changes: 3 additions & 0 deletions tasty-mima/src/main/scala/tastymima/TypeTranslator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ private[tastymima] final class TypeTranslator(oldCtx: Context, newCtx: Context):
}
AppliedType(translatedTycon, translatedArgs)

case oldType: FlexibleType =>
FlexibleType(translateType(oldType.nonNullableType))

case oldType: ByNameType =>
ByNameType(translateType(oldType.resultType))

Expand Down
Loading