Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Upgrade Scala.js to 1.0.0-RC2 #821

Merged
merged 11 commits into from
Dec 13, 2019
Merged

Upgrade Scala.js to 1.0.0-RC2 #821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
30a3ab9
Upgrade Scala.js to 1.0.0-RC1
xerial Nov 22, 2019
9ce5a00
Upgrade scala-js-java-logging to 0.1.6
xerial Nov 22, 2019
cbc37b3
Update build.sbt
xerial Dec 11, 2019
3b6b672
Migrate to Scala.js 1.0.0-RC2
xerial Dec 11, 2019
58c930b
Upgrade scalacheck to 1.14.3
xerial Dec 12, 2019
53d44db
Merge branch 'master' into scalajs-rc1
xerial Dec 12, 2019
98c91a5
scala-collection-compat 2.1.3
xerial Dec 13, 2019
3aa44a1
Fix plugin version
xerial Dec 13, 2019
db1d400
Merge branch 'scalajs-rc1' of github.com:xerial/airframe into scalajs…
xerial Dec 13, 2019
e9c701a
Upgrade to sbt 1.3.5
xerial Dec 13, 2019
48a870e
Add workaround for Scala.js linker error
xerial Dec 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/release-js.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ jobs:
- name: Build for Scala.js 1.0.x
env:
PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
run: SCALA_JS_VERSION=1.0.0-M8 ./sbt "projectJS/publishSigned"
run: SCALA_JS_VERSION=1.0.0-RC2 ./sbt "projectJS/publishSigned"
- name: Release to Sonatype
env:
SONATYPE_USERNAME: '${{ secrets.SONATYPE_USER }}'
SONATYPE_PASSWORD: '${{ secrets.SONATYPE_PASS }}'
run: SCALA_JS_VERSION=1.0.0-M8 ./sbt sonatypeBundleRelease
run: SCALA_JS_VERSION=1.0.0-RC2 ./sbt sonatypeBundleRelease
3 changes: 2 additions & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,4 +81,5 @@ jobs:
key: ${{ runner.os }}-scala-js-${{ hashFiles('**/*.sbt') }}
restore-keys: ${{ runner.os }}-scala-js-
- name: Scala.js test
run: ./sbt projectJS/test
# A workaround for Scala.js linker error
run: ./sbt "; airspecJS/test:fastOptJS; projectJS/test"
4 changes: 2 additions & 2 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ val untilScala2_12 = SCALA_2_12 :: SCALA_2_11 :: Nil
val targetScalaVersions = SCALA_2_13 :: untilScala2_12

val SCALATEST_VERSION = "3.0.8"
val SCALACHECK_VERSION = "1.14.2"
val SCALACHECK_VERSION = "1.14.3"
val MSGPACK_VERSION = "0.8.20"
val SCALA_PARSER_COMBINATOR_VERSION = "1.1.2"
val SQLITE_JDBC_VERSION = "3.28.0"
Expand Down Expand Up @@ -56,7 +56,7 @@ val buildSettings = Seq[Setting[_]](
scalacOptions ++= Seq("-feature", "-deprecation"), // ,"-Ytyper-debug"),
testFrameworks += airSpecFramework,
libraryDependencies ++= Seq(
"org.scala-lang.modules" %%% "scala-collection-compat" % "2.1.2"
"org.scala-lang.modules" %%% "scala-collection-compat" % "2.1.3"
)
)

Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
sbt.version=1.3.4
sbt.version=1.3.5
2 changes: 1 addition & 1 deletion project/plugin.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.3.0")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.1")

val SCALA_JS_VERSION = sys.env.getOrElse("SCALA_JS_VERSION", "1.0.0-M8")
val SCALA_JS_VERSION = sys.env.getOrElse("SCALA_JS_VERSION", "1.0.0-RC2")

addSbtPlugin("org.scala-js" % "sbt-scalajs" % SCALA_JS_VERSION)

Expand Down