From 4a72dd91511e8e8501bcd18c498b0584a5e7e8cf Mon Sep 17 00:00:00 2001 From: Joao Machado <13315199+machadoit@users.noreply.github.com> Date: Mon, 4 May 2026 17:21:43 +0200 Subject: [PATCH] breaking: Update to scala 2.13 --- README.md | 14 +++++++------- build.sbt | 8 ++++---- project/build.properties | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 07591b8..33e0724 100644 --- a/README.md +++ b/README.md @@ -25,8 +25,8 @@ import java.net.URL import com.github.api.v4.ListProjectMembershipsQuery import com.codacy.graphql.apollo.client.ScalaApolloClient -import scala.collection.JavaConverters._ -import scala.compat.java8.OptionConverters._ +import scala.jdk.CollectionConverters._ +import scala.jdk.OptionConverters._ import scala.concurrent.duration._ val client = ScalaApolloClient(new URL("https://api.example.com/graphql")) @@ -42,11 +42,11 @@ val result = client.execute(queryMemberships) val data = result.map { res => for { - data <- res.data().asScala - repositoryEntries <- data.repositoryEntries().asScala - collaborators <- repositoryEntries.collaborators().asScala - nodes <- collaborators.nodes().asScala.map(_.asScala) - } yield nodes.map(c => (c.databaseId().asScala, c.login(), Option(c.email()).filter(_.nonEmpty))) + data <- res.data().toScala + repositoryEntries <- data.repositoryEntries().toScala + collaborators <- repositoryEntries.collaborators().toScala + nodes <- collaborators.nodes().toScala.map(_.asScala) + } yield nodes.map(c => (c.databaseId().toScala, c.login(), Option(c.email()).filter(_.nonEmpty))) } ``` diff --git a/build.sbt b/build.sbt index b0982ca..8a087b4 100644 --- a/build.sbt +++ b/build.sbt @@ -1,10 +1,10 @@ import java.nio.file.Files import sys.process._ -val scala212 = "2.12.20" +val scala213 = "2.13.18" -ThisBuild / scalaVersion := scala212 -ThisBuild / crossScalaVersions := Seq(scala212) +ThisBuild / scalaVersion := scala213 +ThisBuild / crossScalaVersions := Seq(scala213) name := "codacy-github-graphql" @@ -24,7 +24,7 @@ libraryDependencies ++= Seq( // Ensure Java 8 compatibility javacOptions ++= Seq("--release", "8") -scalacOptions ++= Seq("-target:jvm-1.8") +scalacOptions ++= Seq("-release", "8") Compile / sourceGenerators += Def.task { val buildDir = baseDirectory.value / "build" diff --git a/project/build.properties b/project/build.properties index 04267b1..73df629 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.9 +sbt.version=1.10.7