From cc6a34191e67a0c2d38cfce96d345b8cf1fc181b Mon Sep 17 00:00:00 2001 From: David Geirola Date: Wed, 10 Aug 2022 11:46:24 +0200 Subject: [PATCH] Update deps --- .github/workflows/cicd.yml | 14 ++++++++------ .java-version | 1 + build.sbt | 12 ++++++------ docs/compiled/generic.md | 16 ++++++++-------- project/ProjectDependencies.scala | 10 ++++------ 5 files changed, 27 insertions(+), 26 deletions(-) create mode 100644 .java-version diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml index 4352941..1f885c3 100644 --- a/.github/workflows/cicd.yml +++ b/.github/workflows/cicd.yml @@ -39,10 +39,11 @@ jobs: - uses: actions/checkout@v3 #----------- JDK ----------- - - name: Set up JDK 11 - uses: actions/setup-java@v1 + - name: Setup JDK + uses: actions/setup-java@v3 with: - java-version: 11 + distribution: "liberica" + java-version: 17 #----------- CACHE ----------- - name: Cache SBT @@ -71,10 +72,11 @@ jobs: - uses: actions/checkout@v3 #----------- JDK ----------- - - name: Set up JDK 11 - uses: actions/setup-java@v1 + - name: Setup JDK + uses: actions/setup-java@v3 with: - java-version: 11 + distribution: "liberica" + java-version: 17 #----------- CACHE ----------- - name: Cache SBT diff --git a/.java-version b/.java-version new file mode 100644 index 0000000..03b6389 --- /dev/null +++ b/.java-version @@ -0,0 +1 @@ +17.0 diff --git a/build.sbt b/build.sbt index c34cf3b..1f8983a 100644 --- a/build.sbt +++ b/build.sbt @@ -30,9 +30,10 @@ lazy val `cats-xml`: Project = project .settings(baseSettings) .settings(noPublishSettings) .settings( - name := prjName, - description := "A purely functional XML library", - organization := org + name := prjName, + description := "A purely functional XML library", + organization := org, + crossScalaVersions := Nil ) .settings( copyReadMe := IO.copyFile(file("docs/compiled/README.md"), file("README.md")), @@ -145,8 +146,7 @@ def buildModule(prjModuleName: String, toPublish: Boolean, folder: String): Proj moduleName := s"$prjName-$prjModuleName", name := s"$prjName $docName", publish / skip := !toPublish, - baseSettings, - crossScalaVersions := supportedScalaVersions + baseSettings ) } @@ -160,7 +160,7 @@ lazy val noPublishSettings: Seq[Def.Setting[_]] = Seq( lazy val baseSettings: Seq[Def.Setting[_]] = Seq( // scala - crossScalaVersions := Nil, // to avoid double publication + crossScalaVersions := supportedScalaVersions, scalaVersion := supportedScalaVersions.head, scalacOptions ++= scalacSettings(scalaVersion.value), // dependencies diff --git a/docs/compiled/generic.md b/docs/compiled/generic.md index bfe1d6c..8a364c6 100644 --- a/docs/compiled/generic.md +++ b/docs/compiled/generic.md @@ -48,14 +48,14 @@ implicit val typeInterpreterFoo: XmlTypeInterpreter[Foo] = .overrideType( _.param(_.valueClass) -> XmlElemType.Attribute ) -// typeInterpreterFoo: XmlTypeInterpreter[Foo] = cats.xml.generic.XmlTypeInterpreter$$anon$1@65f8d +// typeInterpreterFoo: XmlTypeInterpreter[Foo] = cats.xml.generic.XmlTypeInterpreter$$anon$1@6085f0fd implicit val decoderValueClass: Decoder[ValueClass] = deriveDecoder[ValueClass] -// decoderValueClass: Decoder[ValueClass] = cats.xml.codec.Decoder$$anonfun$of$2@6165195e +// decoderValueClass: Decoder[ValueClass] = cats.xml.codec.Decoder$$anonfun$of$2@4976ee4d implicit val decoderBar: Decoder[Bar] = deriveDecoder[Bar] -// decoderBar: Decoder[Bar] = cats.xml.codec.Decoder$$anonfun$of$2@2431eb25 +// decoderBar: Decoder[Bar] = cats.xml.codec.Decoder$$anonfun$of$2@3234a760 implicit val decoderFoo: Decoder[Foo] = deriveDecoder[Foo] -// decoderFoo: Decoder[Foo] = cats.xml.codec.Decoder$$anonfun$of$2@27f6bc61 +// decoderFoo: Decoder[Foo] = cats.xml.codec.Decoder$$anonfun$of$2@1d5b9ce6 XmlNode("foo") .withAttributes( @@ -87,14 +87,14 @@ implicit val typeInterpreterFoo: XmlTypeInterpreter[Foo] = .overrideType( _.param(_.valueClass) -> XmlElemType.Attribute ) -// typeInterpreterFoo: XmlTypeInterpreter[Foo] = cats.xml.generic.XmlTypeInterpreter$$anon$1@36de8a5 +// typeInterpreterFoo: XmlTypeInterpreter[Foo] = cats.xml.generic.XmlTypeInterpreter$$anon$1@2c6c1d31 implicit val encoderValueClass: Encoder[ValueClass] = deriveEncoder[ValueClass] -// encoderValueClass: Encoder[ValueClass] = cats.xml.codec.DataEncoder$$anonfun$of$4@1ea120e4 +// encoderValueClass: Encoder[ValueClass] = cats.xml.codec.DataEncoder$$anonfun$of$4@3b74b07b implicit val encoderBar: Encoder[Bar] = deriveEncoder[Bar] -// encoderBar: Encoder[Bar] = cats.xml.codec.Encoder$$anonfun$of$2@359bf339 +// encoderBar: Encoder[Bar] = cats.xml.codec.Encoder$$anonfun$of$2@7a09a75f implicit val encoderFoo: Encoder[Foo] = deriveEncoder[Foo] -// encoderFoo: Encoder[Foo] = cats.xml.codec.Encoder$$anonfun$of$2@31f054aa +// encoderFoo: Encoder[Foo] = cats.xml.codec.Encoder$$anonfun$of$2@1cd4c673 Foo( primitiveField = 1d, diff --git a/project/ProjectDependencies.scala b/project/ProjectDependencies.scala index 35fe263..d0e2f63 100644 --- a/project/ProjectDependencies.scala +++ b/project/ProjectDependencies.scala @@ -9,15 +9,13 @@ object ProjectDependencies { lazy val common: Seq[ModuleID] = Seq( // SCALA - "org.typelevel" %% "cats-core" % "2.8.0" cross CrossVersion.binary, -// "org.typelevel" %% "mouse" % "1.0.10", -// "org.scala-lang" % "scala-compiler" % "2.13.8", + "org.typelevel" %% "cats-core" % "2.8.0", // TEST "org.scalameta" %% "munit" % "0.7.29" % Test, "org.scalameta" %% "munit-scalacheck" % "0.7.29" % Test, "org.typelevel" %% "cats-laws" % "2.8.0" % Test, "org.typelevel" %% "discipline-munit" % "1.0.9" % Test, - "org.scalacheck" %% "scalacheck" % "1.16.0" % Test cross CrossVersion.binary + "org.scalacheck" %% "scalacheck" % "1.16.0" % Test ) object Docs { @@ -47,14 +45,14 @@ object ProjectDependencies { object Effect { val dedicated: Seq[ModuleID] = Seq( - "org.typelevel" %% "cats-effect" % "3.3.14" cross CrossVersion.binary, + "org.typelevel" %% "cats-effect" % "3.3.14", "org.typelevel" %% "munit-cats-effect-3" % "1.0.7" % Test ) } object Standard { val dedicated: Seq[ModuleID] = Seq( - "org.scala-lang.modules" %% "scala-xml" % "2.1.0" cross CrossVersion.binary + "org.scala-lang.modules" %% "scala-xml" % "2.1.0" ) }