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

Allow building under Java 21 LTS #105

Merged
merged 1 commit into from
Mar 19, 2024
Merged

Allow building under Java 21 LTS #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 5 additions & 4 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ import scala.collection.immutable

val testAndCompileDependencies: String = "test->test;compile->compile"

ThisBuild / libraryDependencySchemes +=
"org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always // due to Identity using lift-json
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a nasty hack, but necessary as our Identity libraries use lift-json, and lift-json is compiled against an old version of scala-xml.

The hack is used in many Guardian repos!


def projectMaker(projectName: String) = Project(projectName, file(projectName))
.enablePlugins(RiffRaffArtifact)
.settings(
Expand All @@ -27,9 +30,7 @@ def commonAssemblySettings(module: String): immutable.Seq[Def.Setting[_]] =

val commonSettings: immutable.Seq[Def.Setting[_]] = List(
fork := true, // was hitting deadlock, fxxund similar complaints online, disabling concurrency helps: https://github.com/sbt/sbt/issues/3022, https://github.com/mockito/mockito/issues/1067
resolvers ++= Seq(
Resolver.sonatypeRepo("releases")
),
resolvers ++= Resolver.sonatypeOssRepos("releases"),
libraryDependencies ++= Seq(
awsLambda,
awsDynamo,
Expand Down Expand Up @@ -62,7 +63,7 @@ val commonSettings: immutable.Seq[Def.Setting[_]] = List(
),
organization := "com.gu",
version := "1.0",
scalaVersion := "2.12.5",
scalaVersion := "2.12.19",
scalacOptions ++= Seq(
"-deprecation",
"-encoding",
Expand Down
3 changes: 2 additions & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
sbt.version=1.6.1
sbt.version=1.9.9

Loading