diff --git a/build.sbt b/build.sbt index 01abee42..b943be65 100644 --- a/build.sbt +++ b/build.sbt @@ -16,7 +16,7 @@ pomIncludeRepository := { _ => false } -ThisBuild / scalaVersion := "2.12.17" +ThisBuild / scalaVersion := "2.12.18" parallelExecution := true crossPaths := false diff --git a/src/sbt-test/sbt-pack/archive-modules/build.sbt b/src/sbt-test/sbt-pack/archive-modules/build.sbt index 13a9b537..dc19dd92 100644 --- a/src/sbt-test/sbt-pack/archive-modules/build.sbt +++ b/src/sbt-test/sbt-pack/archive-modules/build.sbt @@ -3,7 +3,7 @@ import xerial.sbt.pack.PackPlugin._ val commonSettings = Defaults.coreDefaultSettings ++ Seq( - scalaVersion := "2.12.17", + scalaVersion := "2.12.18", version := "0.1", crossPaths := false ) diff --git a/src/sbt-test/sbt-pack/build-sbt/build.sbt b/src/sbt-test/sbt-pack/build-sbt/build.sbt index 751043d9..bbe472af 100644 --- a/src/sbt-test/sbt-pack/build-sbt/build.sbt +++ b/src/sbt-test/sbt-pack/build-sbt/build.sbt @@ -1,5 +1,5 @@ enablePlugins(PackPlugin) -scalaVersion := "2.12.17" +scalaVersion := "2.12.18" packExtraClasspath := Map("hello" -> Seq("${PROG_HOME}/extra")) diff --git a/src/sbt-test/sbt-pack/convention-full/build.sbt b/src/sbt-test/sbt-pack/convention-full/build.sbt index ebad6ad7..2035e107 100644 --- a/src/sbt-test/sbt-pack/convention-full/build.sbt +++ b/src/sbt-test/sbt-pack/convention-full/build.sbt @@ -1,6 +1,6 @@ enablePlugins(PackPlugin) -scalaVersion := "2.12.17" +scalaVersion := "2.12.18" libraryDependencies := Seq("org.xerial" % "xerial-core" % "3.3.6") diff --git a/src/sbt-test/sbt-pack/convention-noversion/build.sbt b/src/sbt-test/sbt-pack/convention-noversion/build.sbt index c175b7fd..b13c51f2 100644 --- a/src/sbt-test/sbt-pack/convention-noversion/build.sbt +++ b/src/sbt-test/sbt-pack/convention-noversion/build.sbt @@ -1,6 +1,6 @@ enablePlugins(PackPlugin) -scalaVersion := "2.12.17" +scalaVersion := "2.12.18" libraryDependencies := Seq("org.xerial" % "xerial-core" % "3.3.6") diff --git a/src/sbt-test/sbt-pack/copy-dependencies/build.sbt b/src/sbt-test/sbt-pack/copy-dependencies/build.sbt index c82b691b..3935e442 100644 --- a/src/sbt-test/sbt-pack/copy-dependencies/build.sbt +++ b/src/sbt-test/sbt-pack/copy-dependencies/build.sbt @@ -1,7 +1,7 @@ -ThisBuild / scalaVersion := "2.12.17" +ThisBuild / scalaVersion := "2.12.18" val commonSettings = Seq( - scalaVersion := "2.12.17", + scalaVersion := "2.12.18", version := "0.1", crossPaths := false, packCopyDependenciesTarget := target.value / "WEB-INF/lib" diff --git a/src/sbt-test/sbt-pack/duplicate-jars/build.sbt b/src/sbt-test/sbt-pack/duplicate-jars/build.sbt index df098b63..151027a5 100644 --- a/src/sbt-test/sbt-pack/duplicate-jars/build.sbt +++ b/src/sbt-test/sbt-pack/duplicate-jars/build.sbt @@ -1,4 +1,4 @@ -ThisBuild / scalaVersion := "2.12.17" +ThisBuild / scalaVersion := "2.12.18" val commonSettings = Defaults.coreDefaultSettings ++ Seq( version := "0.1", crossPaths := false diff --git a/src/sbt-test/sbt-pack/duplicate-jars/test b/src/sbt-test/sbt-pack/duplicate-jars/test index 048882b5..b752aa7b 100644 --- a/src/sbt-test/sbt-pack/duplicate-jars/test +++ b/src/sbt-test/sbt-pack/duplicate-jars/test @@ -1,5 +1,4 @@ > 'set version := "0.1"' > pack -$ exists target/pack/lib/scala-library-2.12.17.jar $ absent target/pack/lib/slf4j-api-1.7.2.jar $ exists target/pack/lib/slf4j-api-1.7.6.jar diff --git a/src/sbt-test/sbt-pack/env-vars/build.sbt b/src/sbt-test/sbt-pack/env-vars/build.sbt index 58f81698..6af6f895 100644 --- a/src/sbt-test/sbt-pack/env-vars/build.sbt +++ b/src/sbt-test/sbt-pack/env-vars/build.sbt @@ -1,7 +1,7 @@ enablePlugins(PackPlugin) name := "env-vars" -scalaVersion := "2.12.17" +scalaVersion := "2.12.18" // custom settings here crossPaths := false diff --git a/src/sbt-test/sbt-pack/exclude-jars/build.sbt b/src/sbt-test/sbt-pack/exclude-jars/build.sbt index 2dc03c35..a1bce8ae 100644 --- a/src/sbt-test/sbt-pack/exclude-jars/build.sbt +++ b/src/sbt-test/sbt-pack/exclude-jars/build.sbt @@ -1,6 +1,6 @@ enablePlugins(PackPlugin) version := "0.1" -scalaVersion := "2.12.17" +scalaVersion := "2.12.18" crossPaths := false name := "exclude-jars" libraryDependencies ++= Seq( diff --git a/src/sbt-test/sbt-pack/exclude-makefile/build.sbt b/src/sbt-test/sbt-pack/exclude-makefile/build.sbt index bc979236..60f405d7 100644 --- a/src/sbt-test/sbt-pack/exclude-makefile/build.sbt +++ b/src/sbt-test/sbt-pack/exclude-makefile/build.sbt @@ -1,5 +1,5 @@ enablePlugins(PackPlugin) -scalaVersion := "2.12.17" +scalaVersion := "2.12.18" crossPaths := false name := "exclude-makefile" version := "0.1" diff --git a/src/sbt-test/sbt-pack/exclude-test-config/build.sbt b/src/sbt-test/sbt-pack/exclude-test-config/build.sbt index acfe7d9f..18a3a7da 100644 --- a/src/sbt-test/sbt-pack/exclude-test-config/build.sbt +++ b/src/sbt-test/sbt-pack/exclude-test-config/build.sbt @@ -1,7 +1,7 @@ -ThisBuild / scalaVersion := "2.12.17" +ThisBuild / scalaVersion := "2.12.18" val commonSettings = Seq( - scalaVersion := "2.12.17", + scalaVersion := "2.12.18", version := "0.1", crossPaths := false ) diff --git a/src/sbt-test/sbt-pack/min-project/build.sbt b/src/sbt-test/sbt-pack/min-project/build.sbt index 01028370..1c073274 100644 --- a/src/sbt-test/sbt-pack/min-project/build.sbt +++ b/src/sbt-test/sbt-pack/min-project/build.sbt @@ -1,6 +1,6 @@ enablePlugins(PackPlugin) name := "min-project" -scalaVersion := "2.12.17" +scalaVersion := "2.12.18" // custom settings here crossPaths := false diff --git a/src/sbt-test/sbt-pack/min-project/test b/src/sbt-test/sbt-pack/min-project/test index 393f0bce..449d4843 100644 --- a/src/sbt-test/sbt-pack/min-project/test +++ b/src/sbt-test/sbt-pack/min-project/test @@ -2,11 +2,9 @@ > pack $ exists target/pack/Makefile $ exists target/pack/bin/hello -$ exists target/pack/lib/scala-library-2.12.17.jar $ exec sh ./target/pack/bin/hello > packArchive $ exists target/min-project-0.1.tar.gz > packInstall ../../local $ exists local/bin/hello $ exists local/min-project/min-project-0.1/lib/min-project-0.1.jar -$ exists local/min-project/min-project-0.1/lib/scala-library-2.12.17.jar diff --git a/src/sbt-test/sbt-pack/multi-module/build.sbt b/src/sbt-test/sbt-pack/multi-module/build.sbt index 6ad994c8..bea55840 100644 --- a/src/sbt-test/sbt-pack/multi-module/build.sbt +++ b/src/sbt-test/sbt-pack/multi-module/build.sbt @@ -1,5 +1,5 @@ val commonSettings = Defaults.coreDefaultSettings ++ Seq( - scalaVersion := "2.12.17", + scalaVersion := "2.12.18", version := "0.1", crossPaths := false ) diff --git a/src/sbt-test/sbt-pack/nested-project/build.sbt b/src/sbt-test/sbt-pack/nested-project/build.sbt index 7fbaae9c..3ae4b2b6 100644 --- a/src/sbt-test/sbt-pack/nested-project/build.sbt +++ b/src/sbt-test/sbt-pack/nested-project/build.sbt @@ -2,7 +2,7 @@ name := "nested" ThisBuild / version := "0.1" -ThisBuild / scalaVersion := "2.12.17" +ThisBuild / scalaVersion := "2.12.18" enablePlugins(PackPlugin) diff --git a/src/sbt-test/sbt-pack/pack-resources/build.sbt b/src/sbt-test/sbt-pack/pack-resources/build.sbt index c518d80e..94f15973 100644 --- a/src/sbt-test/sbt-pack/pack-resources/build.sbt +++ b/src/sbt-test/sbt-pack/pack-resources/build.sbt @@ -3,7 +3,7 @@ lazy val root = Project( base = file(".") ).enablePlugins(PackPlugin) .settings( - scalaVersion := "2.12.17", + scalaVersion := "2.12.18", // Copy files from ${root}/web/... to ${root}/target/pack/web-content... packResourceDir += (baseDirectory.value / "web" -> "web-content"), // custom settings here diff --git a/src/sbt-test/sbt-pack/space in path/build.sbt b/src/sbt-test/sbt-pack/space in path/build.sbt index 1ad49f78..3a94a399 100644 --- a/src/sbt-test/sbt-pack/space in path/build.sbt +++ b/src/sbt-test/sbt-pack/space in path/build.sbt @@ -1,3 +1,3 @@ enablePlugins(PackPlugin) -scalaVersion := "2.12.17" +scalaVersion := "2.12.18"