File tree Expand file tree Collapse file tree 3 files changed +3
-13
lines changed Expand file tree Collapse file tree 3 files changed +3
-13
lines changed Original file line number Diff line number Diff line change 1
1
# Scala Server Toolkit Documentation
2
2
3
3
* [ Getting Started] ( #getting-started )
4
- <<<<<<< HEAD
5
4
* [ Rationale] ( rationale.md )
6
- =======
7
5
* [ Modules JVM] ( jvm.md )
8
- >>>>>>> feat: Add jvm-execution, jvm-ssl and jvm-system modules
9
6
* [ Module PureConfig] ( pureconfig.md )
10
7
11
8
## Getting Started
Original file line number Diff line number Diff line change @@ -23,6 +23,6 @@ val program = for {
23
23
randomNumber <- systemModule.random.nextInt
24
24
_ <- systemModule.console.printLine(s " Current Unix epoch time is $currentTime ms. Random number: $randomNumber" )
25
25
} yield ()
26
- // program: zio.ZIO[Any, Throwable, Unit] = zio.ZIO$FlatMap@2d237460
26
+ // program: zio.ZIO[Any, Throwable, Unit] = zio.ZIO$FlatMap@7f42b194
27
27
```
28
28
Original file line number Diff line number Diff line change @@ -20,16 +20,9 @@ import zio.Task
20
20
final case class ServerConfiguration (listenAddress : String , listenPort : Int )
21
21
22
22
implicit val serverConfigurationReader : ConfigReader [ServerConfiguration ] = deriveReader
23
- <<<<<<< HEAD
24
- // serverConfigurationReader: ConfigReader[ServerConfiguration] = pureconfig.generic.DerivedConfigReader1$$anon$3@3c04ddda
23
+ // serverConfigurationReader: ConfigReader[ServerConfiguration] = pureconfig.generic.DerivedConfigReader1$$anon$3@1a9e2c3b
25
24
26
25
val maybeConfiguration = PureConfigModule .make[Task , ServerConfiguration ]
27
- // maybeConfiguration: Task[Either[cats.data.NonEmptyList[String], ServerConfiguration]] = zio.ZIO$EffectPartial@47b494ce
28
- =======
29
- // serverConfigurationReader: ConfigReader[ServerConfiguration] = pureconfig.generic.DerivedConfigReader1$$anon$3@3e7940b3
30
-
31
- val maybeConfiguration = PureConfigModule .make[Task , ServerConfiguration ]
32
- // maybeConfiguration: Task[Either[cats.data.NonEmptyList[String], ServerConfiguration]] = zio.ZIO$EffectPartial@1ae37be2
33
- >>>>>>> feat : Add jvm- execution, jvm- ssl and jvm- system modules
26
+ // maybeConfiguration: Task[Either[cats.data.NonEmptyList[String], ServerConfiguration]] = zio.ZIO$EffectPartial@5f92e5eb
34
27
```
35
28
You can’t perform that action at this time.
0 commit comments