Skip to content

Commit 7c5f8f7

Browse files
authored
Merge pull request #840 from yadavan88/scala-collection-rename
Corrected core collections sub module
2 parents 6f7e5ca + b0617fa commit 7c5f8f7

File tree

15 files changed

+11
-18
lines changed

15 files changed

+11
-18
lines changed

build.sbt

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -134,13 +134,6 @@ lazy val scala_lang_2 = (project in file("scala-lang-2"))
134134
Seq(jUnitInterface) ++ scalaTestDeps
135135
)
136136

137-
lazy val scala_core_collection_2 =
138-
(project in file("scala-core-collection-2"))
139-
.settings(
140-
name := "scala-core-collection-2",
141-
libraryDependencies ++= scalaTestDeps
142-
)
143-
144137
lazy val scala_core_collections = (project in file("scala-core-collections"))
145138
.settings(
146139
name := "scala-core-collections",
@@ -155,6 +148,11 @@ lazy val scala_core_collections_2 =
155148
name := "scala-core-collections-2",
156149
libraryDependencies ++= scalaTestDeps
157150
)
151+
lazy val scala_core_collections_3 =
152+
(project in file("scala-core-collections-3"))
153+
.settings(
154+
libraryDependencies ++= scalaTestDeps
155+
)
158156

159157
lazy val scala_test = (project in file("scala-test"))
160158
.settings(

scala-core-collections-2/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@
77
- [Finding the First Element Matching a Condition in a Collection](https://www.baeldung.com/scala/find-first-match-in-collection)
88
- [Append an Element to an Array in Scala](https://www.baeldung.com/scala/array-append-element)
99
- [Create a Random Sample of Fixed Size From a Scala List](https://www.baeldung.com/scala/list-uniform-sample)
10+
- [LazyList in Scala](https://www.baeldung.com/scala/lazylist)
11+
- [How to Flatten Collections in Scala](https://www.baeldung.com/scala/flattening-collections)

scala-core-collection-2/src/test/scala-2/com/baeldung/scala/flattening/FlattenerSpec.scala renamed to scala-core-collections-2/src/test/scala-2/com/baeldung/scala/flattening/FlattenerSpec.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
package com.baeldung.scala.flattening
22

33
import org.scalatest.wordspec.AnyWordSpec
4+
import Flattener._
45

56
import scala.collection.immutable.Queue
67

78
class FlattenerSpec extends AnyWordSpec {
89

9-
import com.baeldung.scala.flattening.Flattener.sequenceFlattener
10-
1110
"A full flattener" should {
1211
"respect the contents of an already flat sequence" in {
1312
val flatList = List(3, 7, 2, 7, 1, 3, 4)

scala-core-collection-2/src/test/scala-2/com/baeldung/scala/lazylists/SimpleLazyListSpec.scala renamed to scala-core-collections-2/src/test/scala-2/com/baeldung/scala/lazylists/SimpleLazyListSpec.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
package com.baedung.scala.lazylists
1+
package com.baeldung.scala.lazylists
22

3-
import com.baeldung.scala.lazylists.{#:@:, SLNil, SimpleLazyList}
43
import org.scalatest.wordspec.AnyWordSpec
54

65
class SimpleLazyListSpec extends AnyWordSpec {

scala-core-collection-2/src/test/scala-2/com/baeldung/scala/lazylists/SimpleListSpec.scala renamed to scala-core-collections-2/src/test/scala-2/com/baeldung/scala/lazylists/SimpleListSpec.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
package com.baedung.scala.lazylists
1+
package com.baeldung.scala.lazylists
22

3-
import com.baeldung.scala.lazylists.{SimpleList, :@:, SLNil}
43
import org.scalatest.wordspec.AnyWordSpec
54

65
class SimpleListSpec extends AnyWordSpec {
Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
### Relevant Articles:
2-
31
- [Guide to Scala Collections](https://www.baeldung.com/scala/collections)
4-
- [Get a List Item by Index in Scala](https://www.baeldung.com/scala/list-get-item-by-index)
52
- [Guide to Scala ListSet](https://www.baeldung.com/scala/listset)
63
- [Guide to Scala ListMap](https://www.baeldung.com/scala/listmap)
7-
- [How to Flatten Collections in Scala](https://www.baeldung.com/scala/flattening-collections)
8-
- [LazyList in Scala](https://www.baeldung.com/scala/lazylist)
4+
- [Get a List Item by Index in Scala](https://www.baeldung.com/scala/list-get-item-by-index)

0 commit comments

Comments
 (0)