Skip to content

Commit 6e9b2d3

Browse files
authored
Merge pull request #42 from rcardin/36-refactor-the-project-to-create-submodules
Extracted a `core` module
2 parents 50066eb + ec461e8 commit 6e9b2d3

File tree

12 files changed

+52
-22
lines changed

12 files changed

+52
-22
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ Porting of the Raise DSL from the Arrow Kt Kotlin library
1212
The library is available on Maven Central. To use it, add the following dependency to your `build.sbt` files:
1313

1414
```sbt
15-
libraryDependencies += "in.rcard" %% "raise4s" % "0.0.5"
15+
libraryDependencies += "in.rcard.raise4s" %% "core" % "0.0.6"
1616
```
1717

1818
The library is only available for Scala 3.
1919

20-
## Usage
20+
## Usage
2121

2222
### The `Raise` DSL in Scala
2323

build.sbt

Lines changed: 42 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,52 @@
1-
inThisBuild(List(
2-
organization := "in.rcard",
3-
homepage := Some(url("https://github.com/rcardin")),
4-
// Alternatively License.Apache2 see https://github.com/sbt/librarymanagement/blob/develop/core/src/main/scala/sbt/librarymanagement/License.scala
5-
licenses := List("Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0")),
6-
developers := List(
7-
Developer(
8-
"rcardin",
9-
"Riccardo Cardin",
10-
"riccardo DOT cardin AT gmail.com",
11-
url("https://github.com/rcardin/raise4s")
1+
inThisBuild(
2+
List(
3+
organization := "in.rcard.raise4s",
4+
homepage := Some(url("https://github.com/rcardin")),
5+
// Alternatively License.Apache2 see https://github.com/sbt/librarymanagement/blob/develop/core/src/main/scala/sbt/librarymanagement/License.scala
6+
licenses := List("Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0")),
7+
developers := List(
8+
Developer(
9+
"rcardin",
10+
"Riccardo Cardin",
11+
"riccardo DOT cardin AT gmail.com",
12+
url("https://github.com/rcardin/raise4s")
13+
)
1214
)
1315
)
14-
))
16+
)
1517

1618
ThisBuild / sonatypeCredentialHost := "s01.oss.sonatype.org"
17-
sonatypeRepository := "https://s01.oss.sonatype.org/service/local"
19+
sonatypeRepository := "https://s01.oss.sonatype.org/service/local"
20+
sonatypeProfileName := "in.rcard"
1821

1922
name := "raise4s"
2023
//version := "0.0.1-SNAPSHOT"
21-
scalaVersion := "3.4.2"
24+
val scala3Version = "3.4.2"
25+
scalaVersion := scala3Version
2226

2327
libraryDependencies ++= Seq(
2428
"org.scalatest" %% "scalatest" % "3.2.18" % Test
25-
)
29+
)
30+
31+
lazy val core = project
32+
.settings(
33+
name := "core",
34+
scalaVersion := scala3Version,
35+
libraryDependencies ++= commonDependencies
36+
)
37+
38+
lazy val raise4s = (project in file("."))
39+
.aggregate(core)
40+
.settings(
41+
scalaVersion := scala3Version
42+
)
43+
44+
lazy val dependencies =
45+
new {
46+
val scalatestVersion = "3.2.17"
47+
val scalatest = "org.scalatest" %% "scalatest" % scalatestVersion
48+
}
49+
50+
lazy val commonDependencies = Seq(
51+
dependencies.scalatest % Test
52+
)
File renamed without changes.

src/main/scala/in/rcard/raise4s/Builders.scala renamed to core/src/main/scala/in/rcard/raise4s/Builders.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package in.rcard.raise4s
22

3-
import in.rcard.raise4s.Bind.value
3+
import Bind.value
44

55
import scala.util.{Failure, Success, Try}
66

File renamed without changes.

src/main/scala/in/rcard/raise4s/Raise.scala renamed to core/src/main/scala/in/rcard/raise4s/Raise.scala

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package in.rcard.raise4s
22

3+
import in.rcard.raise4s
4+
5+
import java.lang.Runtime
36
import scala.annotation.targetName
47
import scala.util.Try
58
import scala.util.control.{ControlThrowable, NoStackTrace, NonFatal}
@@ -1696,5 +1699,5 @@ object Raise {
16961699
* @return
16971700
* The result of the execution of the `block` lambda or the logical error
16981701
*/
1699-
def run[Error, A](block: Raise[Error] ?=> A): Error | A = Runtime._run(block)
1702+
def run[Error, A](block: Raise[Error] ?=> A): Error | A = raise4s.Runtime._run(block)
17001703
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)