Skip to content

Commit 5442782

Browse files
committed
Bump versions and fix minor issues
1 parent b1ef479 commit 5442782

File tree

11 files changed

+11
-11
lines changed

11 files changed

+11
-11
lines changed

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ name := "pekko-tutorial"
44

55
version := "1.0"
66

7-
scalaVersion := "2.13.15"
7+
scalaVersion := "2.13.16"
88

99
val pekkoVersion = "1.1.3"
1010
val pekkoHTTPVersion = "1.1.0"

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.1")
1+
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.14.0")
22
//The now built in dependencyTree task is usually enough
33
//https://www.scala-sbt.org/1.x/docs/sbt-1.4-Release-Notes.html#sbt-dependency-graph+is+in-sourced
44
//addDependencyTreePlugin

src/main/scala/akkahttp/HttpFileEcho.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,6 @@ object HttpFileEcho extends App with JsonProtocol {
253253
def browserClient() = {
254254
val os = System.getProperty("os.name").toLowerCase
255255
if (os == "mac os x") Process(s"open http://$address:$port").!
256-
else if (os == "windows 10") Seq("cmd", "/c", s"start http://$address:$port").!
256+
else if (os.startsWith("windows")) Seq("cmd", "/c", s"start http://$address:$port").!
257257
}
258258
}

src/main/scala/akkahttp/SampleRoutes.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ object SampleRoutes extends App with DefaultJsonProtocol with SprayJsonSupport {
161161
def browserClient() = {
162162
val os = System.getProperty("os.name").toLowerCase
163163
if (os == "mac os x") Process(s"open http://127.0.0.1:6002").!
164-
else if (os == "windows 10") Seq("cmd", "/c", s"start http://127.0.0.1:6002").!
164+
else if (os.startsWith("windows")) Seq("cmd", "/c", s"start http://127.0.0.1:6002").!
165165
}
166166

167167
browserClient()

src/main/scala/akkahttp/WebsocketEcho.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ trait ClientCommon {
5353
def browserClient(): AnyVal = {
5454
val os = System.getProperty("os.name").toLowerCase
5555
if (os == "mac os x") Process("open src/main/resources/WebsocketEcho.html").!
56-
else if (os == "windows 10") Seq("cmd", "/c", "start src/main/resources/WebsocketEcho.html").!
56+
else if (os.startsWith("windows")) Seq("cmd", "/c", "start src/main/resources/WebsocketEcho.html").!
5757
}
5858
}
5959

src/main/scala/akkahttp/oidc/OIDCKeycloak.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ object OIDCKeycloak extends App with CORSHandler with JsonSupport {
254254
def browserClient() = {
255255
val os = System.getProperty("os.name").toLowerCase
256256
if (os == "mac os x") Process(s"open http://127.0.0.1:6002").!
257-
else if (os == "windows 10") Seq("cmd", "/c", s"start http://127.0.0.1:6002").!
257+
else if (os.startsWith("windows")) Seq("cmd", "/c", s"start http://127.0.0.1:6002").!
258258
}
259259

260260

src/main/scala/alpakka/amqp/AmqpEcho.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ object AmqpEcho extends App {
295295
val os = System.getProperty("os.name").toLowerCase
296296
val url = rabbitMQContainer.getHttpUrl
297297
if (os == "mac os x") Process(s"open $url").!
298-
else if (os == "windows 10") Seq("cmd", "/c", s"start $url").!
298+
else if (os.startsWith("windows")) Seq("cmd", "/c", s"start $url").!
299299
}
300300

301301
browserClient()

src/main/scala/alpakka/mqtt/MqttPahoEcho.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,6 @@ object MqttPahoEcho extends App {
112112
val os = System.getProperty("os.name").toLowerCase
113113
val url = "http://localhost:8090"
114114
if (os == "mac os x") Process(s"open $url").!
115-
else if (os == "windows 10") Seq("cmd", "/c", s"start $url").!
115+
else if (os.startsWith("windows")) Seq("cmd", "/c", s"start $url").!
116116
}
117117
}

src/main/scala/alpakka/sse/SSEClientWikipediaEdits.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ object SSEClientWikipediaEdits extends App {
4949
private def browserClient() = {
5050
val os = System.getProperty("os.name").toLowerCase
5151
if (os == "mac os x") Process("open src/main/resources/SSEClientWikipediaEdits.html").!
52-
else if (os == "windows 10") Seq("cmd", "/c", "start src/main/resources/SSEClientWikipediaEdits.html").!
52+
else if (os.startsWith("windows")) Seq("cmd", "/c", "start src/main/resources/SSEClientWikipediaEdits.html").!
5353
}
5454

5555
private def sseClient() = {

src/main/scala/alpakka/sse_to_elasticsearch/SSEtoElasticsearch.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ object SSEtoElasticsearch extends App {
267267
val os = System.getProperty("os.name").toLowerCase
268268
val url = s"http://localhost:${searchContainer.getMappedPort(9200)}/$indexName/_search?q=personsFound:*&size=100"
269269
if (os == "mac os x") Process(s"open $url").!
270-
else if (os == "windows 10") Seq("cmd", "/c", s"start $url").!
270+
else if (os.startsWith("windows")) Seq("cmd", "/c", s"start $url").!
271271
else logger.info(s"Please open a browser at: $url")
272272
}
273273

src/test/scala/alpakka/file/DirectoryWatcherSpec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ final class DirectoryWatcherSpec extends AsyncWordSpec with Matchers with Before
6262
"handle_large_number_of_files_in_parent_dir" in {
6363
(1 to 1000).foreach(_ => copyTestFileToDir(uploadDir))
6464
watcher = DirectoryWatcher(uploadDir, processedDir)
65-
waitForCondition(10.seconds)(watcher.countFilesProcessed() == 2 + 1000) shouldBe true
65+
waitForCondition(20.seconds)(watcher.countFilesProcessed() == 2 + 1000) shouldBe true
6666
}
6767

6868
"handle_invalid_parent_directory_path" in {

0 commit comments

Comments
 (0)