Skip to content

Commit bd03878

Browse files
authored
Merge branch 'master' into dependabot/npm_and_yarn/website/prismjs-1.21.0
2 parents c6853e6 + d56d935 commit bd03878

File tree

4 files changed

+60
-66
lines changed

4 files changed

+60
-66
lines changed

.github/workflows/publish_snapshot.yml

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ jobs:
1616
steps:
1717
- uses: actions/checkout@v2
1818

19-
- name: Publish macOS artifacts Snapshot
20-
id: publish-macos
21-
if: matrix.os == 'macos-latest'
19+
- name: Publish Snapshot
2220
env:
2321
SONATYPE_NEXUS_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
2422
SONATYPE_NEXUS_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
@@ -27,36 +25,14 @@ jobs:
2725
SNAPSHOT: 'TRUE'
2826
run: ./gradlew publish
2927

30-
- name: Publish windows artifacts Snapshot
31-
id: publish-win
32-
if: matrix.os == 'windows-latest'
33-
env:
34-
SONATYPE_NEXUS_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
35-
SONATYPE_NEXUS_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
36-
GPG_SECRET: ${{ secrets.GPG_SECRET }}
37-
GPG_SIGNING_PASSWORD: ${{ secrets.GPG_SIGNING_PASSWORD }}
38-
SNAPSHOT: 'TRUE'
39-
run: ./gradlew publish
40-
41-
- name: Publish linux artifacts Snapshot
42-
id: publish-linux
43-
if: matrix.os == 'ubuntu-latest'
44-
env:
45-
SONATYPE_NEXUS_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
46-
SONATYPE_NEXUS_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
47-
GPG_SECRET: ${{ secrets.GPG_SECRET }}
48-
GPG_SIGNING_PASSWORD: ${{ secrets.GPG_SIGNING_PASSWORD }}
49-
SNAPSHOT: 'TRUE'
50-
run: ./gradlew publish
51-
52-
- name: Archive lib publications dir
28+
- name: Archive redux-kotlin publications dir
5329
uses: actions/upload-artifact@v1
5430
with:
5531
name: publications-${{ matrix.os }}
5632
path: redux-kotlin/build/publications
5733

58-
- name: Archive lib-threadsafe publications dir
59-
if: steps.publish-win.outputs.exit_code == 0 || steps.publish-macos.outputs.exit_code == 0 || steps.publish-linux.outputs.exit_code == 0
34+
- name: Archive redux-kotlin-threadsafe publications dir
35+
if: steps.publish.outputsexit_code == 0
6036
uses: actions/upload-artifact@v1
6137
with:
6238
name: publications-threadsafe-${{ matrix.os }}

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# [Redux-Kotlin](https://reduxkotlin.org)
22

