Skip to content

Commit 5937659

Browse files
adpi2adpi2
authored
Merge pull request #48 from adpi2/native-0.5
Update dependencies and update Scala Native version to 0.5
2 parents a902dc2 + 81bfc48 commit 5937659

39 files changed

+737
-36
lines changed

‎.github/workflows/deploy.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
PGP_KEY_ID: ${{ steps.import_gpg.outputs.fingerprint }}
4848

4949
- name: Local publish Toolkit for native
50-
run: scala-cli --power publish local --cross --native --native-version 0.4.17 Toolkit.scala publish-conf.scala --gpg-key $PGP_KEY_ID --gpg-option --pinentry-mode --gpg-option loopback --gpg-option --passphrase --gpg-option $PGP_PASSWORD
50+
run: scala-cli --power publish local --cross --native Toolkit.scala publish-conf.scala --gpg-key $PGP_KEY_ID --gpg-option --pinentry-mode --gpg-option loopback --gpg-option --passphrase --gpg-option $PGP_PASSWORD
5151
env:
5252
PGP_KEY_ID: ${{ steps.import_gpg.outputs.fingerprint }}
5353

@@ -64,7 +64,7 @@ jobs:
6464
PGP_KEY_ID: ${{ steps.import_gpg.outputs.fingerprint }}
6565

6666
- name: Publish Toolkit for native
67-
run: scala-cli --power publish --cross --native --native-version 0.4.17 Toolkit.scala publish-conf.scala --password env:OSSRH_PASSWORD --user env:OSSRH_USERNAME --gpg-key $PGP_KEY_ID --gpg-option --pinentry-mode --gpg-option loopback --gpg-option --passphrase --gpg-option $PGP_PASSWORD
67+
run: scala-cli --power publish --cross --native Toolkit.scala publish-conf.scala --password env:OSSRH_PASSWORD --user env:OSSRH_USERNAME --gpg-key $PGP_KEY_ID --gpg-option --pinentry-mode --gpg-option loopback --gpg-option --passphrase --gpg-option $PGP_PASSWORD
6868
continue-on-error: true
6969
env:
7070
PGP_KEY_ID: ${{ steps.import_gpg.outputs.fingerprint }}
@@ -83,7 +83,7 @@ jobs:
8383
PGP_KEY_ID: ${{ steps.import_gpg.outputs.fingerprint }}
8484

8585
- name: Publish Toolkit Test for native
86-
run: scala-cli --power publish --dependency "org.scala-lang::toolkit::$TOOLKIT_VERSION" --cross --native --native-version 0.4.17 ToolkitTest.scala publish-conf.scala --password env:OSSRH_PASSWORD --user env:OSSRH_USERNAME --gpg-key $PGP_KEY_ID --gpg-option --pinentry-mode --gpg-option loopback --gpg-option --passphrase --gpg-option $PGP_PASSWORD
86+
run: scala-cli --power publish --dependency "org.scala-lang::toolkit::$TOOLKIT_VERSION" --cross --native ToolkitTest.scala publish-conf.scala --password env:OSSRH_PASSWORD --user env:OSSRH_USERNAME --gpg-key $PGP_KEY_ID --gpg-option --pinentry-mode --gpg-option loopback --gpg-option --passphrase --gpg-option $PGP_PASSWORD
8787
continue-on-error: true
8888
env:
8989
TOOLKIT_VERSION: ${{ github.ref_name }}

‎.github/workflows/test.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Test examples
1+
name: Tests
22

33
on:
44
push:
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
test:
10-
name: Test examples
10+
name: Tests
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Check out code
@@ -26,6 +26,11 @@ jobs:
2626
- name: Check changelog compliance
2727
run: scala-cli changelog
2828

29+
- name: Install libidn2-dev libcurl3-dev for sttp on Native
30+
run: |
31+
sudo apt-get update
32+
sudo apt-get install libidn2-dev libcurl3-dev
33+
2934
- name: Run cross-platform tests
3035
run: scala-cli test tests/CrossPlatform.test.scala
3136

‎Toolkit.js.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//> using scala 2.13, 3.3
22
//> using publish.name toolkit
3-
//> using dep com.softwaremill.sttp.client4::core::4.0.0-M12
4-
//> using dep com.softwaremill.sttp.client4::upickle::4.0.0-M12
5-
//> using dep com.lihaoyi::upickle::3.2.0
3+
//> using dep com.softwaremill.sttp.client4::core::4.0.0-M14
4+
//> using dep com.softwaremill.sttp.client4::upickle::4.0.0-M14
5+
//> using dep com.lihaoyi::upickle::3.3.0

‎Toolkit.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//> using scala 2.13, 3.3
22
//> using publish.name toolkit
3-
//> using dep com.softwaremill.sttp.client4::core::4.0.0-M12
4-
//> using dep com.softwaremill.sttp.client4::upickle::4.0.0-M12
5-
//> using dep com.lihaoyi::upickle::3.2.0
6-
//> using dep com.lihaoyi::os-lib::0.9.3
3+
//> using dep com.softwaremill.sttp.client4::core::4.0.0-M14
4+
//> using dep com.softwaremill.sttp.client4::upickle::4.0.0-M14
5+
//> using dep com.lihaoyi::upickle::3.3.0
6+
//> using dep com.lihaoyi::os-lib::0.10.0

‎ToolkitTest.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
//> using scala 2.13, 3.3
22
//> using publish.name toolkit-test
3-
//> using dep org.scalameta::munit::1.0.0-M11
3+
//> using dep org.scalameta::munit::1.0.0-RC1

‎changelog/0.4.0/json/toolkit-test_0.4.0_2.13_changelog.json

Lines changed: 1 addition & 0 deletions
Large diffs are not rendered by default.

‎changelog/0.4.0/json/toolkit-test_0.4.0_3_changelog.json

Lines changed: 1 addition & 0 deletions
Large diffs are not rendered by default.

‎changelog/0.4.0/json/toolkit-test_0.4.0_native0.5_2.13_changelog.json

Lines changed: 1 addition & 0 deletions
Large diffs are not rendered by default.

‎changelog/0.4.0/json/toolkit-test_0.4.0_native0.5_3_changelog.json

Lines changed: 1 addition & 0 deletions
Large diffs are not rendered by default.

‎changelog/0.4.0/json/toolkit-test_0.4.0_sjs1_2.13_changelog.json

Lines changed: 1 addition & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)