Skip to content

Commit aa76569

Browse files
angelacorteangelacorte
authored
Merge branch 'master' into feat/terminators
2 parents 1592e98 + bf0b510 commit aa76569

File tree

133 files changed

+10796
-1955
lines changed

Some content is hidden

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

133 files changed

+10796
-1955
lines changed

‎.editorconfig‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
[*.{kt,kts}]
2-
indent_size=4
2+
indent_size = 4
33
insert_final_newline = true
4-
ij_kotlin_imports_layout=*
5-
ktlint_code_style=intellij_idea
4+
ij_kotlin_imports_layout = *
5+
ij_kotlin_line_break_after_multiline_when_entry = false
6+
ktlint_code_style = intellij_idea
67
ktlint_function_naming_ignore_when_annotated_with = Composable
8+
ktlint_standard_blank-line-between-when-conditions = disabled
9+
ktlint_standard_mixed-condition-operators = disabled
710
max_line_length = 120
811

912
# Do not apply the general rule to generated files

‎.github/workflows/build-and-deploy.yml‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ jobs:
2222
id: ci-preparation
2323
run: echo "build-ref=${{ github.workflow }}-${{ github.event.number || github.ref }}" >> $GITHUB_OUTPUT
2424
- name: Checkout
25-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
25+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
2626
- name: Compute the Java version
2727
id: java-version
2828
run: ruby -e 'puts("java-version=#{/^minJavaVersion\s*=\s*(\d+)$/.match(File.read("gradle.properties"))[1]}")' >> $GITHUB_OUTPUT
2929
- name: Install Node
30-
uses: actions/setup-node@v6.0.0
30+
uses: actions/setup-node@v6.1.0
3131
with:
3232
node-version-file: package.json
3333
- name: Compute the next release version
@@ -57,8 +57,8 @@ jobs:
5757
timeout-minutes: 180
5858
steps:
5959
- name: Checkout
60-
uses: actions/checkout@v5.0.0
61-
- uses: DanySK/build-check-deploy-gradle-action@6d07f94e0b67e21367b02d06b64250159260718a # 4.0.10
60+
uses: actions/checkout@v6.0.1
61+
- uses: DanySK/build-check-deploy-gradle-action@810719541546fff1db1edd1fb858e12654dc1d95 # 4.0.17
6262
with:
6363
pre-build-command: ./gradlew kotlinUpgradeYarnLock
6464
build-command: true
@@ -76,8 +76,8 @@ jobs:
7676
timeout-minutes: 30
7777
steps:
7878
- name: Checkout
79-
uses: danysk/action-checkout@691c39b8c95afa68ab368def403db850341dc773 # 0.2.24
80-
- uses: DanySK/build-check-deploy-gradle-action@6d07f94e0b67e21367b02d06b64250159260718a # 4.0.10
79+
uses: danysk/action-checkout@7f6ee3cd5bd670cdb3e162894776736254afff1e # 0.2.27
80+
- uses: DanySK/build-check-deploy-gradle-action@810719541546fff1db1edd1fb858e12654dc1d95 # 4.0.17
8181
with:
8282
retries-on-failure: 5
8383
wait-between-retries: 120
@@ -91,7 +91,7 @@ jobs:
9191
- name: Tar files
9292
run: tar -cvf website.tar build/website
9393
- name: Upload website
94-
uses: actions/upload-artifact@v5.0.0
94+
uses: actions/upload-artifact@v6.0.0
9595
with:
9696
name: website-${{ github.sha }}
9797
path: website.tar
@@ -131,8 +131,8 @@ jobs:
131131
timeout-minutes: 120
132132
steps:
133133
- name: Checkout with full history
134-
uses: danysk/action-checkout@691c39b8c95afa68ab368def403db850341dc773 # 0.2.24
135-
- uses: DanySK/build-check-deploy-gradle-action@6d07f94e0b67e21367b02d06b64250159260718a # 4.0.10
134+
uses: danysk/action-checkout@7f6ee3cd5bd670cdb3e162894776736254afff1e # 0.2.27
135+
- uses: DanySK/build-check-deploy-gradle-action@810719541546fff1db1edd1fb858e12654dc1d95 # 4.0.17
136136
with:
137137
signing-key: ${{ secrets.SIGNING_KEY }}
138138
signing-password: ${{ secrets.SIGNING_PASSWORD }}
@@ -151,20 +151,20 @@ jobs:
151151
fi
152152
- name: Upload fatjars built on Linux
153153
if: ${{ runner.os == 'Linux' }}
154-
uses: actions/upload-artifact@v5.0.0
154+
uses: actions/upload-artifact@v6.0.0
155155
with:
156156
name: fat-jars-${{ github.sha }}
157157
path: build/shadow/*
158158
if-no-files-found: error
159159
- name: Upload the PKGBUILD
160160
if: ${{ runner.os == 'Linux' }}
161-
uses: actions/upload-artifact@v5.0.0
161+
uses: actions/upload-artifact@v6.0.0
162162
with:
163163
name: pkgbuild-${{ github.sha }}
164164
path: build/pkgbuild/PKGBUILD
165165
if-no-files-found: error
166166
- name: Upload platform-specific packages
167-
uses: actions/upload-artifact@v5.0.0
167+
uses: actions/upload-artifact@v6.0.0
168168
with:
169169
name: installer-package-${{ github.sha }}-${{ runner.os }}
170170
path: build/package/*
@@ -179,7 +179,7 @@ jobs:
179179
always() && needs.assemble-and-upload.result == 'success'
180180
steps:
181181
- name: Download packages
182-
uses: actions/download-artifact@v6.0.0
182+
uses: actions/download-artifact@v7.0.0
183183
with:
184184
name: installer-package-${{ github.sha }}-${{ runner.os }}
185185
- name: Install packages
@@ -214,7 +214,7 @@ jobs:
214214
always() && needs.assemble-and-upload.result == 'success'
215215
steps:
216216
- name: Download packages
217-
uses: actions/download-artifact@v6.0.0
217+
uses: actions/download-artifact@v7.0.0
218218
with:
219219
name: installer-package-${{ github.sha }}-${{ runner.os }}
220220
- name: Work around xdg bug https://bugs.archlinux.org/task/33316
@@ -242,7 +242,7 @@ jobs:
242242
image: fedora:44
243243
steps:
244244
- name: Download packages
245-
uses: actions/download-artifact@v6.0.0
245+
uses: actions/download-artifact@v7.0.0
246246
with:
247247
name: installer-package-${{ github.sha }}-${{ runner.os }}
248248
- name: Install packages
@@ -275,7 +275,7 @@ jobs:
275275
# Work around https://github.com/actions/checkout/issues/1169
276276
# sudo git config --system --add safe.directory /__w/Alchemist/Alchemist
277277
- name: Download the PKGBUILD
278-
uses: actions/download-artifact@v6.0.0
278+
uses: actions/download-artifact@v7.0.0
279279
with:
280280
pattern: pkgbuild-${{ github.sha }}
281281
merge-multiple: true
@@ -284,7 +284,7 @@ jobs:
284284
namcap PKGBUILD 2>&1
285285
namcap PKGBUILD 2>&1 | awk 'END { exit (NR > 0 ? NR : 0) }'
286286
- name: Download the RPM
287-
uses: actions/download-artifact@v6.0.0
287+
uses: actions/download-artifact@v7.0.0
288288
with:
289289
pattern: installer-package-${{ github.sha }}-${{ runner.os }}
290290
merge-multiple: true
@@ -352,15 +352,15 @@ jobs:
352352
)
353353
steps:
354354
- name: Checkout
355-
uses: actions/checkout@v5.0.0
355+
uses: actions/checkout@v6.0.1
356356
with:
357357
fetch-depth: 0
358358
fetch-tags: 'true'
359359
submodules: recursive
360360
token: ${{ secrets.DEPLOYMENT_TOKEN }}
361361
- name: Checkout the docs
362362
if: contains(github.repository, 'AlchemistSimulator/Alchemist')
363-
uses: actions/checkout@v5.0.0
363+
uses: DanySK/checkout-classic@f55ca46048a09d13b47f0e80db6b546977327791 # 1.0.0
364364
with:
365365
path: website
366366
fetch-depth: 0
@@ -369,32 +369,32 @@ jobs:
369369
repository: AlchemistSimulator/alchemistsimulator.github.io
370370
token: ${{ secrets.DEPLOYMENT_TOKEN }}
371371
- name: Download website artifact
372-
uses: actions/download-artifact@v6.0.0
372+
uses: actions/download-artifact@v7.0.0
373373
with:
374374
name: website-${{ github.sha }}
375375
- name: Download packages
376-
uses: actions/download-artifact@v6.0.0
376+
uses: actions/download-artifact@v7.0.0
377377
with:
378378
pattern: installer-package-${{ github.sha }}*
379379
path: build/package/
380380
merge-multiple: true
381381
- name: Download fatJars
382-
uses: actions/download-artifact@v6.0.0
382+
uses: actions/download-artifact@v7.0.0
383383
with:
384384
name: fat-jars-${{ github.sha }}
385385
path: build/shadow/
386386
merge-multiple: true
387387
- name: Download the PKGBUILD
388-
uses: actions/download-artifact@v6.0.0
388+
uses: actions/download-artifact@v7.0.0
389389
with:
390390
pattern: pkgbuild-${{ github.sha }}
391391
path: pkgbuild/
392392
merge-multiple: true
393393
- name: Install Node
394-
uses: actions/setup-node@v6.0.0
394+
uses: actions/setup-node@v6.1.0
395395
with:
396396
node-version-file: package.json
397-
- uses: DanySK/build-check-deploy-gradle-action@6d07f94e0b67e21367b02d06b64250159260718a # 4.0.10
397+
- uses: DanySK/build-check-deploy-gradle-action@810719541546fff1db1edd1fb858e12654dc1d95 # 4.0.17
398398
env:
399399
MAKEPKG_IMAGE: ${{ needs.ci-preparation.outputs.makepkg-image }}
400400
with:

‎.github/workflows/update-ancillary-files.yml‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ on:
33
push:
44
branches:
55
- master
6+
paths:
7+
- gradle/libs.versions.toml
68
workflow_dispatch:
79

810
jobs:
@@ -12,29 +14,28 @@ jobs:
1214
group: javadoc-io-${{ github.workflow }}-${{ github.event.number || github.ref }}
1315
steps:
1416
- name: Checkout
15-
uses: danysk/action-checkout@691c39b8c95afa68ab368def403db850341dc773 # 0.2.24
17+
uses: danysk/action-checkout@7f6ee3cd5bd670cdb3e162894776736254afff1e # 0.2.27
1618
with:
1719
token: ${{ secrets.DEPLOYMENT_TOKEN }}
18-
- uses: DanySK/build-check-deploy-gradle-action@6d07f94e0b67e21367b02d06b64250159260718a # 4.0.10
20+
- uses: DanySK/build-check-deploy-gradle-action@810719541546fff1db1edd1fb858e12654dc1d95 # 4.0.17
1921
with:
20-
pre-build-command: rm javadoc-io.json
22+
pre-build-command: rm -rf dokka-cache
2123
build-command: |
22-
./gradlew dokkaGeneratePublicationHtml --parallel --dry-run
23-
./gradlew kotlinUpgradeYarnLock kotlinWasmUpgradeYarnLock --parallel
24+
for i in {1..3}; do
25+
rm dokka-cache/no-javadoc.json || true
26+
./gradlew dokkaGenerateModuleHtml dokkaGeneratePublicationHtml --dry-run
27+
done
28+
./gradlew kotlinUpgradeYarnLock kotlinWasmUpgradeYarnLock
2429
check-command: |
2530
git config user.name 'Danilo Pianini [bot]'
2631
git config user.email '[email protected]'
27-
if git status | grep -P '^\s+modified:\s+javadoc-io\.json$'; then
28-
git add javadoc-io.json
29-
git commit -m 'chore(build): update the javadoc.io cache'
30-
git pull --rebase
31-
git push
32-
fi
33-
if ! git diff --quiet -- kotlin-js-store; then
34-
git add kotlin-js-store
35-
git commit -m 'chore(build): actualize the Kotlin JS store'
36-
git pull --rebase
37-
git push
38-
fi
32+
git add dokka-cache || true
33+
git commit -nm 'chore(build): update the javadoc.io cache' || true
34+
git pull --rebase --autostash
35+
git push
36+
git add kotlin-js-store || true
37+
git commit -nm 'chore(build): actualize the Kotlin JS store' || true
38+
git pull --rebase --autostash
39+
git push
3940
should-run-codecov: false
4041
should-deploy: false

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,15 @@ buildProfile/
4141
.idea/runConfigurations.xml
4242
.idea/shelf
4343
.idea/checkstyle-idea.xml
44+
/.idea/AndroidProjectSystem.xml
45+
/.idea/IntelliLang.xml
4446
/.idea/kotlinc.xml
4547

4648
# MacOS
4749
.DS_Store
4850

4951
# Other
52+
dokka-cache/no-javadoc.json
5053
node_modules/
5154
.kotlintest/
5255
**/*.kotlintest*/*

‎.gitmodules‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
path = site/themes/hugo-theme-relearn
33
url = https://github.com/McShelby/hugo-theme-relearn.git
44
shallow = true
5-
branch = 8.0.1
5+
branch = 8.2.0
66
[submodule "site/content/tutorials/scafi/learning-scafi-alchemist"]
77
path = external-resources/learning-scafi-alchemist
88
url = https://github.com/scafi/learning-scafi-alchemist.git

‎.scalafmt.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# To edit the original configurations go to
55
# https://github.com/alejandrohdezma/sbt-scalafmt-defaults/edit/master/.scalafmt.conf
66

7-
version = 3.10.1
7+
version = 3.10.2
88
runner.dialect = scala213
99
maxColumn = 120
1010
align.preset = none

0 commit comments

Comments
 (0)