diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4e5c71d..3fbcb3b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,6 +2,8 @@ name: CI on: push: + paths-ignore: + - '*.md' branches: [ master ] tags: - '*' @@ -13,34 +15,34 @@ jobs: runs-on: ubuntu-latest steps: - - name: Git checkout - uses: actions/checkout@v2 + - name: Git checkout (merge) + uses: actions/checkout@v3 + if: github.event_name != 'pull_request' with: fetch-depth: 0 + - name: Git checkout (PR) + uses: actions/checkout@v3 + if: github.event_name == 'pull_request' + with: + fetch-depth: 0 + # see: https://frontside.com/blog/2020-05-26-github-actions-pull_request/#how-does-pull_request-affect-actionscheckout + ref: ${{ github.event.pull_request.head.sha }} + - name: Setup Node.js - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: - node-version: '12' + node-version: '16' - name: Set up JDK 8 - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: java-version: '8' distribution: 'adopt' - - - name: Cache sbt - uses: actions/cache@v2 - with: - path: | - ~/.sbt - ~/.ivy2/cache - ~/.coursier/cache/v1 - ~/.cache/coursier/v1 - key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt', 'project/**/*.scala') }} + cache: 'sbt' - name: Cache node_modules - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | ~/.npm @@ -62,7 +64,7 @@ jobs: COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} - name: Publish SNAPSHOT - run: sbt ";^^1.5.2 ;clean ;publish" + run: sbt ";^^1.6.2 ;clean ;publish" if: ${{ !github.event.pull_request && env.TAG_NAME == '' }} env: SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} @@ -75,7 +77,7 @@ jobs: echo $PGP_SECRET | base64 --decode > ./keys/secring.gpg VERSION="$(echo "$TAG_NAME" | cut -d'v' -f 2)" echo "Publish a release version=$VERSION for tag $TAG_NAME" - version=$VERSION sbt ";^^1.5.2 ;clean ;publishSigned ;sonatypeBundleRelease" + version=$VERSION sbt ";^^1.6.2 ;clean ;publishSigned ;sonatypeBundleRelease" if: ${{ env.TAG_NAME != '' }} env: SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} diff --git a/.gitignore b/.gitignore index bd90e87..db67036 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ *.class *.log +package-lock.json # sbt specific .cache diff --git a/.sbtopts b/.sbtopts new file mode 100644 index 0000000..cd59c68 --- /dev/null +++ b/.sbtopts @@ -0,0 +1,2 @@ +-J-Xmx2G +-J-XX:+UseG1GC diff --git a/README.md b/README.md index 90e169b..dd8755d 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![CI](https://github.com/scommons/sbt-scommons-plugin/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/scommons/sbt-scommons-plugin/actions/workflows/ci.yml?query=workflow%3Aci+branch%3Amaster) [![Coverage Status](https://coveralls.io/repos/github/scommons/sbt-scommons-plugin/badge.svg?branch=master)](https://coveralls.io/github/scommons/sbt-scommons-plugin?branch=master) [![scala-index](https://index.scala-lang.org/scommons/sbt-scommons-plugin/sbt-scommons-plugin/latest-by-scala-version.svg?targetType=Sbt)](https://index.scala-lang.org/scommons/sbt-scommons-plugin/sbt-scommons-plugin) -[![Scala.js](https://www.scala-js.org/assets/badges/scalajs-1.5.0.svg)](https://www.scala-js.org) +[![Scala.js](https://www.scala-js.org/assets/badges/scalajs-1.8.0.svg)](https://www.scala-js.org) ## sbt-scommons-plugin Sbt auto-plugins with common tasks/utils for Scala Commons modules diff --git a/build.sbt b/build.sbt index d3a5758..80c5116 100644 --- a/build.sbt +++ b/build.sbt @@ -1,3 +1,5 @@ +import definitions.GitHubActionsCI +import org.scoverage.coveralls.Imports.CoverallsKeys._ val ideExcludedDirectories = SettingKey[Seq[File]]("ide-excluded-directories") .withRank(KeyRanks.Invisible) @@ -41,16 +43,18 @@ lazy val `sbt-scommons-plugin` = (project in file(".")) coverageMinimum := 80, coverageHighlighting := false, coverageExcludedPackages := ".*mecha.*;.*project.*", + coverallsFailBuildOnError := true, + coverallsService := GitHubActionsCI.jobId.map(_ => GitHubActionsCI), addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.1.0"), - addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.5.1"), - addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.20.0"), + addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.10.1"), + addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.21.0"), //addSbtPlugin("com.storm-enroute" % "mecha" % "0.3"), //TODO: use version for sbt 1.x libraryDependencies ++= Seq( - "org.scalatest" %% "scalatest" % "3.2.9" % "test", - "org.scalamock" %% "scalamock" % "5.1.0" % "test" + "org.scalatest" %% "scalatest" % "3.2.14" % "test", + "org.scalamock" %% "scalamock" % "5.2.0" % "test" ), //resolvers += "Sonatype Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/", diff --git a/project/build.properties b/project/build.properties index 83be3cf..b46cfa1 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.5.2 \ No newline at end of file +sbt.version = 1.6.2 \ No newline at end of file diff --git a/project/plugins.sbt b/project/plugins.sbt index 9ca3a90..36b6216 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -4,5 +4,5 @@ addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.5") addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0") -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.7.3") -addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.2.7") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.9.3") +addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.3.2") diff --git a/project/src/main/scala/definitions/GitHubActionsCI.scala b/project/src/main/scala/definitions/GitHubActionsCI.scala new file mode 100644 index 0000000..c04bf48 --- /dev/null +++ b/project/src/main/scala/definitions/GitHubActionsCI.scala @@ -0,0 +1,27 @@ +package definitions + +import org.scoverage.coveralls.CIService + +import scala.io.Source +import scala.util.parsing.json.{JSON, JSONObject} + +case object GitHubActionsCI extends CIService { + val name = "" + val jobId: Option[String] = sys.env.get("GITHUB_RUN_ID") + + // https://github.com/coverallsapp/github-action/blob/master/src/run.ts#L31-L40 + val pullRequest: Option[String] = for { + eventName <- sys.env.get("GITHUB_EVENT_NAME") if eventName.startsWith("pull_request") + payloadPath <- sys.env.get("GITHUB_EVENT_PATH") + source = Source.fromFile(payloadPath, "utf-8") + lines = try source.mkString finally source.close() + payload <- JSON.parseRaw(lines) + prNumber <- payload.asInstanceOf[JSONObject].obj.get("number") + } yield prNumber.toString.stripSuffix(".0") + + // https://docs.github.com/en/actions/learn-github-actions/environment-variables + val currentBranch: Option[String] = pullRequest match { + case Some(_) => sys.env.get("GITHUB_HEAD_REF") + case None => sys.env.get("GITHUB_REF_NAME") + } +} diff --git a/src/main/scala/scommons/sbtplugin/ScommonsPlugin.scala b/src/main/scala/scommons/sbtplugin/ScommonsPlugin.scala index 9a6c0e6..82fd74a 100644 --- a/src/main/scala/scommons/sbtplugin/ScommonsPlugin.scala +++ b/src/main/scala/scommons/sbtplugin/ScommonsPlugin.scala @@ -4,8 +4,7 @@ import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._ import sbt.Keys._ import sbt._ import scommons.sbtplugin.util.{BundlesUtils, ResourcesUtils} - -import scalajsbundler.Webpack +import scalajsbundler.{NpmPackage, Webpack} import scalajsbundler.sbtplugin.ScalaJSBundlerPlugin import scalajsbundler.sbtplugin.ScalaJSBundlerPlugin.autoImport._ @@ -99,18 +98,33 @@ object ScommonsPlugin extends AutoPlugin { val nodeArgs = (Test / webpackNodeArgs).value val bundleName = bundleOutput.data.name.stripSuffix(".js") val webpackOutput = targetDir / s"$bundleName-webpack-out.js" + val webpackVersion = (webpack / version).value logger.info("Executing webpack...") val loader = bundleOutput.data - customWebpackConfigFile match { + val configArgs = customWebpackConfigFile match { case Some(configFile) => val customConfigFileCopy = Webpack.copyCustomWebpackConfigFiles(targetDir, webpackResources.value.get)(configFile) - Webpack.run(nodeArgs: _*)("--mode", "development", "--config", customConfigFileCopy.getAbsolutePath, loader.absolutePath, "--output", webpackOutput.absolutePath)(targetDir, logger) + Seq("--config", customConfigFileCopy.getAbsolutePath) case None => - Webpack.run(nodeArgs: _*)("--mode", "development", loader.absolutePath, "--output", webpackOutput.absolutePath)(targetDir, logger) + Seq.empty } + val allArgs = Seq( + "--entry", loader.absolutePath, + "--output-path", targetDir.absolutePath, + "--output-filename", webpackOutput.name + ) ++ configArgs + + NpmPackage(webpackVersion).major match { + case Some(5) => + Webpack.run(nodeArgs: _*)(allArgs: _*)(targetDir, logger) + case Some(x) => + sys.error(s"Unsupported webpack major version $x") + case None => + sys.error("No webpack version defined") + } Attributed(webpackOutput)(bundleOutput.metadata) } else bundleOutput diff --git a/src/main/scala/scommons/sbtplugin/project/CommonClientModule.scala b/src/main/scala/scommons/sbtplugin/project/CommonClientModule.scala index 9d0819b..0ef1225 100644 --- a/src/main/scala/scommons/sbtplugin/project/CommonClientModule.scala +++ b/src/main/scala/scommons/sbtplugin/project/CommonClientModule.scala @@ -1,6 +1,7 @@ package scommons.sbtplugin.project import org.portablescala.sbtplatformdeps.PlatformDepsPlugin.autoImport._ +import org.scalajs.linker.interface.ESVersion import org.scalajs.jsenv.nodejs.NodeJSEnv import org.scalajs.sbtplugin.ScalaJSPlugin import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._ @@ -62,13 +63,18 @@ trait CommonClientModule extends CommonModule { object CommonClientModule { val settings: Seq[Setting[_]] = Seq( + scalacOptions ++= Seq( + //see: + // http://www.scala-js.org/news/2021/12/10/announcing-scalajs-1.8.0/ + "-P:scalajs:nowarnGlobalExecutionContext" + ), scalaJSLinkerConfig ~= { _.withModuleKind(ModuleKind.CommonJSModule) .withSourceMap(false) - .withESFeatures(_.withUseECMAScript2015(false)) + .withESFeatures(_.withESVersion(ESVersion.ES5_1)) }, Test / requireJsDomEnv := false, - webpack / version := "4.29.0", + webpack / version := "5.74.0", webpackEmitSourceMaps := false, Test / parallelExecution := false, diff --git a/src/main/scala/scommons/sbtplugin/project/CommonLibs.scala b/src/main/scala/scommons/sbtplugin/project/CommonLibs.scala index b8ea0b6..3d24579 100644 --- a/src/main/scala/scommons/sbtplugin/project/CommonLibs.scala +++ b/src/main/scala/scommons/sbtplugin/project/CommonLibs.scala @@ -11,6 +11,7 @@ trait CommonLibs { val playJsonVer = "2.9.0" val playWsVer = "2.0.8" val jodaTimeVer = "2.10.5" + val scalaJsJavaSecureRandomVer = "1.0.0" ////////////////////////////////////////////////////////////////////////////// // jvm dependencies @@ -37,6 +38,8 @@ trait CommonLibs { lazy val scalajsDom = Def.setting("org.scala-js" %%% "scalajs-dom" % "2.2.0") lazy val playJsonJs = Def.setting("com.typesafe.play" %%% "play-json" % playJsonVer) + + lazy val scalaJsJavaSecureRandom = Def.setting("org.scala-js" %%% "scalajs-java-securerandom" % scalaJsJavaSecureRandomVer) } object CommonLibs extends CommonLibs diff --git a/src/main/scala/scommons/sbtplugin/project/CommonMobileModule.scala b/src/main/scala/scommons/sbtplugin/project/CommonMobileModule.scala index b71ed0c..227e507 100644 --- a/src/main/scala/scommons/sbtplugin/project/CommonMobileModule.scala +++ b/src/main/scala/scommons/sbtplugin/project/CommonMobileModule.scala @@ -1,6 +1,7 @@ package scommons.sbtplugin.project import org.portablescala.sbtplatformdeps.PlatformDepsPlugin.autoImport._ +import org.scalajs.linker.interface.ESVersion import org.scalajs.jsenv.nodejs.NodeJSEnv import org.scalajs.sbtplugin.ScalaJSPlugin import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._ @@ -52,17 +53,22 @@ object CommonMobileModule { "org.scommons.react-native" % "scommons-react-native-test" % "*" ), + scalacOptions ++= Seq( + //see: + // http://www.scala-js.org/news/2021/12/10/announcing-scalajs-1.8.0/ + "-P:scalajs:nowarnGlobalExecutionContext" + ), scalaJSLinkerConfig ~= { _.withModuleKind(ModuleKind.CommonJSModule) .withSourceMap(false) - .withESFeatures(_.withUseECMAScript2015(false)) + .withESFeatures(_.withESVersion(ESVersion.ES5_1)) }, scalaJSUseMainModuleInitializer := false, webpackBundlingMode := BundlingMode.LibraryOnly(), // react-native DO NOT require DOM Test / requireJsDomEnv := false, - webpack / version := "4.29.0", + webpack / version := "5.74.0", webpackEmitSourceMaps := false, Test / parallelExecution := false, diff --git a/src/main/scala/scommons/sbtplugin/project/CommonModule.scala b/src/main/scala/scommons/sbtplugin/project/CommonModule.scala index e18f137..23962c1 100644 --- a/src/main/scala/scommons/sbtplugin/project/CommonModule.scala +++ b/src/main/scala/scommons/sbtplugin/project/CommonModule.scala @@ -30,9 +30,13 @@ object CommonModule { val coverageMinimum = SettingKey[Double]("coverage-minimum") val coverageExcludedPackages = SettingKey[String]("coverage-excluded-packages") + val coverallsFailBuildOnError = SettingKey[Boolean]( + "coverallsFailBuildOnError", + "fail build if coveralls step fails" + ) val settings: Seq[Setting[_]] = Seq( - scalaVersion := "2.13.5", + scalaVersion := "2.13.8", scalacOptions ++= Seq( //see https://docs.scala-lang.org/overviews/compiler-options/index.html#Warning_Settings //"-Xcheckinit", @@ -54,6 +58,11 @@ object CommonModule { }, coverageMinimum := 80, + coverallsFailBuildOnError := true, + + //improving performance by disabling this feature that was introduced in: + // https://github.com/scoverage/sbt-scoverage/releases/tag/v1.8.0 + Compile / compile / scalacOptions -= "-P:scoverage:reportTestName", resolvers += "Sonatype Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/" ) diff --git a/src/main/scala/scommons/sbtplugin/project/CommonNodeJsModule.scala b/src/main/scala/scommons/sbtplugin/project/CommonNodeJsModule.scala index b9f2a38..28b561c 100644 --- a/src/main/scala/scommons/sbtplugin/project/CommonNodeJsModule.scala +++ b/src/main/scala/scommons/sbtplugin/project/CommonNodeJsModule.scala @@ -1,6 +1,7 @@ package scommons.sbtplugin.project import org.portablescala.sbtplatformdeps.PlatformDepsPlugin.autoImport._ +import org.scalajs.linker.interface.ESVersion import org.scalajs.jsenv.nodejs.NodeJSEnv import org.scalajs.sbtplugin.ScalaJSPlugin import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._ @@ -38,13 +39,18 @@ trait CommonNodeJsModule extends CommonModule { object CommonNodeJsModule { val settings: Seq[Setting[_]] = Seq( + scalacOptions ++= Seq( + //see: + // http://www.scala-js.org/news/2021/12/10/announcing-scalajs-1.8.0/ + "-P:scalajs:nowarnGlobalExecutionContext" + ), scalaJSLinkerConfig ~= { _.withModuleKind(ModuleKind.CommonJSModule) .withSourceMap(false) - .withESFeatures(_.withUseECMAScript2015(false)) + .withESFeatures(_.withESVersion(ESVersion.ES5_1)) }, Test / requireJsDomEnv := false, - webpack / version := "4.29.0", + webpack / version := "5.74.0", webpackEmitSourceMaps := false, Test / parallelExecution := false, diff --git a/src/main/scala/scommons/sbtplugin/project/CommonTestLibs.scala b/src/main/scala/scommons/sbtplugin/project/CommonTestLibs.scala index 547be3c..869b68b 100644 --- a/src/main/scala/scommons/sbtplugin/project/CommonTestLibs.scala +++ b/src/main/scala/scommons/sbtplugin/project/CommonTestLibs.scala @@ -5,10 +5,10 @@ import sbt._ trait CommonTestLibs { - val scalaTestVersion = "3.2.9" - val scalaTestPlusMockitoVersion = "3.2.9.0" + val scalaTestVersion = "3.2.14" + val scalaTestPlusMockitoVersion = "3.2.10.0" val scalaTestPlusPlayVersion = "5.1.0" - val scalaMockVersion = "5.1.0" + val scalaMockVersion = "5.2.0" val dockerTestkitVersion = "0.9.9" val akkaVersion: String = CommonLibs.akkaVersion diff --git a/src/sbt-test/sbt-scommons-plugin/simple/build.sbt b/src/sbt-test/sbt-scommons-plugin/simple/build.sbt index 4fdb3b1..ee43d4c 100644 --- a/src/sbt-test/sbt-scommons-plugin/simple/build.sbt +++ b/src/sbt-test/sbt-scommons-plugin/simple/build.sbt @@ -1,4 +1,5 @@ +import org.scalajs.linker.interface.ESVersion import play.sbt._ lazy val root = (project in file(".")) @@ -11,7 +12,7 @@ lazy val client = (project in file("client")) .enablePlugins(ScalaJSPlugin, ScalaJSBundlerPlugin, ScalaJSWeb) .settings( version := "0.1.0-SNAPSHOT", - scalaVersion := "2.13.5", + scalaVersion := "2.13.8", libraryDependencies ++= Seq( ("com.googlecode.web-commons" % "web-common-client" % "1.0.5").intransitive() @@ -28,11 +29,11 @@ lazy val client = (project in file("client")) scalaJSLinkerConfig ~= { //_.withModuleKind(ModuleKind.CommonJSModule) _.withSourceMap(false) - .withESFeatures(_.withUseECMAScript2015(false)) + .withESFeatures(_.withESVersion(ESVersion.ES5_1)) }, scalaJSUseMainModuleInitializer := true, //webpackBundlingMode := BundlingMode.LibraryOnly(), - webpack / version := "4.29.0", + webpack / version := "5.74.0", fastOptJS / webpackConfigFile := Some(baseDirectory.value / "client.webpack.config.js"), fullOptJS / webpackConfigFile := Some(baseDirectory.value / "client.webpack.config.js"), scommonsRequireWebpackInTest := true, @@ -40,12 +41,10 @@ lazy val client = (project in file("client")) webpackEmitSourceMaps := false, Compile / npmDevDependencies ++= Seq( - "css-loader" -> "2.1.1", - "mini-css-extract-plugin" -> "0.12.0", - "resolve-url-loader" -> "3.1.2", - "url-loader" -> "4.1.1", - "webpack-node-externals" -> "2.5.2", - "webpack-merge" -> "4.1.0" + "css-loader" -> "6.7.2", + "mini-css-extract-plugin" -> "2.6.1", + "webpack-node-externals" -> "3.0.0", + "webpack-merge" -> "5.8.0" ) ) @@ -54,7 +53,7 @@ lazy val server = (project in file("server")) .disablePlugins(PlayLayoutPlugin) .settings( version := "0.1.0-SNAPSHOT", - scalaVersion := "2.13.5", + scalaVersion := "2.13.8", libraryDependencies ++= Seq( "org.scaldi" %% "scaldi-play" % "0.6.1", diff --git a/src/sbt-test/sbt-scommons-plugin/simple/client/client.webpack.config.js b/src/sbt-test/sbt-scommons-plugin/simple/client/client.webpack.config.js index 3373dfb..1ff53db 100644 --- a/src/sbt-test/sbt-scommons-plugin/simple/client/client.webpack.config.js +++ b/src/sbt-test/sbt-scommons-plugin/simple/client/client.webpack.config.js @@ -1,6 +1,8 @@ -const merge = require("webpack-merge") +const { merge } = require("webpack-merge") const generatedConfig = require('./scalajs.webpack.config') const commonClientConfig = require("./common.webpack.config.js") -module.exports = merge(generatedConfig, commonClientConfig) +module.exports = merge(generatedConfig, commonClientConfig, { + mode: 'production' +}) diff --git a/src/sbt-test/sbt-scommons-plugin/simple/client/common.webpack.config.js b/src/sbt-test/sbt-scommons-plugin/simple/client/common.webpack.config.js index 2cf273f..e6e8f56 100644 --- a/src/sbt-test/sbt-scommons-plugin/simple/client/common.webpack.config.js +++ b/src/sbt-test/sbt-scommons-plugin/simple/client/common.webpack.config.js @@ -8,16 +8,11 @@ module.exports = { module: { rules: [{ test: /\.(ico|png|gif|jpe?g|svg)$/i, - use: { - loader: 'url-loader', - options: { - esModule: false - //limit: 8192 - } - }, + // More information here https://webpack.js.org/guides/asset-modules/ + type: "asset", exclude: /node_modules/ }, { - test: /\.css$/, + test: /\.css$/i, use: [{ loader: MiniCssExtractPlugin.loader, options: { @@ -27,14 +22,11 @@ module.exports = { loader: 'css-loader', options: { modules: true, - localIdentName: '[local]__[hash:base64:5]', - sourceMap: true + sourceMap: true, + modules: { + localIdentName: '[local]__[hash:base64:5]' + } } - }, { - loader: 'resolve-url-loader', - options: { - sourceMap: true - }, }], exclude: /node_modules/ }] diff --git a/src/sbt-test/sbt-scommons-plugin/simple/client/test.webpack.config.js b/src/sbt-test/sbt-scommons-plugin/simple/client/test.webpack.config.js index ea67391..8c0381f 100644 --- a/src/sbt-test/sbt-scommons-plugin/simple/client/test.webpack.config.js +++ b/src/sbt-test/sbt-scommons-plugin/simple/client/test.webpack.config.js @@ -1,5 +1,5 @@ const nodeExternals = require('webpack-node-externals') -const merge = require("webpack-merge") +const { merge } = require("webpack-merge") const commonConfig = require("./common.webpack.config.js") module.exports = merge(commonConfig, { diff --git a/src/sbt-test/sbt-scommons-plugin/simple/project/build.properties b/src/sbt-test/sbt-scommons-plugin/simple/project/build.properties index 83be3cf..b46cfa1 100644 --- a/src/sbt-test/sbt-scommons-plugin/simple/project/build.properties +++ b/src/sbt-test/sbt-scommons-plugin/simple/project/build.properties @@ -1 +1 @@ -sbt.version = 1.5.2 \ No newline at end of file +sbt.version = 1.6.2 \ No newline at end of file diff --git a/src/sbt-test/sbt-scommons-plugin/simple/project/plugins.sbt b/src/sbt-test/sbt-scommons-plugin/simple/project/plugins.sbt index f91a79b..d54b7be 100644 --- a/src/sbt-test/sbt-scommons-plugin/simple/project/plugins.sbt +++ b/src/sbt-test/sbt-scommons-plugin/simple/project/plugins.sbt @@ -10,4 +10,4 @@ sys.props.get("plugin.version") match { addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.8") -addSbtPlugin("ch.epfl.scala" % "sbt-web-scalajs-bundler" % "0.20.0") +addSbtPlugin("ch.epfl.scala" % "sbt-web-scalajs-bundler" % "0.21.0") diff --git a/version.sbt b/version.sbt index cb21ea3..38e12e7 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -ThisBuild / version := sys.env.getOrElse("version", default = "0.9.0-SNAPSHOT").stripPrefix("v") +ThisBuild / version := sys.env.getOrElse("version", default = "1.0.0-SNAPSHOT").stripPrefix("v")