[ETCM-52] Adjust packaging and SecureRandom to run on Windows

Author: kapke

.gitignore

@@ -4,10 +4,12 @@ project/boot/
 project/plugins/project/
 .ensime
 .ensime_cache/
+.bloop
 
 # IDE folders
 .idea/
 .metals/
+metals.sbt
 .vscode/
 
 # intellij scala worksheet

build.sbt

@@ -124,7 +124,9 @@ scalacOptions in (Compile, console) ~= (_.filterNot(
   )
 ))
 
-parallelExecution in Test := false
+Test / parallelExecution := false
+
+ThisBuild / turbo := true
 
 testOptions in Test += Tests.Argument("-oDG")
 
@@ -142,11 +144,13 @@ unmanagedResourceDirectories in Compile += baseDirectory.value / "src" / "main"
 (scalastyleConfig in Test) := baseDirectory.value / "scalastyle-test-config.xml"
 scalastyleSources in Test ++= { (unmanagedSourceDirectories in Integration).value }
 
+// Packaging
+enablePlugins(JavaAppPackaging)
 mainClass in Compile := Some("io.iohk.ethereum.App")
-
+discoveredMainClasses in Compile := Seq("io.iohk.ethereum.mallet.main.Mallet")
 // Requires the 'ant-javafx.jar' that comes with Oracle JDK
 // Enables creating an executable with the configuration files, has to be run on the OS corresponding to the desired version
-jdkPackagerType := "image"
+ThisBuild / jdkPackagerType := "image"
 
 Universal / mappings += (resourceDirectory in Compile).value / "logback.xml" -> "conf/logback.xml"
 
@@ -157,6 +161,7 @@ jdkPackagerJVMArgs := Seq(
   "-Xss10M"
 )
 
+
 coverageExcludedPackages := "io\\.iohk\\.ethereum\\.extvm\\.msg.*"
 
 addCommandAlias(

project/plugins.sbt

@@ -1,7 +1,7 @@
 logLevel := sbt.Level.Warn
 addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1")
 addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")
-addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.21")
+addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.7.5")
 addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "2.1.0")
 addSbtPlugin("com.thesamet" % "sbt-protoc" % "0.99.25")
 addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.4.2")

src/main/scala/io/iohk/ethereum/nodebuilder/NodeBuilder.scala

@@ -536,7 +536,7 @@ trait GenesisDataLoaderBuilder {
 
 trait SecureRandomBuilder {
   lazy val secureRandom: SecureRandom =
-    Config.secureRandomAlgo.map(SecureRandom.getInstance).getOrElse(new SecureRandom())
+    Config.secureRandomAlgo.flatMap(name => Try(SecureRandom.getInstance(name)).toOption).getOrElse(new SecureRandom())
 }
 
 /** Provides the basic functionality of a Node, except the consensus algorithm.

src/main/scala/io/iohk/ethereum/utils/Ref.scala

@@ -3,7 +3,7 @@ package io.iohk.ethereum.utils
 import java.util.concurrent.atomic.AtomicReference
 
 /**
- * An [[java.util.concurrent.atomic.AtomicReference AtomicReference]] that can be set once.
+ * An [[https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/atomic/AtomicReference.html java.util.concurrent.atomic.AtomicReference]] that can be set once.
  */
 class Ref[T <: AnyRef] {
   private[this] final val ref = new AtomicReference[Option[T]](None)