raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Merge pull request #27021 from akka/wip-release-script-213-workaround-patriknw

Browse source 
workaround in release script for missing Jackson dependency for Scala 2.13.0-RC2
This commit is contained in:
Patrik Nordwall 2019-05-24 12:25:21 +02:00 • committed by GitHub
commit 7bd0cc746f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
build.sbt
View file

@ -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: _*)
@ -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)

7
project/scripts/release
View file

@ -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"