Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Drop 2.12, add MiMa check, prepare for 1.1.0 release #146

Merged
merged 1 commit into from
Sep 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ jobs:
scala:
- 2.13.14
- 3.3.3
- 2.12.18

steps:
- uses: actions/checkout@v2
Expand All @@ -25,7 +24,7 @@ jobs:
java-version: [email protected]

- name: build ${{ matrix.scala }}
run: sbt ++${{ matrix.scala }} clean coverage test
run: sbt ++${{ matrix.scala }} clean check coverage test

- name: test coverage
if: success()
Expand Down
37 changes: 29 additions & 8 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,24 +1,23 @@
import Dependencies._
import Dependencies.*

name := "akka-serialization"

organization := "com.evolutiongaming"

homepage := Some(url("http://github.com/evolution-gaming/akka-serialization"))
homepage := Some(url("https://github.com/evolution-gaming/akka-serialization"))

startYear := Some(2018)

organizationName := "Evolution"

organizationHomepage := Some(url("https://evolution.com"))

crossScalaVersions := Seq("3.3.3", "2.13.14", "2.12.18")
crossScalaVersions := Seq("3.3.3", "2.13.14")
scalaVersion := crossScalaVersions.value.head


scalacOptions ++= {
CrossVersion.partialVersion(scalaVersion.value) match {
case Some((3, _)) => Seq("-Xsource-features:package-prefix-implicits")
case Some((2, 13)) => Seq("-Xsource:3", "-Ytasty-reader")
case _ => Seq.empty
}
Expand All @@ -34,7 +33,10 @@ libraryDependencies ++= (CrossVersion.partialVersion(scalaVersion.value) match {
Scodec.core2 % Optional
)
})
libraryDependencies ++= Seq(Akka.actor, scalatest % Test)
libraryDependencies ++= Seq(
Akka.actor,
scalatest % Test,
)

publishTo := Some(Resolver.evolutionReleases)

Expand All @@ -44,7 +46,26 @@ releaseCrossBuild := true

Compile / doc / scalacOptions ++= Seq("-groups", "-implicits", "-no-link-warnings")

scalacOptsFailOnWarn := Some(false)
addCommandAlias("check", "+all versionPolicyCheck Compile/doc")
addCommandAlias("build", "+all test package")

//addCommandAlias("check", "all versionPolicyCheck Compile/doc")
addCommandAlias("check", "show version")
// Your next release will be binary compatible with the previous one,
// but it may not be source compatible (ie, it will be a minor release).
ThisBuild / versionPolicyIntention := Compatibility.BinaryCompatible

//TODO: after 1.1.0 release - clear up versionPolicyIgnored section
/*
versionPolicyReportDependencyIssues ignored dependencies when compared to akka-serialization 1.0.5.
All of those should not affect the library users, binary compatibility should be preserved.
*/
ThisBuild / versionPolicyIgnored ++= Seq(
//com.chuusai:shapeless_2.13: missing dependency
"com.chuusai" %% "shapeless",
//org.scala-lang.modules:scala-java8-compat_2.13:
// incompatible version change from 0.9.0 to 1.0.0 (compatibility: early semantic versioning)
"org.scala-lang.modules" %% "scala-java8-compat",
//org.scodec:scodec-bits_2.13: missing dependency
"org.scodec" %% "scodec-bits",
//org.scodec:scodec-core_2.13: missing dependency
"org.scodec" %% "scodec-core",
)
4 changes: 2 additions & 2 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import sbt._
import sbt.*

object Dependencies {

val scalatest = "org.scalatest" %% "scalatest" % "3.2.17"
val scalatest = "org.scalatest" %% "scalatest" % "3.2.19"

object Akka {
private val version = "2.6.21"
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.9.9
sbt.version=1.10.1
8 changes: 5 additions & 3 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.12")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.1.1")

addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.3.11")
addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.3.13")

addSbtPlugin("com.github.sbt" % "sbt-release" % "1.4.0")

addSbtPlugin("com.evolution" % "sbt-scalac-opts-plugin" % "0.0.9")

addSbtPlugin("com.evolution" % "sbt-artifactory-plugin" % "0.0.2")
addSbtPlugin("com.evolution" % "sbt-artifactory-plugin" % "0.0.2")

addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "3.2.1")
2 changes: 1 addition & 1 deletion version.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ThisBuild / version := "1.0.6-SNAPSHOT"
ThisBuild / version := "1.1.0-SNAPSHOT"
Loading