Update scala/sbt/dependency versions to make the project build and to pass the tests.

Author: JeanMarc van Leerdam

README.md

@@ -11,7 +11,7 @@ Experimental plugin for sbt to create Azure Function artefacts (function.json) n
 
 in your `project/plugins.sbt` add sbt-assembly and sbt-azure-functions:
 
-    addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.10")
+    addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.3.1")
     addSbtPlugin("nl.codestar" % "sbt-azure-functions" % "<latest version>")
 
 in your `build.sbt` provide values for the assembly and azure-functions plugins:

build.sbt

@@ -8,13 +8,13 @@ lazy val commonSettings = Seq(
     Developer(
       "jeanmarc",
       "Jean-Marc van Leerdam",
-      "jean-marc.van.leerdam@ordina.nl",
-      url("https://github.com/jeanmarc")
+      "jean-marc.vanleerdam@soprasteria.com",
+      url("https://soprasteria.com")
     )
   )
 )
 
-lazy val root = (project in file("."))
+lazy val root = project.in(file("."))
   .aggregate(plugin)
   .settings(
     name := "sbt-azure-functions-plugin",
@@ -24,7 +24,7 @@ lazy val root = (project in file("."))
     publish := {}
   )
 
-lazy val plugin = (project in file("plugin"))
+lazy val plugin = project.in(file("plugin"))
   .enablePlugins(SbtPlugin)
   .settings(
     name := "sbt-azure-functions",
@@ -48,14 +48,14 @@ lazy val plugin = (project in file("plugin"))
       "org.scalatest" %% "scalatest" % "3.2.2" % "test",
       "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value
     ),
-    addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.10"),
+    addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.3.1"),
     scriptedLaunchOpts := {
       scriptedLaunchOpts.value ++
         Seq("-Xmx1024M", "-Dplugin.version=" + version.value)
     },
     scriptedBufferLog := false,
-    logBuffered in Test := false,
-    publishArtifact in Test := false
+    Test / logBuffered := false,
+    Test / publishArtifact := false
   )
 
 // workaround for interactive sessions that do not echo the user input (https://github.com/sbt/sbt-bintray/issues/177)

plugin/src/main/scala/sbtazurefunctions/CreateZipFileTask.scala

@@ -19,7 +19,7 @@ object CreateZipFileTask {
 
         val log = sbt.Keys.streams.value.log
 
-        val tgtFolder = (target in Compile).value
+        val tgtFolder = (Compile / target).value
 
         log.info("Running azfunCreateZipFile task...")
         log.info(
@@ -28,7 +28,7 @@ object CreateZipFileTask {
 
         val src = azfunTargetFolder.value
         val tgt = tgtFolder / ensureExtension(azfunZipName.value, "zip")
-        IO.zip(allSubpaths(src), tgt)
+        IO.zip(allSubpaths(src), tgt, None)
         tgt
       }
     )

plugin/src/main/scala/sbtazurefunctions/DefaultSettings.scala

@@ -18,11 +18,11 @@ object DefaultSettings {
   def settings: Seq[Setting[_]] =
     Seq(
       azfunAppInsightsName := azfunFunctionAppName.value,
-      azfunHostJsonFile := (baseDirectory in Compile).value / "host.json",
+      azfunHostJsonFile := (Compile / baseDirectory).value / "host.json",
       azfunJarName := "AzureFunction.jar",
-      azfunLocalSettingsFile := (baseDirectory in Compile).value / "local.settings.json",
+      azfunLocalSettingsFile := (Compile / baseDirectory).value / "local.settings.json",
       azfunSKU := "Standard_LRS",
-      azfunTargetFolder := (target in Compile).value / stripExtension(azfunZipName.value),
+      azfunTargetFolder := (Compile / target).value / stripExtension(azfunZipName.value),
       azfunZipName := "AzureFunction.zip"
     )
 

plugin/src/sbt-test/sbt-azure-functions/deploy/build.sbt

@@ -3,11 +3,11 @@ import sbt.Keys.libraryDependencies
 lazy val root = (project in file("."))
   .settings(
     version := "0.1",
-    scalaVersion := "2.12.7",
+    scalaVersion := "2.12.18",
     libraryDependencies ++= Seq(
       "com.microsoft.azure.functions" % "azure-functions-java-library" % "1.3.1"
     ),
-    assemblyJarName in assembly := "ScalaFunctions.jar",
+    assembly / assemblyJarName := "ScalaFunctions.jar",
     azfunFunctionAppName := "rd-scala-functions",
     azfunLocation := "westeurope",
     azfunResourceGroup := "rg-rd-scala-functions",

plugin/src/sbt-test/sbt-azure-functions/deploy/project/plugins.sbt

@@ -1,4 +1,4 @@
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.10")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.3.1")
 
 sys.props.get("plugin.version") match {
   case Some(x) => addSbtPlugin("nl.codestar" % "sbt-azure-functions" % x)

plugin/src/sbt-test/sbt-azure-functions/simple/build.sbt

@@ -3,9 +3,13 @@ import sbt.Keys.libraryDependencies
 lazy val root = (project in file("."))
   .settings(
     version := "0.1",
-    scalaVersion := "2.12.7",
+    scalaVersion := "2.12.18",
     libraryDependencies ++= Seq(
       "com.microsoft.azure.functions" % "azure-functions-java-library" % "1.3.1"
     ),
-    assemblyJarName in assembly := "ScalaFunctions.jar"
+    assembly / assemblyJarName := "ScalaFunctions.jar",
+    azfunFunctionAppName := "rd-scala-functions",
+    azfunLocation := "westeurope",
+    azfunResourceGroup := "rg-rd-scala-functions",
+    azfunStorageAccount := "a77a749630954151919e"
   )

plugin/src/sbt-test/sbt-azure-functions/simple/project/plugins.sbt

@@ -1,4 +1,4 @@
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.10")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.3.1")
 
 sys.props.get("plugin.version") match {
   case Some(x) => addSbtPlugin("nl.codestar" % "sbt-azure-functions" % x)

plugin/src/test/scala/nl/codestar/azurefunctions/FunctionConfigGeneratorTest.scala

@@ -30,14 +30,14 @@ class FunctionConfigGeneratorTest extends AnyFlatSpec {
 
   "An annotated function" should "be found" in {
     val result = FunctionConfigGenerator.getFunctions(List(getClassUrl))
-    assert(result.isEmpty == false)
+    assert(result.nonEmpty)
   }
 
   "An annotated function" should "produce a configuration" in {
     val result = FunctionConfigGenerator.getConfigs(List(getClassUrl))
-    assert(result.isEmpty == false)
+    assert(result.nonEmpty)
     assert(result.get("ScalaFunction") != null)
-    val config = result.get("ScalaFunction").get
+    val config = result("ScalaFunction")
     assert(config.getEntryPoint == "nl.codestar.azurefunctions.FunctionConfigGeneratorTest.SampleAzureFunctions.run")
     assert(config.getScriptFile == null)
     val binding = config.getBindings.get(0)

project/build.properties

@@ -1 +1 @@
-sbt.version=1.3.12
+sbt.version=1.11.0