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.

Sign up for GitHub

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

Jump to bottom

Update Jetty, Mongo driver #426

Merged
merged 3 commits into from
Nov 16, 2022
Merged

Update Jetty, Mongo driver #426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d749dc8
Update Jetty, Mongo driver
sebaciv Nov 16, 2022
e155a23
Update Scala version
sebaciv Nov 16, 2022
950c0d8
Scala 2.12 compilation fix
sebaciv Nov 16, 2022
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
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.13.8, 2.12.15]
scala: [2.13.10, 2.12.17]
java: [graalvm-ce-java11@21.1.0]
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -92,7 +92,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.13.8]
scala: [2.13.10]
java: [graalvm-ce-java11@21.1.0]
runs-on: ${{ matrix.os }}
steps:
Expand All @@ -118,22 +118,22 @@ jobs:
~/Library/Caches/Coursier/v1
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}

- name: Download target directories (2.13.8)
- name: Download target directories (2.13.10)
uses: actions/download-artifact@v2
with:
name: target-${{ matrix.os }}-2.13.8-${{ matrix.java }}
name: target-${{ matrix.os }}-2.13.10-${{ matrix.java }}

- name: Inflate target directories (2.13.8)
- name: Inflate target directories (2.13.10)
run: |
tar xf targets.tar
rm targets.tar

- name: Download target directories (2.12.15)
- name: Download target directories (2.12.17)
uses: actions/download-artifact@v2
with:
name: target-${{ matrix.os }}-2.12.15-${{ matrix.java }}
name: target-${{ matrix.os }}-2.12.17-${{ matrix.java }}

- name: Inflate target directories (2.12.15)
- name: Inflate target directories (2.12.17)
run: |
tar xf targets.tar
rm targets.tar
Expand Down
2 changes: 1 addition & 1 deletion commons-core/src/main/scala/com/avsystem/commons/misc/AnnotationOf.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ object AnnotationsOf {
final class HasAnnotation[A, T] private()
object HasAnnotation {
private[this] val reusable = new HasAnnotation
def create[A, T]: HasAnnotation[A, T] = reusable.asInstanceOf
def create[A, T]: HasAnnotation[A, T] = reusable.asInstanceOf[HasAnnotation[A, T]]

implicit def materialize[A, T]: HasAnnotation[A, T] = macro macros.misc.MiscMacros.hasAnnotation[A, T]
}
Expand Down
6 changes: 3 additions & 3 deletions commons-core/src/test/scala/com/avsystem/commons/misc/OptRefTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ class OptRefTest extends AnyFunSuite {
}

test("zip") {
assert(OptRef(3).zip(OptRef(2)) == OptRef((3, 2)))
assert(OptRef.Empty.zip(OptRef(2)) == OptRef.Empty)
assert(OptRef(3).zip(OptRef.Empty) == OptRef.Empty)
assert(OptRef[JInteger](3).zip(OptRef[JInteger](2)) == OptRef((3, 2)))
assert(OptRef.Empty.zip(OptRef[JInteger](2)) == OptRef.Empty)
assert(OptRef[JInteger](3).zip(OptRef.Empty) == OptRef.Empty)
}
}
4 changes: 2 additions & 2 deletions commons-mongo/jvm/src/test/scala/com/avsystem/commons/mongo/core/ops/SortingTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ class SortingTest extends AnyFunSuite {
}

test("bsonRef tests") {
val someRef = BsonRef(someKey, GenCodec.StringCodec, null)
val otherRef = BsonRef(otherKey, GenCodec.IntCodec, null)
val someRef = BsonRef[Any, String](someKey, GenCodec.StringCodec, null)
val otherRef = BsonRef[Any, Int](otherKey, GenCodec.IntCodec, null)

assert(someRef.ascending === Sorts.ascending(someKey))
assert(someRef.descending === Sorts.descending(someKey))
Expand Down
4 changes: 2 additions & 2 deletions commons-redis/src/main/scala/com/avsystem/commons/redis/Hash.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ object Hash {
)

def slot(key: ByteString): Int = {
val tagStart = key.indexOf('{')
val tagStart = key.indexOf('{'.toByte) // .toByte to make both Scala 2.12 and 2.13 compiler happy
val bytes = if (tagStart >= 0) {
val tagEnd = key.indexOf('}', tagStart + 1)
val tagEnd = key.indexOf('}'.toByte, tagStart + 1)
if (tagEnd > tagStart + 1)
key.iterator.slice(tagStart + 1, tagEnd)
else key.iterator
Expand Down
8 changes: 4 additions & 4 deletions project/Build.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@ object Build extends BuildDef {
val scalatestVersion = "3.2.12"
val scalatestplusScalacheckVersion = "3.2.12.0"
val scalacheckVersion = "1.16.0"
val jettyVersion = "9.4.48.v20220622"
val mongoVersion = "4.6.1"
val jettyVersion = "9.4.49.v20220914"
val mongoVersion = "4.7.2"
val springVersion = "4.3.26.RELEASE"
val typesafeConfigVersion = "1.4.2"
val commonsIoVersion = "1.3.2" // test only
val scalaLoggingVersion = "3.9.4"
val scalaLoggingVersion = "3.9.5"
val akkaVersion = "2.6.19"
val monixVersion = "3.4.1"
val monixBioVersion = "1.2.0"
Expand Down Expand Up @@ -83,7 +83,7 @@ object Build extends BuildDef {
Developer("ghik", "Roman Janusz", "r.janusz@avsystem.com", url("https://github.com/ghik")),
),

crossScalaVersions := Seq("2.13.8", "2.12.15"),
crossScalaVersions := Seq("2.13.10", "2.12.17"),
scalaVersion := crossScalaVersions.value.head,
compileOrder := CompileOrder.Mixed,

Expand Down