Skip to content

Commit bdd5dc2

Browse files
authored
Merge pull request #1051 from yadavan88/scala-dates-module
Separate module for Scala Date operations
2 parents b4c92a9 + 6183637 commit bdd5dc2

File tree

22 files changed

+29
-17
lines changed

22 files changed

+29
-17
lines changed

build.sbt

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,7 @@ lazy val scala_core_5 = (project in file("scala-core-modules/scala-core-5"))
6262
name := "scala-core-5",
6363
libraryDependencies ++= scalaTestDeps,
6464
libraryDependencies += jUnitInterface,
65-
libraryDependencies += scalaReflection,
66-
libraryDependencies += "joda-time" % "joda-time" % "2.12.5",
67-
libraryDependencies += "org.joda" % "joda-convert" % "2.2.3",
68-
libraryDependencies += "com.github.nscala-time" %% "nscala-time" % "2.32.0"
65+
libraryDependencies += scalaReflection
6966
)
7067

7168
lazy val scala_core_6 = (project in file("scala-core-modules/scala-core-6"))
@@ -120,6 +117,15 @@ lazy val scala_core_fp = (project in file("scala-core-modules/scala-core-fp"))
120117
Seq(catsEffect, jUnitInterface) ++ scalaTestDeps
121118
)
122119

120+
lazy val scala_core_dates = (project in file("scala-core-modules/scala-core-dates"))
121+
.settings(
122+
name := "scala-core-dates",
123+
libraryDependencies ++= scalaTestDeps,
124+
libraryDependencies += "joda-time" % "joda-time" % "2.12.5",
125+
libraryDependencies += "com.github.nscala-time" %% "nscala-time" % "2.32.0",
126+
libraryDependencies += "com.typesafe" % "config" % "1.4.3",
127+
)
128+
123129
lazy val scala_lang = (project in file("scala-lang-modules/scala-lang"))
124130
.settings(
125131
name := "scala-lang",

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ This module contains articles about Scala's core features.
77
- [@switch Annotation in Scala](https://www.baeldung.com/scala/switch-annotation)
88
- [Benefits of Using Vector in Scala](https://www.baeldung.com/scala/vector-benefits)
99
- [Rich Wrappers in Scala](https://www.baeldung.com/scala/rich-wrappers)
10-
- [Working With Dates and Times in Scala](https://www.baeldung.com/scala/date-time)
1110
- [@inline and @noinline in Scala](https://www.baeldung.com/scala/inline-noinline-annotations)
1211
- [Lambda Expressions in Scala](https://www.baeldung.com/scala/lambda-expressions)
1312
- [Algebraic Data Types in Scala](https://www.baeldung.com/scala/algebraic-data-types)

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
- [Introduction to Scala Macros](https://www.baeldung.com/scala/scala2-macros)
44
- [Introduction to Macros in Scala 2](https://www.baeldung.com/scala/scala2-macros)
55
- [The Builder Pattern in Scala](https://www.baeldung.com/scala/builder-pattern)
6-
- [Guide to Scala Duration and FiniteDuration](https://www.baeldung.com/scala/duration-finiteduration)
7-
- [Get Difference Between Two Dates](https://www.baeldung.com/scala/difference-between-two-dates)
86
- [The Either Type in Scala](https://www.baeldung.com/scala/either-type)
97
- [Understanding the Differences: reduceLeft, reduceRight, foldLeft, foldRight, scanLeft, and scanRight in Scala](https://www.baeldung.com/scala/reduce-fold-scan-left-right)
108
- [Different Ways to Reverse a Sequence in Scala](https://www.baeldung.com/scala/reverse-sequence)
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
## Core Scala
2+
3+
This module contains articles about Scala's date features.
4+
5+
### Relevant Articles:
6+
7+
- [Working With Dates and Times in Scala](https://www.baeldung.com/scala/date-time)
8+
- [Guide to Scala Duration and FiniteDuration](https://www.baeldung.com/scala/duration-finiteduration)
9+
- [Get Difference Between Two Dates](https://www.baeldung.com/scala/difference-between-two-dates)
10+
- [Convert Epoch Milliseconds to DateTime in Scala](https://www.baeldung.com/scala/epoch-milliseconds-datetime)
11+
- [Convert a String to Date in Scala](https://www.baeldung.com/scala/string-to-date)

scala-libraries-2/src/main/scala-2/com/baeldung/date/DateParser.scala renamed to scala-core-modules/scala-core-dates/src/main/scala-2/com/baeldung/scala/date/DateParser.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.baeldung.date
1+
package com.baeldung.scala.date
22

33
import java.util.GregorianCalendar
44
import scala.util.Try

scala-libraries-2/src/test/scala-2/com/baeldung/date/DateParserSpec.scala renamed to scala-core-modules/scala-core-dates/src/test/scala-2/com/baeldung/scala/date/DateParserSpec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.baeldung.date
1+
package com.baeldung.scala.date
22

33
import org.scalatest.matchers.should.Matchers
44
import org.scalatest.wordspec.AnyWordSpec
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package com.baeldung.scala.differencedates
22

33
import org.scalatest.wordspec.AnyWordSpec
4-
import com.baeldung.scala.differencedates.DifferenceBetweenDates._
54
import org.scalatest.matchers.should.Matchers
65

76
import java.time.temporal.ChronoUnit
87
import java.time.{LocalDate, Period}
8+
import DifferenceBetweenDates._
99

1010
class DifferenceBetweenDatesTest extends AnyWordSpec with Matchers {
1111

scala-core-modules/scala-core-8/src/test/scala-2/com/baeldung/scala/duration/DurationTest.scala renamed to scala-core-modules/scala-core-dates/src/test/scala-2/com/baeldung/scala/duration/DurationTest.scala

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
package com.baeldung.scala.duration
22

3+
import com.baeldung.scala.duration.JavaToScalaDuration.{
4+
asFiniteDuration,
5+
asFiniteDurationFromConf
6+
}
37
import org.scalatest.funsuite.AnyFunSuite
48

59
import java.time.Duration
610
import java.time.temporal.ChronoUnit
711
import java.util.concurrent.TimeUnit
812
import scala.concurrent.duration.{FiniteDuration, HOURS}
9-
import com.baeldung.scala.duration.JavaToScalaDuration.{
10-
asFiniteDuration,
11-
asFiniteDurationFromConf
12-
}
13-
1413
import scala.jdk.DurationConverters.JavaDurationOps
1514

1615
class DurationTest extends AnyFunSuite {

scala-libraries-2/README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,4 @@
88
- [Introduction to ScalaCheck](https://www.baeldung.com/scala/scalacheck)
99
- [Simple REST Requests Using Requests-Scala](https://www.baeldung.com/scala/rest-with-requests-scala)
1010
- [Better Enumerations in Scala Using Enumeratum](https://www.baeldung.com/scala/enumeratum)
11-
- [Guide to elastic4s – Elasticsearch Scala Client](https://www.baeldung.com/scala/elastic4s-elasticsearch-client)
12-
- [Convert a String to Date in Scala](https://www.baeldung.com/scala/string-to-date)
11+
- [Guide to elastic4s – Elasticsearch Scala Client](https://www.baeldung.com/scala/elastic4s-elasticsearch-client)

0 commit comments

Comments
 (0)