Skip to content

Update scala3-library, ... to 3.6.4 & migration #384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ import scala.sys.process._

inThisBuild(
Seq(
scalaVersion := "3.3.5", // Also update docs/publishWebsite.sh and any ref to scala-3.3.5
// scalaVersion := "3.3.5", // Also update docs/publishWebsite.sh and any ref to scala-3.3.5
// scalaVersion := "3.4.2", // Also update docs/publishWebsite.sh and any ref to scala-3.4.2
scalaVersion := "3.6.4", // Also update docs/publishWebsite.sh and any ref to scala-3.6.4
)
)
// publish config
Expand Down Expand Up @@ -253,7 +254,7 @@ inThisBuild(
// NO NEED ATM "-Xsemanticdb"
// NO NEED ATM "-Ykind-projector"
) ++ {
if (true) Seq("-Xfatal-warnings") else Seq("-rewrite", "-source", "3.4-migration")
if (false) Seq("-Xfatal-warnings") else Seq("-rewrite", "-source", "3.4-migration")
} ++
// Because DeriveJson(Decoder/Encoder).gen[DidFail] exceeded maximal number of successive inlines (default is 32)
Seq("-Xmax-inlines", "43")
Expand Down
2 changes: 1 addition & 1 deletion demo/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM azul/zulu-openjdk-alpine:11

COPY ./jvm/target/scala-3.3.5/scala-did-demo-server.jar /app/app.jar
COPY ./jvm/target/scala-3.6.4/scala-did-demo-server.jar /app/app.jar
WORKDIR /app

EXPOSE 8080
Expand Down
14 changes: 7 additions & 7 deletions demo/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,16 @@ npm run dev

```shell
sbt assemblyAll
# java -jar jvm/target/scala-3.3.5/scala-did-demo-server.jar
# java -jar jvm/target/scala-3.6.4/scala-did-demo-server.jar
docker build --tag scala_did_demo ./demo/
#docker buildx build --platform linux/amd64,linux/arm64 --tag scala_did_demo ./demo/
docker run --rm -p 8080:8080 --memory="100m" --cpus="1.0" scala_did_demo
```

```
jar tf /home/fabio/workspace/ScalaDID/demo/jvm/target/scala-3.3.5/scala-did-demo-server.jar | less
jar tvf /home/fabio/workspace/ScalaDID/demo/jvm/target/scala-3.3.5/scala-did-demo-server.jar | sort -rnk 1 | less
java -jar /home/fabio/workspace/ScalaDID/demo/jvm/target/scala-3.3.5/scala-did-demo-server.jar
jar tf /home/fabio/workspace/ScalaDID/demo/jvm/target/scala-3.6.4/scala-did-demo-server.jar | less
jar tvf /home/fabio/workspace/ScalaDID/demo/jvm/target/scala-3.6.4/scala-did-demo-server.jar | sort -rnk 1 | less
java -jar /home/fabio/workspace/ScalaDID/demo/jvm/target/scala-3.6.4/scala-did-demo-server.jar
```

## FLY.IO
Expand Down Expand Up @@ -86,10 +86,10 @@ Size of the last docker layer:
## Others

Sort by file size
`jar tvf demo/jvm/target/scala-3.3.5/scala-did-demo-server.jar | sort -k1nr | less`
`jar tvf demo/jvm/target/scala-3.6.4/scala-did-demo-server.jar | sort -k1nr | less`

Show assets
`jar tvf demo/jvm/target/scala-3.3.5/scala-did-demo-server.jar | sort -k1nr | grep "assets/"`
`jar tvf demo/jvm/target/scala-3.6.4/scala-did-demo-server.jar | sort -k1nr | grep "assets/"`

