Merge branch 'main' into update-upickle

Author: adpi2

.github/workflows/deploy.yaml

@@ -13,12 +13,12 @@ jobs:
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
-          
+
       - uses: coursier/[email protected]
 
       - name: Setup Scala CLI
         uses: VirtusLab/scala-cli-setup@main
-      
+
       - name: Import GPG key
         id: import_gpg
         uses: crazy-max/ghaction-import-gpg@v5
@@ -27,28 +27,28 @@ jobs:
           passphrase: ${{ secrets.PGP_PASSPHRASE }}
 
       - name: Publish Toolkit for JVM
-        run: for i in {1..5}; do scala-cli publish --cross 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 && break || sleep 15; done
+        run: for i in {1..5}; do scala-cli --power publish --cross 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 && break || sleep 15; done
         continue-on-error: true
-        env: 
+        env:
           OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
           PGP_PASSWORD: ${{ secrets.PGP_PASSPHRASE }}
           PGP_KEY_ID: ${{ steps.import_gpg.outputs.fingerprint }}
 
       - name: Publish Toolkit for native
-        run: for i in {1..5}; do scala-cli 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 && break || sleep 15; done 
+        run: for i in {1..5}; do 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 && break || sleep 15; done
         continue-on-error: true
-        env: 
+        env:
           OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
           PGP_PASSWORD: ${{ secrets.PGP_PASSPHRASE }}
           PGP_KEY_ID: ${{ steps.import_gpg.outputs.fingerprint }}
 
       - name: Publish Toolkit for JS
-        run: for i in {1..5}; do scala-cli publish --cross --js Toolkit.js.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 && break || sleep 15; done
+        run: for i in {1..5}; do scala-cli --power publish --cross --js Toolkit.js.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 && break || sleep 15; done
         continue-on-error: true
-        env: 
+        env:
           OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
           PGP_PASSWORD: ${{ secrets.PGP_PASSPHRASE }}
-          PGP_KEY_ID: ${{ steps.import_gpg.outputs.fingerprint }}
+          PGP_KEY_ID: ${{ steps.import_gpg.outputs.fingerprint }}

Toolkit.js.scala

@@ -1,6 +1,6 @@
 //> using scala "2.13", "2.12", "3"
 
-//> using lib "com.softwaremill.sttp.client3::core::3.8.7"
-//> using lib "com.softwaremill.sttp.client3::upickle::3.8.7"
+//> using lib "com.softwaremill.sttp.client4::core::4.0.0-M1"
+//> using lib "com.softwaremill.sttp.client4::upickle::4.0.0-M1"
 //> using lib "com.lihaoyi::upickle::3.0.0"
 //> using lib "org.scalameta::munit::1.0.0-M7"

Toolkit.scala

@@ -1,7 +1,7 @@
 //> using scala "2.13", "2.12", "3"
 
-//> using lib "com.softwaremill.sttp.client3::core::3.8.7"
-//> using lib "com.softwaremill.sttp.client3::upickle::3.8.7"
+//> using lib "com.softwaremill.sttp.client4::core::4.0.0-M1"
+//> using lib "com.softwaremill.sttp.client4::upickle::4.0.0-M1"
 //> using lib "com.lihaoyi::upickle::3.0.0"
-//> using lib "com.lihaoyi::os-lib::0.9.0"
+//> using lib "com.lihaoyi::os-lib::0.9.1"
 //> using lib "org.scalameta::munit::1.0.0-M7"