Skip to content

Commit 65e0bec

Browse files
Scala 3 support (#836)
* update build * update exerices build * fix compile errors * reformat and restructure testgen * port word-count * remove old test-gens * fix exercises * fix sgf, sieve and linked list exercise * update docs * update about page
1 parent e58ef7f commit 65e0bec

File tree

306 files changed

+680
-3829
lines changed

Some content is hidden

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

306 files changed

+680
-3829
lines changed

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
*.swp
33
.DS_Store
44
.idea
5+
.vscode
56
tmp
67
target/
78
bin/configlet
@@ -13,9 +14,11 @@ bin/configlet.exe
1314
.bloop/
1415
.metals/
1516

16-
project/
17+
project/*
1718
!project/build.properties
1819
!project/plugins.sbt
1920
project/target
2021
src/test/scala/project/
2122
target
23+
24+
generated

.scalafmt.conf

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
version = "3.8.2"
2+
align.preset = most
3+
maxColumn = 160
4+
trailingCommas = always
5+
continuationIndent.callSite = 2
6+
continuationIndent.defnSite = 2
7+
runner.dialect = scala3
8+
rewrite.scala3.convertToNewSyntax = yes
9+
rewrite.scala3.removeOptionalBraces = yes

README.md

Lines changed: 13 additions & 17 deletions

build.sbt

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name := "ExcercismScalaTestGenerator"
2+
3+
ThisBuild / scalaVersion := "3.4.2"
4+
ThisBuild / scalacOptions ++= Seq("-source:future")
5+
6+
lazy val root = project
7+
.in(file("."))
8+
.aggregate(testgen)
9+
10+
lazy val testgen = project
11+
.enablePlugins(SbtTwirl)
12+
.settings(
13+
Compile / TwirlKeys.compileTemplates / sourceDirectories
14+
+= (baseDirectory.value.getParentFile / "src" / "main" / "twirl")
15+
)
16+
.settings(
17+
libraryDependencies += "org.playframework" %% "play-json" % "3.0.4",
18+
libraryDependencies += "org.playframework.twirl" %% "twirl-api" % "2.0.7",
19+
libraryDependencies += "org.scala-lang.modules" %% "scala-parser-combinators" % "2.4.0",
20+
libraryDependencies += "org.apache.commons" % "commons-lang3" % "3.15.0"
21+
)
22+

docs/ABOUT.md

Lines changed: 4 additions & 1 deletion

docs/INSTALLATION.md

Lines changed: 7 additions & 10 deletions

docs/LEARNING.md

Lines changed: 18 additions & 5 deletions

docs/RESOURCES.md

Lines changed: 13 additions & 5 deletions

docs/TESTS.md

Lines changed: 9 additions & 3 deletions

exercises/concept/basics/build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
scalaVersion := "2.13.6"
1+
scalaVersion := "3.4.2"
22

3-
libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.10" % "test"
3+
libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.19" % Test

0 commit comments

Comments
 (0)