Show jar size
`du -h demo/jvm/target/scala-3.3.5/scala-did-demo-server.jar`
`du -h demo/jvm/target/scala-3.6.4/scala-did-demo-server.jar`
2 changes: 1 addition & 1 deletion demo/jvm/src/main/scala/fmgp/did/demo/AppServer.scala
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ object AppServer extends ZIOAppDefault {
.fromResource("assets")
.getLines()
.map { file => li(a(href := file, file)): Html }
.toSeq): _*
.toSeq)*
)
)
)
Expand Down
2 changes: 1 addition & 1 deletion did-method-prism/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM azul/zulu-openjdk-alpine:17

COPY ./jvm/target/scala-3.3.5/prism-Indexer.jar /prism-indexer.jar
COPY ./jvm/target/scala-3.6.4/prism-Indexer.jar /prism-indexer.jar
VOLUME /data

# ENTRYPOINT [ "java", "-Dport=8080", "-XX:+UseContainerSupport", "-jar", "app.jar" ]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ object CrytoUtil {
}

def generateKeyPair = {
val params = ECNamedCurveTable getParameterSpec ("secp256k1")
val params = ECNamedCurveTable.getParameterSpec("secp256k1")
// val fact = KeyFactory.getInstance("ECDSA", provider)
val domainParams = new ECDomainParameters(params.getCurve, params.getG, params.getN, params.getH, params.getSeed)
// val domainParams = new ECDomainParameters(params.getCurve, params.getG, params.getN, params.getH)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ object Indexer extends ZIOAppDefault {
ZIO.logWarning(s"Fail to parse indexerConfig from '${next.mkString(" ")}'") *>
ZIO.fail(RuntimeException("Indexer <dataPath> [mainnet|preprod|preview <dataPath>]"))
}
.map(ZLayer.succeed _)
.map(ZLayer.succeed)
indexerConfig <- ZIO.service[IndexerConfig].provideLayer(indexerConfigZLayer)

_ <- ZIO.log(s"Check the LastTransactionIndexStored")
Expand Down
2 changes: 1 addition & 1 deletion did/shared/src/main/scala/fmgp/crypto/Key.scala
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ object OKP_EC_Key {
Some(("x", Json.Str(k.x))),
k match { case ecKey: ECKey => Some(("y", Json.Str(ecKey.y))); case _ => None },
k.maybeKid.map(kid => ("kid", Json.Str(kid)))
).flatten: _*
).flatten*
)
}
given decoder: JsonDecoder[OKP_EC_Key] = JsonDecoder[Json.Obj]
Expand Down
16 changes: 8 additions & 8 deletions docs/src/08-others/test-coverage.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ From 2024-03-03 coverage to 2024-03-04 coverage the sbt-scalafix ad update to 0.
## Report output

You should open the reports with your browser. The reports will be in each module `target/scala-<scala-version>/scoverage-report`
- `all/aggregate` -> `/target/scala-3.3.5/scoverage-report/index.html`
- `did` -> `/did/jvm/target/scala-3.3.5/scoverage-report/index.html`
- `did-imp` -> `/did-imp/jvm/target/scala-3.3.5/scoverage-report/index.html`
- `did-framework` -> `/did-framework/jvm/target/scala-3.3.5/scoverage-report/index.html`
- `did-resolver-web` -> `/did-method-web/jvm/target/scala-3.3.5/scoverage-report/index.html`
- `did-resolver-peer` -> `/did-method-peer/jvm/target/scala-3.3.5/scoverage-report/index.html`
- `uniresolver` -> `/did-uniresolver/jvm/target/scala-3.3.5/scoverage-report/index.html`
- `multiformats` -> `/multiformats/jvm/target/scala-3.3.5/scoverage-report/index.html`
- `all/aggregate` -> `/target/scala-3.6.4/scoverage-report/index.html`
- `did` -> `/did/jvm/target/scala-3.6.4/scoverage-report/index.html`
- `did-imp` -> `/did-imp/jvm/target/scala-3.6.4/scoverage-report/index.html`
- `did-framework` -> `/did-framework/jvm/target/scala-3.6.4/scoverage-report/index.html`
- `did-resolver-web` -> `/did-method-web/jvm/target/scala-3.6.4/scoverage-report/index.html`
- `did-resolver-peer` -> `/did-method-peer/jvm/target/scala-3.6.4/scoverage-report/index.html`
- `uniresolver` -> `/did-uniresolver/jvm/target/scala-3.6.4/scoverage-report/index.html`
- `multiformats` -> `/multiformats/jvm/target/scala-3.6.4/scoverage-report/index.html`
4 changes: 2 additions & 2 deletions vite.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import { VitePWA } from 'vite-plugin-pwa'
import viteCompression from 'vite-plugin-compression';

