Skip to content

Commit

Permalink
Update for sbt 1.5.2 and Scala 3.0.0-RC3 (#27)
Browse files Browse the repository at this point in the history
  • Loading branch information
ekrich authored May 12, 2021
1 parent fae1173 commit bcd7886
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 8 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ Follow the [contributing guide](./CONTRIBUTING.md).

## Versions

Release [1.1.4](https://github.com/ekrich/sjavatime/releases/tag/v1.1.4) - (2021-05-12)<br/>
Release [1.1.3](https://github.com/ekrich/sjavatime/releases/tag/v1.1.3) - (2021-04-01)<br/>
Release [1.1.2](https://github.com/ekrich/sjavatime/releases/tag/v1.1.2) - (2021-02-23)<br/>
Release [1.1.1](https://github.com/ekrich/sjavatime/releases/tag/v1.1.1) - (2021-02-01)<br/>
Expand Down
7 changes: 3 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
val scala211 = "2.11.12"
val scala212 = "2.12.13"
val scala213 = "2.13.5"
val scala300 = "3.0.0-RC2"
val scala300 = "3.0.0-RC3"

val versionsBase = Seq(scala212, scala211, scala213)
val versionsJVM = versionsBase :+ scala300
Expand Down Expand Up @@ -68,7 +68,7 @@ lazy val sjavatime = crossProject(JSPlatform, NativePlatform)
.settings(commonSettings)
.settings(
Test / test := {},
mappings in (Compile, packageBin) ~= {
Compile / packageBin / mappings ~= {
_.filter(!_._2.endsWith(".class"))
},
sharedScala2or3Source
Expand Down Expand Up @@ -96,8 +96,7 @@ lazy val testSuite = crossProject(JSPlatform, JVMPlatform, NativePlatform)
name := "java.time testSuite on JVM",
crossScalaVersions := versionsJVM,
libraryDependencies +=
("com.novocode" % "junit-interface" % "0.11" % Test)
.withDottyCompat(scalaVersion.value)
"com.novocode" % "junit-interface" % "0.11" % Test
)
.jsSettings(
name := "java.time testSuite on JS",
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.5.0
sbt.version=1.5.2
3 changes: 0 additions & 3 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,5 @@ addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % crossVer)
addSbtPlugin("org.scala-native" % "sbt-scala-native" % scalaNativeVersion)
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % crossVer)

// Dotty - Scala 3
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.5.4")

// includes sbt-dynver sbt-pgp sbt-sonatype sbt-git
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7")
6 changes: 6 additions & 0 deletions scripts/git-release
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/usr/bin/env bash
# Release script from Olafur
set -eux
version=$1
# f option (force) allows a republish with the same versions
git tag -af "v$version" -m "v$version" && git push -f origin v$version

0 comments on commit bcd7886

Please sign in to comment.