3-
![CI](https://github.com/reduxkotlin/redux-kotlin/workflows/CI/badge.svg)
3+
![CI](https://github.com/reduxkotlin/redux-kotlin/workflows/PR/badge.svg)
44

55
![badge][badge-android]
66
![badge][badge-ios]

website/package-lock.json

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

website/yarn.lock

Lines changed: 52 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1324,9 +1324,9 @@ binary-extensions@^1.0.0:
13241324
integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
13251325

13261326
bl@^1.0.0:
1327-
version "1.2.2"
1328-
resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.2.tgz#a160911717103c07410cef63ef51b397c025af9c"
1329-
integrity sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==
1327+
version "1.2.3"
1328+
resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.3.tgz#1e8dd80142eac80d7158c9dccc047fb620e035e7"
1329+
integrity sha512-pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww==
13301330
dependencies:
13311331
readable-stream "^2.3.5"
13321332
safe-buffer "^5.1.1"
@@ -1442,9 +1442,9 @@ buffer-from@^1.0.0:
14421442
integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
14431443

14441444
buffer@^5.2.1:
1445-
version "5.4.2"
1446-
resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.4.2.tgz#2012872776206182480eccb2c0fba5f672a2efef"
1447-
integrity sha512-iy9koArjAFCzGnx3ZvNA6Z0clIbbFgbdWQ0mKD3hO0krOrZh8UgA6qMKcZvwLJxS+D6iVR76+5/pV56yMNYTag==
1445+
version "5.6.0"
1446+
resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.6.0.tgz#a31749dc7d81d84db08abf937b6b8c4033f62786"
1447+
integrity sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw==
14481448
dependencies:
14491449
base64-js "^1.0.2"
14501450
ieee754 "^1.1.4"
@@ -1760,18 +1760,16 @@ commander@^2.15.1:
17601760
resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
17611761
integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
17621762

1763+
commander@^2.8.1:
1764+
version "2.20.3"
1765+
resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
1766+
integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
1767+
17631768
commander@^4.0.1:
17641769
version "4.0.1"
17651770
resolved "https://registry.yarnpkg.com/commander/-/commander-4.0.1.tgz#b67622721785993182e807f4883633e6401ba53c"
17661771
integrity sha512-IPF4ouhCP+qdlcmCedhxX4xiGBPyigb8v5NeUp+0LyhwLgxMqyp3S0vl7TAPfS/hiP7FC3caI/PB9lTmP8r1NA==
17671772

1768-
commander@~2.8.1:
1769-
version "2.8.1"
1770-
resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
1771-
integrity sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=
1772-
dependencies:
1773-
graceful-readlink ">= 1.0.0"
1774-
17751773
commondir@^1.0.1:
17761774
version "1.0.1"
17771775
resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
@@ -2161,9 +2159,9 @@ decompress-unzip@^4.0.1:
21612159
yauzl "^2.4.2"
21622160

21632161
decompress@^4.0.0, decompress@^4.2.0:
2164-
version "4.2.0"
2165-
resolved "https://registry.yarnpkg.com/decompress/-/decompress-4.2.0.tgz#7aedd85427e5a92dacfe55674a7c505e96d01f9d"
2166-
integrity sha1-eu3YVCflqS2s/lVnSnxQXpbQH50=
2162+
version "4.2.1"
2163+
resolved "https://registry.yarnpkg.com/decompress/-/decompress-4.2.1.tgz#007f55cc6a62c055afa37c07eb6a4ee1b773f118"
2164+
integrity sha512-e48kc2IjU+2Zw8cTb6VZcJQ3lgVbS4uuB1TfCHbiZIP/haNXm+SVyhu+87jts5/3ROpd82GSVCoNs/z8l4ZOaQ==
21672165
dependencies:
21682166
decompress-tar "^4.0.0"
21692167
decompress-tarbz2 "^4.0.0"
@@ -2455,7 +2453,14 @@ encodeurl@~1.0.2:
24552453
resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
24562454
integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
24572455

2458-
end-of-stream@^1.0.0, end-of-stream@^1.1.0:
2456+
end-of-stream@^1.0.0:
2457+
version "1.4.4"
2458+
resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
2459+
integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
2460+
dependencies:
2461+
once "^1.4.0"
2462+
2463+
end-of-stream@^1.1.0:
24592464
version "1.4.1"
24602465
resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
24612466
integrity sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==
@@ -3210,14 +3215,9 @@ got@^8.3.1:
32103215
url-to-options "^1.0.1"
32113216

32123217
graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0:
3213-
version "4.2.2"
3214-
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.2.tgz#6f0952605d0140c1cfdb138ed005775b92d67b02"
3215-
integrity sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==
3216-
3217-
"graceful-readlink@>= 1.0.0":
3218-
version "1.0.1"
3219-
resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
3220-
integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=
3218+
version "4.2.4"
3219+
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
3220+
integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
32213221

32223222
gray-matter@^2.1.0:
32233223
version "2.1.1"
@@ -5605,7 +5605,7 @@ read-pkg@^1.0.0:
56055605
normalize-package-data "^2.3.2"
56065606
path-type "^1.0.0"
56075607

5608-
readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.5, readable-stream@~2.3.6:
5608+
readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.2.2, readable-stream@~2.3.6:
56095609
version "2.3.6"
56105610
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
56115611
integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
@@ -5618,6 +5618,19 @@ readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.6, readable
56185618
string_decoder "~1.1.1"
56195619
util-deprecate "~1.0.1"
56205620

5621+
readable-stream@^2.3.0, readable-stream@^2.3.5:
5622+
version "2.3.7"
5623+
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
5624+
integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
5625+
dependencies:
5626+
core-util-is "~1.0.0"
5627+
inherits "~2.0.3"
5628+
isarray "~1.0.0"
5629+
process-nextick-args "~2.0.0"
5630+
safe-buffer "~5.1.1"
5631+
string_decoder "~1.1.1"
5632+
util-deprecate "~1.0.1"
5633+
56215634
readable-stream@^3.1.1:
56225635
version "3.4.0"
56235636
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.4.0.tgz#a51c26754658e0a3c21dbf59163bd45ba6f447fc"
@@ -5861,11 +5874,16 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
58615874
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
58625875
integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
58635876

5864-
safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
5877+
safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
58655878
version "5.2.0"
58665879
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519"
58675880
integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==
58685881

5882+
safe-buffer@^5.1.1:
5883+
version "5.2.1"
5884+
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
5885+
integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
5886+
58695887
safe-json-parse@~1.0.1:
58705888
version "1.0.1"
58715889
resolved "https://registry.yarnpkg.com/safe-json-parse/-/safe-json-parse-1.0.1.tgz#3e76723e38dfdda13c9b1d29a1e07ffee4b30b57"
@@ -5897,11 +5915,11 @@ scheduler@^0.15.0:
58975915
object-assign "^4.1.1"
58985916

58995917
seek-bzip@^1.0.5:
5900-
version "1.0.5"
5901-
resolved "https://registry.yarnpkg.com/seek-bzip/-/seek-bzip-1.0.5.tgz#cfe917cb3d274bcffac792758af53173eb1fabdc"
5902-
integrity sha1-z+kXyz0nS8/6x5J1ivUxc+sfq9w=
5918+
version "1.0.6"
5919+
resolved "https://registry.yarnpkg.com/seek-bzip/-/seek-bzip-1.0.6.tgz#35c4171f55a680916b52a07859ecf3b5857f21c4"
5920+
integrity sha512-e1QtP3YL5tWww8uKaOCQ18UxIT2laNBXHjV/S2WYCiK4udiv8lkG89KRIoCjUagnAmCBurjF4zEVX2ByBbnCjQ==
59035921
dependencies:
5904-
commander "~2.8.1"
5922+
commander "^2.8.1"
59055923

59065924
select@^1.1.2:
59075925
version "1.1.2"
@@ -6607,9 +6625,9 @@ typedarray@^0.0.6:
66076625
integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
66086626

66096627
unbzip2-stream@^1.0.9:
6610-
version "1.3.3"
6611-
resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.3.3.tgz#d156d205e670d8d8c393e1c02ebd506422873f6a"
6612-
integrity sha512-fUlAF7U9Ah1Q6EieQ4x4zLNejrRvDWUYmxXUpN3uziFYCHapjWFaCAnreY9bGgxzaMCFAPPpYNng57CypwJVhg==
6628+
version "1.4.3"
6629+
resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz#b0da04c4371311df771cdc215e87f2130991ace7"
6630+
integrity sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==
66136631
dependencies:
66146632
buffer "^5.2.1"
66156633
through "^2.3.8"

0 commit comments

Comments
 (0)