Skip to content

Commit 3f69e67

Browse files
committed
Merge branch 'master' into implicit-opt-arg
2 parents 74db107 + b5221cb commit 3f69e67

File tree

17 files changed

+63
-439
lines changed

17 files changed

+63
-439
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,14 @@ on:
1616

1717
env:
1818
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
19-
REDIS_VERSION: 6.2.12
2019

2120
jobs:
2221
build:
2322
name: Build and Test
2423
strategy:
2524
matrix:
2625
os: [ubuntu-latest]
27-
scala: [2.13.15]
26+
scala: [2.13.16]
2827
java: [temurin@17, temurin@21]
2928
runs-on: ${{ matrix.os }}
3029
steps:
@@ -52,26 +51,17 @@ jobs:
5251
- name: Setup sbt
5352
uses: sbt/setup-sbt@v1
5453

55-
- name: Cache Redis
56-
uses: actions/cache@v2
57-
with:
58-
path: ./redis-${{ env.REDIS_VERSION }}
59-
key: ${{ runner.os }}-redis-cache-v2-${{ env.REDIS_VERSION }}
60-
6154
- name: Setup Node.js
6255
uses: actions/setup-node@v2
6356
with:
6457
node-version: 12
6558

6659
- name: Setup MongoDB
67-
uses: supercharge/mongodb-github-action@1.10.0
60+
uses: supercharge/mongodb-github-action@1.12.0
6861
with:
69-
mongodb-version: 7.0
62+
mongodb-version: 8.0
7063
mongodb-replica-set: test-rs
7164

72-
- name: Setup Redis
73-
run: ./install-redis.sh
74-
7565
- name: Check that workflows are up to date
7666
run: sbt '++ ${{ matrix.scala }}' githubWorkflowCheck
7767

@@ -85,7 +75,7 @@ jobs:
8575
strategy:
8676
matrix:
8777
os: [ubuntu-latest]
88-
scala: [2.13.15]
78+
scala: [2.13.16]
8979
java: [temurin@17]
9080
runs-on: ${{ matrix.os }}
9181
steps:

.scala-steward.conf

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
pullRequests.grouping = [
2+
{
3+
name = "jetty",
4+
title = "Update Jetty dependencies",
5+
filter = [{ group = "org.eclipse.jetty" }, { group = "org.eclipse.jetty*" }]
6+
}
7+
]

README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
[![Continuous Integration](https://github.com/AVSystem/scala-commons/actions/workflows/ci.yml/badge.svg)](https://github.com/AVSystem/scala-commons/actions/workflows/ci.yml)
44
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.avsystem.commons/commons-core_2.12/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.avsystem.commons/commons-core_2.13)
55

6-
**[API reference](http://avsystem.github.io/scala-commons/api/com/avsystem/commons/index.html)**
7-
86
**NOTE** This library is available to the public but it's mostly used internally at AVSystem. Therefore, API may frequently change in an incompatible way.
97

108
## Modules and features
@@ -34,7 +32,7 @@
3432
[`OptRef`](http://avsystem.github.io/scala-commons/api/com/avsystem/commons/misc/OptRef.html) (implemented as value
3533
classes)
3634
* [Components](docs/Components.md) and Dependency Injection library
37-
* `commons-redis` - [Scala driver for Redis](docs/RedisDriver.md)
35+
* `commons-redis` (DEPRECATED) - [Scala driver for Redis](docs/RedisDriver.md)
3836
* `commons-macros` contains implementations of macros used in other modules and reusable macro utilities:
3937
* `MacroCommons` trait with several convenience functions for implementing macros
4038
* `TypeClassDerivation` - implements infrastructure for automatic type class derivation

benchmark/jvm/src/main/scala/com/avsystem/commons/redis/EncodingBenchmark.scala

Lines changed: 0 additions & 40 deletions
This file was deleted.

benchmark/jvm/src/main/scala/com/avsystem/commons/redis/Profiled.scala

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)