Bump version, update release.yml

Author: kazievab

.github/.jvmopts

@@ -0,0 +1,7 @@
+-Xss4M
+-Xms2G
+-Xmx8G
+-XX:ReservedCodeCacheSize=512M
+-XX:MaxMetaspaceSize=8G
+-XX:+CMSClassUnloadingEnabled
+-XX:+UseG1GC

.github/workflows/release.yml

@@ -7,21 +7,21 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2.3.3
       - uses: olafurpg/setup-scala@v10
       - uses: actions/setup-node@v1
-      - uses: olafurpg/setup-gpg@v2
+      - uses: olafurpg/setup-gpg@v3
       - name: Publish
-        run: DEMO_ENABLED=0 sbt -mem 4096 ci-release
+        run: DEMO_ENABLED=0 sbt -jvm-opts .github/.jvmopts clean ci-release
         env:
           PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
           PGP_SECRET: ${{ secrets.PGP_SECRET }}
           SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
           SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
       - name: Publish 0.6
-        run: SCALAJS_VERSION=0.6.33 DEMO_ENABLED=0 sbt -mem 4096 ci-release
+        run: SCALAJS_VERSION=0.6.33 DEMO_ENABLED=0 sbt -jvm-opts .github/.jvmopts clean ci-release
         env:
           PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
           PGP_SECRET: ${{ secrets.PGP_SECRET }}
           SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
-          SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
+          SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changes
 
+## 0.1.0
+
+* Add cross-build for ScalaJS 0.6.x/1.x.x and Scala 2.12.x/2.13.x
+* Bump scalajs-react to 1.7.5 and react to 16.13.1
+* Move scalajs-react-bridge to project utils/bridge
+* Bump other dependencies
+
 ## 0.0.1
 
 * Initial version.

build.sbt

@@ -1,10 +1,12 @@
-lazy val root = if (Settings.isDemoEnabled)
-  project.in(file(".")).aggregate(core, icons, lab, bridge, demo).configure(Settings.rootProject)
-    else
-  project.in(file(".")).aggregate(core, icons, lab, bridge).configure(Settings.rootProject)
+lazy val root =
+  if (Settings.isDemoEnabled)
+    project.in(file(".")).aggregate(core, icons, lab, bridge, demo).configure(Settings.rootProject)
+  else
+    project.in(file(".")).aggregate(core, icons, lab, bridge).configure(Settings.rootProject)
 
 inThisBuild(
   List(
+    organization := Settings.organization,
     homepage := Some(url("https://github.com/kinoplan/scalajs-react-material-ui")),
     licenses := Seq("MIT" -> url("http://opensource.org/licenses/MIT")),
     developers := List(
@@ -37,9 +39,7 @@ lazy val core = (project in file("core")).dependsOn(bridge)
     (sourceManaged in Compile).value / "io" / "kinoplan" / "scalajs" / "react" / "material" / "ui" / "core" / "colors",
     (npmInstallDependencies in Compile).value
   ),
-  sourceGenerators in Compile += muiColorsGenerator.taskValue,
-  sources in(Compile, doc) := Seq.empty,
-  publishArtifact in(Compile, packageDoc) := false,
+  sourceGenerators in Compile += muiColorsGenerator.taskValue
 ).enablePlugins(ScalaJSBundlerPlugin)
 
 lazy val muiIconsGenerator = taskKey[Seq[File]]("mui-icons-generator")
@@ -55,9 +55,7 @@ lazy val icons = (project in file("icons")).dependsOn(bridge)
     (sourceManaged in Compile).value / "io" / "kinoplan" / "scalajs" / "react" / "material" / "ui" / "icons",
     (npmInstallDependencies in Compile).value
   ),
-  sourceGenerators in Compile += muiIconsGenerator.taskValue,
-  sources in(Compile, doc) := Seq.empty,
-  publishArtifact in(Compile, packageDoc) := false,
+  sourceGenerators in Compile += muiIconsGenerator.taskValue
 ).enablePlugins(ScalaJSBundlerPlugin)
 
 lazy val lab = (project in file("lab")).dependsOn(bridge)
@@ -66,9 +64,7 @@ lazy val lab = (project in file("lab")).dependsOn(bridge)
   scalaJSUseMainModuleInitializer := false,
   npmDependencies in Compile ++= Settings.npmDependenciesLab.value,
   npmResolutions in Compile ++= (npmDependencies in Compile).value.toMap,
-  libraryDependencies ++= Settings.scalajsDependenciesLib.value,
-  sources in(Compile, doc) := Seq.empty,
-  publishArtifact in(Compile, packageDoc) := false,
+  libraryDependencies ++= Settings.scalajsDependenciesLib.value
 ).enablePlugins(ScalaJSBundlerPlugin)
 
 lazy val demo = (project in file("demo")).dependsOn(core, lab, bridge)
@@ -97,14 +93,9 @@ lazy val bridge = (project in file("utils/bridge")).settings(commonSettings).set
 ).enablePlugins(ScalaJSBundlerPlugin, BridgeGeneratorPlugin)
 
 lazy val commonSettings = Seq(
-  version := Settings.version,
   crossScalaVersions := Seq("2.12.11", "2.13.3"),
   scalaVersion := crossScalaVersions.value.last,
-  organization := Settings.organization,
   description := Settings.description,
-  homepage := Some(url("https://github.com/kinoplan/scalajs-react-material-ui")),
-  licenses := Seq("MIT" -> url("http://opensource.org/licenses/MIT")),
-  publishArtifact in Test := false,
   webpackBundlingMode := BundlingMode.LibraryOnly(),
   useYarn := true,
   version in webpack := Settings.versions.bundler.webpack,

project/Settings.scala

@@ -2,8 +2,6 @@ import sbt.Keys._
 import sbt._
 
 object Settings {
-  val version = "0.1.0"
-
   val organization = "io.kinoplan"
 
   val description = "scalajs-react facade for material-ui"
@@ -94,7 +92,10 @@ object Settings {
   )
 
   lazy val rootProject: Project => Project = _.settings(
-    name            := "scalajs-react-material-ui",
-    skip in publish := true
+    name := "scalajs-react-material-ui",
+    skip in publish := true,
+    skip in publishLocal := true,
+    skip in publishArtifact := true,
+    Keys.`package` := file("")
   )
 }

project/build.properties

@@ -1 +1 @@
-sbt.version = 1.4.1
+sbt.version = 1.4.2

project/plugins.sbt

@@ -1,5 +1,6 @@
 val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.1.1")
 
+resolvers += Resolver.sonatypeRepo("public")
 resolvers += Resolver.bintrayRepo("oyvindberg", "converter")
 
 addSbtPlugin("org.scalablytyped.converter" % s"sbt-converter${if (scalaJSVersion.startsWith("0.6")) "06" else ""}" % "1.0.0-beta28")
@@ -10,4 +11,4 @@ addSbtPlugin("ch.epfl.scala" % s"sbt-scalajs-bundler${if (scalaJSVersion.startsW
 
 addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.14")
 
-addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.3")
+addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.4")