Skip to content

Commit 29dbe0c

Browse files
scala-stewardscala-steward
committed
Merge branch 'master' into update/guava-23.6.1-jre
2 parents c7da52e + f344c2f commit 29dbe0c

File tree

134 files changed

+5834
-908
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+5834
-908
lines changed

‎.arcconfig‎

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

‎.github/workflows/ci.yml‎

Lines changed: 145 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,145 @@
1+
# This file was automatically generated by sbt-github-actions using the
2+
# githubWorkflowGenerate task. You should add and commit this file to
3+
# your git repository. It goes without saying that you shouldn't edit
4+
# this file by hand! Instead, if you wish to make changes, you should
5+
# change your sbt build configuration to revise the workflow description
6+
# to meet your needs, then regenerate this file.
7+
8+
name: Continuous Integration
9+
10+
on:
11+
pull_request:
12+
branches: ['*']
13+
push:
14+
branches: ['*']
15+
tags: [v*]
16+
17+
env:
18+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
19+
REDIS_VERSION: 6.0.9
20+
21+
jobs:
22+
build:
23+
name: Build and Test
24+
strategy:
25+
matrix:
26+
os: [ubuntu-latest]
27+
scala: [2.13.4, 2.12.13]
28+
java: [adopt@1.11]
29+
runs-on: ${{ matrix.os }}
30+
steps:
31+
- name: Checkout current branch (full)
32+
uses: actions/checkout@v2
33+
with:
34+
fetch-depth: 0
35+
36+
- name: Setup Java and Scala
37+
uses: olafurpg/setup-scala@v10
38+
with:
39+
java-version: ${{ matrix.java }}
40+
41+
- name: Cache sbt
42+
uses: actions/cache@v2
43+
with:
44+
path: |
45+
~/.sbt
46+
~/.ivy2/cache
47+
~/.coursier/cache/v1
48+
~/.cache/coursier/v1
49+
~/AppData/Local/Coursier/Cache/v1
50+
~/Library/Caches/Coursier/v1
51+
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
52+
53+
- name: Cache Redis
54+
uses: actions/cache@v2
55+
with:
56+
path: ./redis-${{ env.REDIS_VERSION }}
57+
key: ${{ runner.os }}-redis-cache-v2-${{ env.REDIS_VERSION }}
58+
59+
- name: Setup Node.js
60+
uses: actions/setup-node@v2
61+
with:
62+
node-version: 12
63+
64+
- name: Setup MongoDB
65+
uses: supercharge/mongodb-github-action@1.3.0
66+
with:
67+
mongodb-version: 4.4
68+
69+
- name: Setup Redis
70+
run: ./install-redis.sh
71+
72+
- name: Check that workflows are up to date
73+
run: sbt ++${{ matrix.scala }} githubWorkflowCheck
74+
75+
- name: Build project
76+
run: sbt ++${{ matrix.scala }} test
77+
78+
- name: Compress target directories
79+
run: tar cf targets.tar commons-macros/target commons-core/js/target commons-benchmark/js/target commons-core/target commons-benchmark/target commons-spring/target commons-analyzer/target commons-mongo/target commons-redis/target commons-hocon/target .js/target target commons-jetty/target .jvm/target project/target
80+
81+
- name: Upload target directories
82+
uses: actions/upload-artifact@v2
83+
with:
84+
name: target-${{ matrix.os }}-${{ matrix.scala }}-${{ matrix.java }}
85+
path: targets.tar
86+
87+
publish:
88+
name: Publish Artifacts
89+
needs: [build]
90+
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v'))
91+
strategy:
92+
matrix:
93+
os: [ubuntu-latest]
94+
scala: [2.13.4]
95+
java: [adopt@1.11]
96+
runs-on: ${{ matrix.os }}
97+
steps:
98+
- name: Checkout current branch (full)
99+
uses: actions/checkout@v2
100+
with:
101+
fetch-depth: 0
102+
103+
- name: Setup Java and Scala
104+
uses: olafurpg/setup-scala@v10
105+
with:
106+
java-version: ${{ matrix.java }}
107+
108+
- name: Cache sbt
109+
uses: actions/cache@v2
110+
with:
111+
path: |
112+
~/.sbt
113+
~/.ivy2/cache
114+
~/.coursier/cache/v1
115+
~/.cache/coursier/v1
116+
~/AppData/Local/Coursier/Cache/v1
117+
~/Library/Caches/Coursier/v1
118+
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
119+
120+
- name: Download target directories (2.13.4)
121+
uses: actions/download-artifact@v2
122+
with:
123+
name: target-${{ matrix.os }}-2.13.4-${{ matrix.java }}
124+
125+
- name: Inflate target directories (2.13.4)
126+
run: |
127+
tar xf targets.tar
128+
rm targets.tar
129+
130+
- name: Download target directories (2.12.13)
131+
uses: actions/download-artifact@v2
132+
with:
133+
name: target-${{ matrix.os }}-2.12.13-${{ matrix.java }}
134+
135+
- name: Inflate target directories (2.12.13)
136+
run: |
137+
tar xf targets.tar
138+
rm targets.tar
139+
140+
- env:
141+
PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
142+
PGP_SECRET: ${{ secrets.PGP_SECRET }}
143+
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
144+
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
145+
run: sbt ++${{ matrix.scala }} ci-release

