Skip to content

Commit defc51d

Browse files
cquirozcquiroz
authored
Dotty (#233)
* Support dotty Signed-off-by: Carlos Quiroz <[email protected]>
1 parent 9235411 commit defc51d

File tree

20 files changed

+1044
-57
lines changed

20 files changed

+1044
-57
lines changed

‎.github/workflows/ci.yml

+140
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,140 @@
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+
20+
jobs:
21+
build:
22+
name: Build and Test
23+
strategy:
24+
matrix:
25+
os: [ubuntu-latest]
26+
scala: [2.11.12, 2.12.12, 2.13.3, 3.0.0-M2]
27+
java: [[email protected]]
28+
runs-on: ${{ matrix.os }}
29+
steps:
30+
- name: Checkout current branch (full)
31+
uses: actions/checkout@v2
32+
with:
33+
fetch-depth: 0
34+
35+
- name: Setup Java and Scala
36+
uses: olafurpg/setup-scala@v10
37+
with:
38+
java-version: ${{ matrix.java }}
39+
40+
- name: Cache sbt
41+
uses: actions/cache@v2
42+
with:
43+
path: |
44+
~/.sbt
45+
~/.ivy2/cache
46+
~/.coursier/cache/v1
47+
~/.cache/coursier/v1
48+
~/AppData/Local/Coursier/Cache/v1
49+
~/Library/Caches/Coursier/v1
50+
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
51+
52+
- name: Check that workflows are up to date
53+
run: sbt ++${{ matrix.scala }} githubWorkflowCheck
54+
55+
- name: Build project
56+
run: sbt ++${{ matrix.scala }} test
57+
58+
- name: Compress target directories
59+
run: tar cf targets.tar demo/target macroUtils/target localesFullCurrenciesDb/target testSuite/jvm/target core/js/target testSuite/js/target localesFullDb/target core/jvm/target localesMinimalEnDb/target target project/target
60+
61+
- name: Upload target directories
62+
uses: actions/upload-artifact@v2
63+
with:
64+
name: target-${{ matrix.os }}-${{ matrix.scala }}-${{ matrix.java }}
65+
path: targets.tar
66+
67+
publish:
68+
name: Publish Artifacts
69+
needs: [build]
70+
if: github.event_name != 'pull_request' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v'))
71+
strategy:
72+
matrix:
73+
os: [ubuntu-latest]
74+
scala: [2.13.3]
75+
java: [[email protected]]
76+
runs-on: ${{ matrix.os }}
77+
steps:
78+
- name: Checkout current branch (full)
79+
uses: actions/checkout@v2
80+
with:
81+
fetch-depth: 0
82+
83+
- name: Setup Java and Scala
84+
uses: olafurpg/setup-scala@v10
85+
with:
86+
java-version: ${{ matrix.java }}
87+
88+
- name: Cache sbt
89+
uses: actions/cache@v2
90+
with:
91+
path: |
92+
~/.sbt
93+
~/.ivy2/cache
94+
~/.coursier/cache/v1
95+
~/.cache/coursier/v1
96+
~/AppData/Local/Coursier/Cache/v1
97+
~/Library/Caches/Coursier/v1
98+
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
99+
100+
- name: Download target directories (2.11.12)
101+
uses: actions/download-artifact@v2
102+
with:
103+
name: target-${{ matrix.os }}-2.11.12-${{ matrix.java }}
104+
105+
- name: Inflate target directories (2.11.12)
106+
run: |
107+
tar xf targets.tar
108+
rm targets.tar
109+
110+
- name: Download target directories (2.12.12)
111+
uses: actions/download-artifact@v2
112+
with:
113+
name: target-${{ matrix.os }}-2.12.12-${{ matrix.java }}
114+
115+
- name: Inflate target directories (2.12.12)
116+
run: |
117+
tar xf targets.tar
118+
rm targets.tar
119+
120+
- name: Download target directories (2.13.3)
121+
uses: actions/download-artifact@v2
122+
with:
123+
name: target-${{ matrix.os }}-2.13.3-${{ matrix.java }}
124+
125+
- name: Inflate target directories (2.13.3)
126+
run: |
127+
tar xf targets.tar
128+
rm targets.tar
129+
130+
- name: Download target directories (3.0.0-M2)
131+
uses: actions/download-artifact@v2
132+
with:
133+
name: target-${{ matrix.os }}-3.0.0-M2-${{ matrix.java }}
134+
135+
- name: Inflate target directories (3.0.0-M2)
136+
run: |
137+
tar xf targets.tar
138+
rm targets.tar
139+
140+
- run: sbt ++${{ matrix.scala }} ci-release

‎.github/workflows/clean.yml

+59
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

‎.github/workflows/scala.yml ‎.github/workflows/fmt.yml

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: build
1+
name: scalafmt
22

33
on: [push, pull_request]
44

@@ -15,8 +15,3 @@ jobs:
1515
java-version: 1.8
1616
- name: Checking your code format
1717
run: sbt scalafmtCheckAll
18-
- name: Run tests
19-
run: |
20-
npm install jsdom
21-
sbt +macroUtils/publishLocal +testSuiteJS/test +testSuiteJVM/test demo/run +publishLocal
22-
SCALAJS_VERSION=0.6.33 sbt clean +macroUtils/publishLocal +testSuiteJS/test +testSuiteJVM/test

‎.github/workflows/release.yml

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ jobs:
1313
- name: Publish
1414
run: |
1515
sbt ci-release
16-
SCALAJS_VERSION=0.6.33 sbt clean ci-release
1716
env:
1817
PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
1918
PGP_SECRET: ${{ secrets.PGP_SECRET }}

‎CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
## 1.1.0
4+
5+
* Drop support for scala.js 0.6
6+
* Add support for scala 3.0.0-M2
7+
* Multiple library update
8+
39
## 1.0.0
410

511
* Update scala to 2.12.11

0 commit comments

Comments
 (0)