Skip to content

Commit

Permalink
Merge pull request #27021 from akka/wip-release-script-213-workaround…
Browse files Browse the repository at this point in the history
…-patriknw

workaround in release script for missing Jackson dependency for Scala 2.13.0-RC2
  • Loading branch information
patriknw committed May 24, 2019
2 parents 1d10322 + 9b46a78 commit 7bd0cc7
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
4 changes: 2 additions & 2 deletions build.sbt
Expand Up @@ -70,7 +70,7 @@ lazy val aggregatedProjects: Seq[ProjectReference] = List[ProjectReference](
testkit) ++
(if (isScala213) List.empty[ProjectReference]
else
List[ProjectReference](jackson, benchJmh, benchJmhTyped)) // FIXME move 2.13 condition when Jackson ScalaModule has been released for Scala 2.13.0
List[ProjectReference](jackson, benchJmh, benchJmhTyped)) // FIXME #27019 remove 2.13 condition when Jackson ScalaModule has been released for Scala 2.13

lazy val root = Project(id = "akka", base = file("."))
.aggregate(aggregatedProjects: _*)
Expand Down Expand Up @@ -244,7 +244,7 @@ lazy val jackson = akkaModule("akka-serialization-jackson")
.settings(AutomaticModuleName.settings("akka.serialization.jackson"))
.settings(OSGi.jackson)
.settings(javacOptions += "-parameters")
// FIXME remove when Jackson ScalaModule has been released for Scala 2.13.0
// FIXME #27019 remove when Jackson ScalaModule has been released for Scala 2.13
.settings(crossScalaVersions -= Dependencies.scala213Version)
.enablePlugins(ScaladocNoVerificationOfDiagrams)
.disablePlugins(MimaPlugin)
Expand Down
7 changes: 6 additions & 1 deletion project/scripts/release
Expand Up @@ -271,7 +271,12 @@ if [ ! $dry_run ]; then
else
RELEASE_OPT="-Dakka.build.version=${version} -Dakka.genjavadoc.enabled=true"
fi
try sbt $RELEASE_OPT +buildRelease

# FIXME #27019 change back to +buildRelease when Jackson ScalaModule has been released for Scala 2.13
#try sbt $RELEASE_OPT +buildRelease
try sbt $RELEASE_OPT buildRelease
try sbt $RELEASE_OPT -Dakka.build.scalaVersion=2.13.0-RC2 buildRelease

try sbt $RELEASE_OPT buildDocs
echolog "Successfully created local release"

Expand Down

0 comments on commit 7bd0cc7

Please sign in to comment.