export default defineConfig(({ command, mode, ssrBuild }) => {
const serviceworkerSrc = '../serviceworker/target/scala-3.3.5/fmgp-serviceworker-' + ((command === 'serve') ? 'fastopt' : 'opt')
//resolve(__dirname, 'serviceworker/target/scala-3.3.5/fmgp-serviceworker-fastopt'),
const serviceworkerSrc = '../serviceworker/target/scala-3.6.4/fmgp-serviceworker-' + ((command === 'serve') ? 'fastopt' : 'opt')
//resolve(__dirname, 'serviceworker/target/scala-3.6.4/fmgp-serviceworker-fastopt'),

return {
root: './vite',
Expand Down
2 changes: 1 addition & 1 deletion webapp/src/main/scala/fmgp/ServiceWorkerUtils.scala
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ object ServiceWorkerUtils {
@scala.scalajs.js.annotation.JSExport
def requestNotificationPermission = {
def aux(status: String) = println(s"Notification permission status: $status")
dom.Notification.requestPermission(aux _)
dom.Notification.requestPermission(aux)
}

}
4 changes: 2 additions & 2 deletions webapp/src/main/scala/fmgp/webapp/MyRouter.scala
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ object MyRouter {
val router = new Router[Page](
routes = routes,
getPageTitle = _.title, // displayed in the browser tab next to favicon
serializePage = page => write(page)(rw), // serialize page data for storage in History API log
deserializePage = pageStr => read(pageStr)(rw), // deserialize the above
serializePage = page => write(page)(using rw), // serialize page data for storage in History API log
deserializePage = pageStr => read(pageStr)(using rw), // deserialize the above
routeFallback = { (_: String) => HomePage },
)(
popStateEvents = windowEvents(_.onPopState), // this is how Waypoint avoids an explicit dependency on Laminar
Expand Down
2 changes: 1 addition & 1 deletion webapp/src/main/scala/org/scalajs/dom/NDEFReader.scala
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class NDEFReader() extends EventTarget {
def write(message: String, options: NDEFWriteOptions): js.Promise[Unit] = js.native
def write(message: js.typedarray.ArrayBuffer, options: NDEFWriteOptions): js.Promise[Unit] = js.native

def write(message: js.typedarray.TypedArray[_, _], options: NDEFWriteOptions = js.native): js.Promise[Unit] =
def write(message: js.typedarray.TypedArray[?, ?], options: NDEFWriteOptions = js.native): js.Promise[Unit] =
js.native
def write(message: js.typedarray.DataView, options: NDEFWriteOptions): js.Promise[Unit] = js.native
def write(message: js.Array[NDEFRecord], options: NDEFWriteOptions): js.Promise[Unit] = js.native
Expand Down
2 changes: 1 addition & 1 deletion webapp/src/main/scala/org/scalajs/dom/NDEFRecordInit.scala
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ trait NDEFRecordInit extends js.Object {
* DataView, or an array of nested records.
*/
var data: js.UndefOr[
String | js.typedarray.DataView | js.typedarray.ArrayBuffer | js.typedarray.TypedArray[_, _] |
String | js.typedarray.DataView | js.typedarray.ArrayBuffer | js.typedarray.TypedArray[?, ?] |
js.typedarray.DataView | js.Array[NDEFRecord]
] = js.undefined

Expand Down
Loading