Skip to content

Commit a557ac3

Browse files
WojciechMazurWojciechMazur
committed
Upgrade to Scala 3.7.0-RC1 and enable -Wunused
1 parent c312e91 commit a557ac3

File tree

8 files changed

+14
-42
lines changed

8 files changed

+14
-42
lines changed

‎coordinator/src/main/scala/ProjectConfigDiscovery.scala‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ import com.typesafe.config.ConfigFactory
22
import pureconfig._
33
import pureconfig.error.*
44
import java.io.FileNotFoundException
5-
import scala.util.Try
6-
import scala.annotation.tailrec
75
import scala.util.chaining.*
86

97
class ProjectConfigDiscovery(internalProjectConfigsPath: java.io.File, requiredConfigsPath: os.Path) {
@@ -205,7 +203,6 @@ class ProjectConfigDiscovery(internalProjectConfigsPath: java.io.File, requiredC
205203
.stripPrefix("1.")
206204
.split('.')
207205
.headOption
208-
case other => None
209206
}
210207
.flatMap(_.toIntOption)
211208
}
@@ -259,25 +256,25 @@ class ProjectConfigDiscovery(internalProjectConfigsPath: java.io.File, requiredC
259256
case idx => line.substring(0, idx)
260257
}
261258
uncommentedLine.trim match {
262-
case StringVersionDefn(wholeDefn, definition, value) =>
259+
case StringVersionDefn(wholeDefn, definition, _) =>
263260
Some(
264261
Replecement(wholeDefn, s"$definition = ${scalaVersionStringStub}")
265262
)
266-
case VersionsSeqDefn(wholeDefn, definition, value, seqType) =>
263+
case VersionsSeqDefn(wholeDefn, definition, _, seqType) =>
267264
Some(
268265
Replecement(
269266
wholeDefn,
270267
s"$definition = $seqType(${scalaVersionStringStub})"
271268
)
272269
)
273-
case VersionsSeqCondDefn(wholeDefn, definition, value, seqType) =>
270+
case VersionsSeqCondDefn(wholeDefn, definition, _, seqType) =>
274271
Some(
275272
Replecement(
276273
wholeDefn,
277274
s"$definition = $seqType(${scalaVersionStringStub})"
278275
)
279276
)
280-
case BinVersionSelector(wholeDefn, definition, value) =>
277+
case BinVersionSelector(wholeDefn, definition, _) =>
281278
Some(
282279
Replecement(wholeDefn, s"$definition = ${scalaVersionStringStub}")
283280
)
@@ -295,7 +292,6 @@ class ProjectConfigDiscovery(internalProjectConfigsPath: java.io.File, requiredC
295292
pattern = pattern,
296293
replaceWith = replacement
297294
)
298-
import Scala3VersionDef.Replecement
299295
tryReadLines(file).collect {
300296
case Scala3VersionDef(toMatch, replecement) =>
301297
patch(pattern = toMatch, replacement = replecement)

‎coordinator/src/main/scala/Scaladex.scala‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
import java.time.ZonedDateTime
21
import java.util.concurrent.TimeUnit.SECONDS
32
import scala.concurrent.*
43
import scala.concurrent.duration.*
5-
import java.io.IOException
6-
import java.time.Instant
74
import java.time.LocalDate
85
import sttp.client4.*
96
import sttp.model.Uri
@@ -13,7 +10,7 @@ import scala.annotation.nowarn
1310
object Scaladex:
1411
final val ScaladexUrl = uri"https://index.scala-lang.org"
1512

16-
class Scaladex(using ExecutionContext):
13+
class Scaladex:
1714
import Scaladex.*
1815

1916
private val backend = DefaultSyncBackend(BackendOptions.Default.connectionTimeout(1.minute))

‎coordinator/src/main/scala/build.scala‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//> using scala "3.3"
1+
//> using scala "3.7.0-RC1"
22
//> using jvm 17
33
//> using dep "org.jsoup:jsoup:1.19.1"
44
//> using dep "org.json4s::json4s-native:4.0.7"
@@ -8,3 +8,4 @@
88
//> using toolkit 0.7.0
99

1010
//> using resourceDir "../resources"
11+
//> using options -Wunused:all -deprecation

‎coordinator/src/main/scala/buildPlan.scala‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
1-
import org.jsoup._
2-
import scala.jdk.CollectionConverters._
3-
import java.nio.file._
4-
import java.net.URL
5-
import scala.sys.process._
61
import scala.util.CommandLineParser.FromString
72
import scala.util.Try
83

94
import scala.concurrent.*
105
import scala.concurrent.duration.*
11-
import scala.concurrent.ExecutionContext
12-
import java.util.concurrent.ForkJoinPool
13-
import os.write
146
import scala.collection.mutable
157
import scala.collection.SortedMap
168
import os.CommandResult
@@ -242,7 +234,7 @@ def makeDependenciesBasedBuildPlan(
242234
depGraph: DependencyGraph,
243235
cutOffDate: Option[LocalDate]
244236
)(using confFiles: ConfigFiles): AsyncResponse[Array[ProjectBuildDef]] =
245-
val (topLevelData, fullInfo, projectsDeps) = buildPlanCommons(depGraph)
237+
val (_, fullInfo, projectsDeps) = buildPlanCommons(depGraph)
246238
val configDiscovery =
247239
ProjectConfigDiscovery(confFiles.projectsConfig.toIO, confFiles.requiredConfigs)
248240

‎coordinator/src/main/scala/cache.scala‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
import org.jsoup._
2-
import scala.jdk.CollectionConverters._
31
import java.nio.file._
4-
import scala.sys.process._
52
import scala.concurrent.Future
63

74
trait CacheDriver[K, T]:

‎coordinator/src/main/scala/core.scala‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
1-
import org.jsoup._
2-
import scala.jdk.CollectionConverters._
3-
import java.nio.file._
41
import pureconfig._
52
import pureconfig.generic.derivation.EnumConfigReader
63
import scala.concurrent.ExecutionContext
74
import scala.concurrent.Future
8-
import org.json4s.FieldSerializer
9-
import upickle.default.*
105

116
type AsyncResponse[T] = ExecutionContext ?=> Future[T]
127

‎coordinator/src/main/scala/deps.scala‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
import org.jsoup._
22
import scala.jdk.CollectionConverters._
3-
import java.nio.file._
4-
import scala.sys.process._
53
import scala.concurrent.*
6-
import scala.concurrent.duration.*
7-
import java.time.{OffsetDateTime, LocalDate}
4+
import java.time.LocalDate
85
import java.util.concurrent.TimeUnit.SECONDS
96
import java.net.SocketTimeoutException
107
import java.net.UnknownHostException
@@ -60,7 +57,6 @@ case class ProjectModules(project: Project, mvs: Seq[ModuleInVersion])
6057
def loadScaladexProject(releaseCutOffDate: Option[LocalDate] = None)(
6158
project: Project
6259
)(using scaladex: Scaladex): AsyncResponse[ProjectModules] = {
63-
import util.*
6460
for {
6561
scala3JvmArtifacts <- scaladex
6662
.artifacts(project)
@@ -117,7 +113,6 @@ def asTarget(scalaBinaryVersion: String)(mv: ModuleVersion): Target =
117113
groupId <- dep.select("groupId").asScala
118114
artifactId <- dep.select("artifactId").asScala
119115
version <- dep.select("version").asScala
120-
scope = dep.select("scope").asScala.headOption.fold("compile")(_.text())
121116
yield Dep(TargetId(groupId.text, artifactId.text), version.text)
122117

123118
Target(TargetId(o, n), deps.toSeq)
@@ -151,8 +146,8 @@ def loadMavenInfo(scalaBinaryVersion: String)(
151146
Some(target)
152147
})
153148
.recoverWith {
154-
case ex: UnknownHostException => backoff("service not found")
155-
case ex: SocketTimeoutException => backoff("socket timeout exception")
149+
case _: UnknownHostException => backoff("service not found")
150+
case _: SocketTimeoutException => backoff("socket timeout exception")
156151
case ex: HttpStatusException if ex.getStatusCode == 503 =>
157152
backoff("service unavailable")
158153
case ex: java.net.ConnectException if ex.getMessage().contains("Operation timed out") =>

‎coordinator/src/main/scala/encoding.scala‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import org.json4s._
22
import org.json4s.native.Serialization
3-
import org.json4s.ext.EnumSerializer
43
import java.time.OffsetDateTime
54

65
given Serialization = org.json4s.native.Serialization
@@ -16,7 +15,7 @@ object ProjectBuildDefSerializer
1615
})
1716

1817
class ProjectSerializer
19-
extends CustomSerializer[Project](format => {
18+
extends CustomSerializer[Project](_ => {
2019
def deserialize: PartialFunction[JValue, Project] = { case JString(stringValue) =>
2120
Project.load(stringValue)
2221
}
@@ -27,7 +26,7 @@ class ProjectSerializer
2726
})
2827

2928
class TestingModeEnumSerializer
30-
extends CustomSerializer[TestingMode](format => {
29+
extends CustomSerializer[TestingMode](_ => {
3130
val DisabledName = "disabled"
3231
val CompileOnlyName = "compile-only"
3332
val FullName = "full"
@@ -55,7 +54,7 @@ def fromJson[T: Manifest](json: String): T = Serialization.read(json)
5554

5655
// Custom serializer in org.json4s.ext does not handle 2022-04-29T03:39:03Z
5756
class UTCOffsetDateTimeSerializer
58-
extends CustomSerializer[OffsetDateTime](format => {
57+
extends CustomSerializer[OffsetDateTime](_ => {
5958
def deserialize: PartialFunction[JValue, OffsetDateTime] = { case JString(value) =>
6059
OffsetDateTime.parse(value)
6160
}

0 commit comments

Comments
 (0)