From 889c50734b56327b39d3d78903d25450bad27fa7 Mon Sep 17 00:00:00 2001 From: Dima Date: Thu, 15 Jun 2023 17:01:26 +0300 Subject: [PATCH] fix: generate JS in Aqua API properly (#755) fix aqua API for JS --- api/aqua-api/.js/src/main/scala/api/AquaAPI.scala | 2 +- build.sbt | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/api/aqua-api/.js/src/main/scala/api/AquaAPI.scala b/api/aqua-api/.js/src/main/scala/api/AquaAPI.scala index 61ba53d0d..7c4539d09 100644 --- a/api/aqua-api/.js/src/main/scala/api/AquaAPI.scala +++ b/api/aqua-api/.js/src/main/scala/api/AquaAPI.scala @@ -188,7 +188,7 @@ object AquaAPI extends App with Logging { .find(_.suffix == JavaScriptBackend.dtsExt) .map(_.content) jsContent <- c.compiled - .find(_.suffix == JavaScriptBackend.dtsExt) + .find(_.suffix == JavaScriptBackend.ext) .map(_.content) } yield GeneratedSource.jsSource(c.sourceId.toString, jsContent, dtsContent) }.toSourcesResult diff --git a/build.sbt b/build.sbt index a7c68125d..160cc0078 100644 --- a/build.sbt +++ b/build.sbt @@ -1,9 +1,6 @@ -val dottyVersion = "3.3.0" - -scalaVersion := dottyVersion - val aquaVersion = "0.11.5" +val scalaV = "3.3.0" val catsV = "2.8.0" val catsParseV = "0.3.8" val monocleV = "3.1.0" @@ -21,7 +18,7 @@ val commons = Seq( val aquaSnapshot = sys.env.getOrElse("SNAPSHOT", "") if (aquaSnapshot.isEmpty()) aquaVersion else aquaVersion + "-" + aquaSnapshot, }, - scalaVersion := dottyVersion, + scalaVersion := scalaV, libraryDependencies ++= Seq( "com.outr" %%% "scribe" % scribeV, "org.scalatest" %%% "scalatest" % scalaTestV % Test