File tree 3 files changed +4
-8
lines changed
3 files changed +4
-8
lines changed Original file line number Diff line number Diff line change @@ -18,10 +18,8 @@ def osgiExport(scalaVersion: String, version: String) = {
18
18
}) ++ Seq (s " scala.compat.java8.*;version= ${version}" )
19
19
}
20
20
21
- ThisBuild / versionScheme := Some (" early-semver" )
22
- ThisBuild / versionPolicyIntention := Compatibility .BinaryAndSourceCompatible
23
-
24
21
lazy val commonSettings = Seq (
22
+ versionPolicyIntention := Compatibility .BinaryAndSourceCompatible ,
25
23
Compile / unmanagedSourceDirectories ++= {
26
24
(Compile / unmanagedSourceDirectories).value.flatMap { dir =>
27
25
CrossVersion .partialVersion(scalaVersion.value) match {
@@ -73,8 +71,6 @@ lazy val scalaJava8Compat = (project in file("."))
73
71
74
72
libraryDependencies += " com.novocode" % " junit-interface" % " 0.11" % " test" ,
75
73
76
- scalaModuleMimaPreviousVersion := Some (" 1.0.0" ),
77
-
78
74
mimaBinaryIssueFilters ++= {
79
75
import com .typesafe .tools .mima .core ._ , ProblemFilters ._
80
76
Seq (
Original file line number Diff line number Diff line change @@ -31,6 +31,7 @@ verPat="[0-9]+\.[0-9]+\.[0-9]+(-[A-Za-z0-9-]+)?"
31
31
tagPat=" ^v$verPat (#.*)?$"
32
32
33
33
if [[ " $TRAVIS_TAG " =~ $tagPat ]]; then
34
+ versionCheckTask=" versionCheck"
34
35
releaseTask=" ci-release"
35
36
if ! isReleaseJob; then
36
37
echo " Not releasing on Java $ADOPTOPENJDK with Scala $TRAVIS_SCALA_VERSION "
@@ -47,4 +48,4 @@ export CI_SNAPSHOT_RELEASE="${projectPrefix}publish"
47
48
# for now, until we're confident in the new release scripts, just close the staging repo.
48
49
export CI_SONATYPE_RELEASE=" ; sonatypePrepare; sonatypeBundleUpload; sonatypeClose"
49
50
50
- sbt clean ${projectPrefix} test ${projectPrefix} versionPolicyCheck ${projectPrefix} publishLocal $releaseTask
51
+ sbt clean ${projectPrefix} test ${projectPrefix} publishLocal $versionCheckTask $releaseTask
Original file line number Diff line number Diff line change 1
- addSbtPlugin(" org.scala-lang.modules" % " sbt-scala-module" % " 2.3.1" )
2
- addSbtPlugin(" ch.epfl.scala" % " sbt-version-policy" % " 1.2.1" )
1
+ addSbtPlugin(" org.scala-lang.modules" % " sbt-scala-module" % " 2.4.0" )
You can’t perform that action at this time.
0 commit comments