‎.github/workflows/clean.yml‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
# This file was automatically generated by sbt-github-actions using the
2+
# githubWorkflowGenerate task. You should add and commit this file to
3+
# your git repository. It goes without saying that you shouldn't edit
4+
# this file by hand! Instead, if you wish to make changes, you should
5+
# change your sbt build configuration to revise the workflow description
6+
# to meet your needs, then regenerate this file.
7+
8+
name: Clean
9+
10+
on: push
11+
12+
jobs:
13+
delete-artifacts:
14+
name: Delete Artifacts
15+
runs-on: ubuntu-latest
16+
env:
17+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
18+
steps:
19+
- name: Delete artifacts
20+
run: |
21+
# Customize those three lines with your repository and credentials:
22+
REPO=${GITHUB_API_URL}/repos/${{ github.repository }}
23+
24+
# A shortcut to call GitHub API.
25+
ghapi() { curl --silent --location --user _:$GITHUB_TOKEN "$@"; }
26+
27+
# A temporary file which receives HTTP response headers.
28+
TMPFILE=/tmp/tmp.$$
29+
30+
# An associative array, key: artifact name, value: number of artifacts of that name.
31+
declare -A ARTCOUNT
32+
33+
# Process all artifacts on this repository, loop on returned "pages".
34+
URL=$REPO/actions/artifacts
35+
while [[ -n "$URL" ]]; do
36+
37+
# Get current page, get response headers in a temporary file.
38+
JSON=$(ghapi --dump-header $TMPFILE "$URL")
39+
40+
# Get URL of next page. Will be empty if we are at the last page.
41+
URL=$(grep '^Link:' "$TMPFILE" | tr ',' '\n' | grep 'rel="next"' | head -1 | sed -e 's/.*<//' -e 's/>.*//')
42+
rm -f $TMPFILE
43+
44+
# Number of artifacts on this page:
45+
COUNT=$(( $(jq <<<$JSON -r '.artifacts | length') ))
46+
47+
# Loop on all artifacts on this page.
48+
for ((i=0; $i < $COUNT; i++)); do
49+
50+
# Get name of artifact and count instances of this name.
51+
name=$(jq <<<$JSON -r ".artifacts[$i].name?")
52+
ARTCOUNT[$name]=$(( $(( ${ARTCOUNT[$name]} )) + 1))
53+
54+
id=$(jq <<<$JSON -r ".artifacts[$i].id?")
55+
size=$(( $(jq <<<$JSON -r ".artifacts[$i].size_in_bytes?") ))
56+
printf "Deleting '%s' #%d, %'d bytes\n" $name ${ARTCOUNT[$name]} $size
57+
ghapi -X DELETE $REPO/actions/artifacts/$id
58+
done
59+
done

‎.idea/codeStyles/Project.xml‎

Lines changed: 18 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.scala-steward.conf‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
pullRequests.frequency = 7 days
2+
13
updates.ignore = [
24
{groupId: "org.springframework", artifactId: "spring-context"},
35
{groupId: "org.mongodb"},

‎.travis.yml‎

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

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
* `TypeClassDerivation` - implements infrastructure for automatic type class derivation
3939
* [`commons-analyzer`](docs/Analyzer.md) - static analyzer for Scala code, i.e. a compiler plugin that enforces various (mostly unrelated) rules and conventions on source code
4040
* `commons-jetty` - Jetty server utilities
41-
* `commons-mongo` - MongoDB utilities for Scala & Java MongoDB drivers, integration with `GenCodec`
41+
* [`commons-mongo`](docs/TypedMongo.md) - MongoDB utilities for Scala & Java MongoDB drivers, integration with `GenCodec`
4242
* `commons-hocon` - Utilities for working with [HOCON](https://github.com/lightbend/config/blob/master/HOCON.md)
4343
* `HoconInput` - an `Input` implementation for `GenCodec` that can read Lightbend Config (`com.typesafe.config.Config`)
4444
* An AST (`HTree`) and a lexer/parser for HOCON (`HLexer`, `HParser`)

0 commit comments

Comments
 (0)