Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 6f78fcd

Browse files
authoredDec 5, 2023
Merge pull request #1052 from yadavan88/scala-3-migration
Migrated scala-core-2 module to scala 3
2 parents 8204589 + 05b6f97 commit 6f78fcd

File tree

197 files changed

+53
-61
lines changed

Some content is hidden

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

197 files changed

+53
-61
lines changed
 

‎build.sbt

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ lazy val scala_core_2 = (project in file("scala-core-modules/scala-core-2"))
3636
.settings(
3737
name := "scala-core-2",
3838
libraryDependencies ++= scalaTestDeps,
39-
libraryDependencies += scalaMock,
40-
libraryDependencies += jUnitInterface
39+
libraryDependencies += jUnitInterface,
40+
scalaVersion := scala3Version
4141
)
4242

4343
lazy val scala_core_3 = (project in file("scala-core-modules/scala-core-3"))
@@ -113,6 +113,7 @@ lazy val scala_core_oop = (project in file("scala-core-modules/scala-core-oop"))
113113
lazy val scala_core_fp = (project in file("scala-core-modules/scala-core-fp"))
114114
.settings(
115115
name := "scala-core-fp",
116+
scalaVersion := scala3Version,
116117
libraryDependencies ++=
117118
Seq(catsEffect, jUnitInterface) ++ scalaTestDeps
118119
)
@@ -121,6 +122,7 @@ lazy val scala_core_dates =
121122
(project in file("scala-core-modules/scala-core-dates"))
122123
.settings(
123124
name := "scala-core-dates",
125+
scalaVersion := scala3Version,
124126
libraryDependencies ++= scalaTestDeps,
125127
libraryDependencies += "joda-time" % "joda-time" % "2.12.5",
126128
libraryDependencies += "com.github.nscala-time" %% "nscala-time" % "2.32.0",
@@ -130,13 +132,15 @@ lazy val scala_core_dates =
130132
lazy val scala_lang = (project in file("scala-lang-modules/scala-lang"))
131133
.settings(
132134
name := "scala-lang",
135+
scalaVersion := scala3Version,
133136
libraryDependencies ++=
134137
Seq(jUnitInterface) ++ scalaTestDeps
135138
)
136139

137140
lazy val scala_lang_2 = (project in file("scala-lang-modules/scala-lang-2"))
138141
.settings(
139-
name := "scala-lang",
142+
name := "scala-lang-2",
143+
scalaVersion := scala3Version,
140144
libraryDependencies ++=
141145
Seq(jUnitInterface) ++ scalaTestDeps
142146
)
@@ -145,6 +149,7 @@ lazy val scala_core_collections =
145149
(project in file("scala-core-collections-modules/scala-core-collections"))
146150
.settings(
147151
name := "scala-core-collections",
152+
scalaVersion := scala3Version,
148153
libraryDependencies ++= Seq(
149154
"org.scala-lang.modules" %% "scala-parallel-collections" % "1.0.4"
150155
) ++ scalaTestDeps
@@ -154,18 +159,21 @@ lazy val scala_core_collections_2 =
154159
(project in file("scala-core-collections-modules/scala-core-collections-2"))
155160
.settings(
156161
name := "scala-core-collections-2",
162+
scalaVersion := scala3Version,
157163
libraryDependencies ++= scalaTestDeps
158164
)
159165

160166
lazy val scala_core_collections_3 =
161167
(project in file("scala-core-collections-modules/scala-core-collections-3"))
162168
.settings(
169+
scalaVersion := scala3Version,
163170
libraryDependencies ++= scalaTestDeps
164171
)
165172

166173
lazy val scala_core_map =
167174
(project in file("scala-core-collections-modules/scala-core-map"))
168175
.settings(
176+
scalaVersion := scala3Version,
169177
libraryDependencies ++= scalaTestDeps
170178
)
171179

@@ -198,6 +206,7 @@ lazy val scala_akka_dependencies: Seq[ModuleID] = Seq(
198206
lazy val scala_test_junit4 = (project in file("scala-test-junit4"))
199207
.settings(
200208
name := "scala-test-junit4",
209+
scalaVersion := scala3Version,
201210
libraryDependencies ++=
202211
Seq(
203212
"org.scalatestplus" %% "junit-4-13" % "3.2.17.0" % Test,
@@ -440,6 +449,7 @@ lazy val scala_libraries_6 = (project in file("scala-libraries-6"))
440449
lazy val scala_strings = (project in file("scala-strings"))
441450
.settings(
442451
name := "scala-strings",
452+
scalaVersion := scala3Version,
443453
libraryDependencies ++= scalaTestDeps,
444454
libraryDependencies += jUnitInterface,
445455
libraryDependencies += "org.scala-lang.modules" %% "scala-parallel-collections" % "1.0.4"
@@ -480,6 +490,7 @@ lazy val scala3_lang_collections =
480490
lazy val cats_effects = (project in file("cats-effects"))
481491
.settings(
482492
name := "cats-effects",
493+
scalaVersion := scala3Version,
483494
libraryDependencies += catsEffect,
484495
libraryDependencies += "org.typelevel" %% "munit-cats-effect-3" % "1.0.7" % Test,
485496
libraryDependencies ++= scalaTestDeps,
@@ -489,6 +500,7 @@ lazy val cats_effects = (project in file("cats-effects"))
489500
lazy val zio = (project in file("zio"))
490501
.settings(
491502
name := "zio",
503+
scalaVersion := scala3Version,
492504
libraryDependencies += "dev.zio" %% "zio" % zioVersion,
493505
libraryDependencies += "dev.zio" %% "zio-streams" % zioVersion,
494506
libraryDependencies += "dev.zio" %% "zio-test-sbt" % zioVersion % Test,
@@ -498,6 +510,7 @@ lazy val zio = (project in file("zio"))
498510
lazy val doobie = (project in file("doobie"))
499511
.settings(
500512
name := "doobie",
513+
scalaVersion := scala3Version,
501514
libraryDependencies += "org.tpolecat" %% "doobie-core" % "1.0.0-RC2",
502515
libraryDependencies += "org.tpolecat" %% "doobie-postgres" % "1.0.0-RC2"
503516
)

0 commit comments

Comments
 (0)
Please sign in to comment.