Skip to content

Commit d1971e2

Browse files
committed
Migrated scala-core to Scala 3
1 parent 84b7973 commit d1971e2

File tree

57 files changed

+15
-42
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+15
-42
lines changed

build.sbt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ val zioVersion = "2.0.19"
2525
lazy val scala_core = (project in file("scala-core-modules/scala-core"))
2626
.settings(
2727
name := "scala-core",
28+
scalaVersion := scala3Version,
2829
libraryDependencies ++=
2930
Seq(
30-
jUnitInterface,
31-
catsEffect
31+
jUnitInterface
3232
) ++ scalaTestDeps
3333
)
3434

@@ -62,6 +62,7 @@ lazy val scala2_core = (project in file("scala-core-modules/scala2-core"))
6262
libraryDependencies += "org.backuity.clist" %% "clist-macros" % "3.5.1" % "provided",
6363
libraryDependencies += "args4j" % "args4j" % "2.33",
6464
libraryDependencies += "org.scala-lang" % "scala-compiler" % scalaVersion.value % "test",
65+
libraryDependencies += catsEffect
6566
)
6667

6768
lazy val scala_core_4 = (project in file("scala-core-modules/scala-core-4"))

scala-core-modules/scala-core-2/src/test/scala/com/baeldung/scala/exceptionhandling/ExceptionHandlingUnitTest.scala

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
package com.baeldung.scala.exceptionhandling
22

3-
import com.baeldung.scala.exceptionhandling.ExceptionHandling.{
4-
DivideByZero,
5-
divideWithEither,
6-
divideWithOption,
7-
divideWithTry
8-
}
3+
import com.baeldung.scala.exceptionhandling.ExceptionHandling._
94
import org.scalatest.flatspec.AnyFlatSpec
105
import org.scalatest.matchers.should.Matchers
116

scala-core-modules/scala-core/README.md

Lines changed: 0 additions & 2 deletions

scala-core-modules/scala-core/src/main/scala-2/com/baeldung/scala/traits/Score.scala renamed to scala-core-modules/scala-core/src/main/scala/com/baeldung/scala/traits/Score.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class Score(
1818

1919
override def produce(): String = s"The score is produced by $engineer"
2020

21-
override def algorithm(): MixingAlgorithm = {
21+
override def algorithm: MixingAlgorithm = {
2222
if (qualityRatio < 3) LowInstrumentalQuality
2323
else super.algorithm
2424
}

scala-core-modules/scala-core/src/test/scala-2/com/baeldung/scala/traits/ScoreUnitTest.scala renamed to scala-core-modules/scala-core/src/test/scala/com/baeldung/scala/traits/ScoreUnitTest.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class ScoreUnitTest {
4646
val studio = "Abbey Studios"
4747
val score = new Score(composer, engineer, orchestra, mixer, 1, studio)
4848

49-
assertEquals(score.algorithm().toString, "Low instrumental quality")
49+
assertEquals(score.algorithm.toString, "Low instrumental quality")
5050
}
5151

5252
@Test
@@ -59,7 +59,7 @@ class ScoreUnitTest {
5959
val studio = "Abbey Studios"
6060
val score = new Score(composer, engineer, orchestra, mixer, 10, studio)
6161

62-
assertEquals(score.algorithm().toString, "High instrumental quality")
62+
assertEquals(score.algorithm.toString, "High instrumental quality")
6363
}
6464

6565
@Test

scala-core-modules/scala2-core/README.md

Lines changed: 2 additions & 0 deletions
Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
package com.baeldung.scala.exceptionhandling
22

3-
import com.baeldung.scala.exceptionhandling.LegacyErrors.{
4-
ResourceNotFound,
5-
ServerError,
6-
UserNotFound
7-
}
3+
import com.baeldung.scala.exceptionhandling.LegacyErrors._
84

95
import scala.util.{Failure, Success, Try}
106

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@ package com.baeldung.scala.exceptionhandling
33
import cats.MonadError
44
import cats.syntax.flatMap._
55
import cats.syntax.functor._
6-
import com.baeldung.scala.exceptionhandling.LegacyErrors.{
7-
ResourceNotFound,
8-
ServerError,
9-
UserNotFound
10-
}
6+
import com.baeldung.scala.exceptionhandling.LegacyErrors._
117

128
import scala.util.{Failure, Success, Try}
139

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@ package com.baeldung.scala.exceptionhandling
33
import cats.data.ValidatedNel
44
import cats.syntax.apply._
55
import cats.syntax.validated._
6-
import com.baeldung.scala.exceptionhandling.ValidationErrors.{
7-
IllegalLogin,
8-
IllegalPassword
9-
}
6+
import com.baeldung.scala.exceptionhandling.ValidationErrors._
107

118
object HandlingWithValidated {
129
type InvalidOr[T] = ValidatedNel[ValidationErrors, T]
Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,8 @@ package com.baeldung.scala.exceptionhandling
22

33
import cats.data.NonEmptyList
44
import cats.data.Validated.{Invalid, Valid}
5-
import com.baeldung.scala.exceptionhandling.LegacyErrors.{
6-
ResourceNotFound,
7-
ServerError,
8-
UserNotFound
9-
}
10-
import com.baeldung.scala.exceptionhandling.ValidationErrors.{
11-
IllegalLogin,
12-
IllegalPassword
13-
}
5+
import com.baeldung.scala.exceptionhandling.LegacyErrors._
6+
import com.baeldung.scala.exceptionhandling.ValidationErrors._
147
import org.scalatest.GivenWhenThen
158
import org.scalatest.featurespec.AnyFeatureSpec
169
import org.scalatest.matchers.should.Matchers

scala-core-modules/scala-core/src/test/scala-2/com/baeldung/scala/introduction/UtilsUnitTest.scala renamed to scala-core-modules/scala2-core/src/test/scala-2/com/baeldung/scala/introduction/UtilsUnitTest.scala

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
package com.baeldung.scala.introduction
22

3-
import com.baeldung.scala.introduction.Utils.{
4-
average,
5-
fibonacci,
6-
power,
7-
randomLessThan
8-
}
3+
import com.baeldung.scala.introduction.Utils._
94
import org.junit.Assert.{assertEquals, assertTrue}
105
import org.junit.Test
116

0 commit comments

Comments
 (0)