Merge pull request #298 from ulitol97/master

Solve issues in #297 and fix a schema conversion issue
weso · Mar 3, 2022 · fe782a1 · fe782a1
2 parents 81ab97a + 5d6b7fa
commit fe782a1
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 13 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -22,7 +22,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.13.6]
+        scala: [2.13.8]
         java: [adopt@1.11]
     runs-on: ${{ matrix.os }}
     steps:
@@ -70,7 +70,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.13.6]
+        scala: [2.13.8]
         java: [adopt@1.11]
     runs-on: ${{ matrix.os }}
     steps:
@@ -96,12 +96,12 @@ jobs:
             ~/Library/Caches/Coursier/v1
           key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
 
-      - name: Download target directories (2.13.6)
+      - name: Download target directories (2.13.8)
         uses: actions/download-artifact@v2
         with:
-          name: target-${{ matrix.os }}-2.13.6-${{ matrix.java }}
+          name: target-${{ matrix.os }}-2.13.8-${{ matrix.java }}
 
-      - name: Inflate target directories (2.13.6)
+      - name: Inflate target directories (2.13.8)
         run: |
           tar xf targets.tar
           rm targets.tar

diff --git a/build.sbt b/build.sbt
@@ -8,8 +8,8 @@ Global / cancelable := true
 Global / apiURL := Some(url("https://github.com/weso/rdfshape-api"))
 Global / scalaVersion := scala213
 
-lazy val scala212               = "2.12.13"
-lazy val scala213               = "2.13.6"
+lazy val scala212               = "2.12.15"
+lazy val scala213               = "2.13.8"
 lazy val supportedScalaVersions = List(scala213)
 
 // Lint-excluded keys
@@ -239,6 +239,11 @@ lazy val rdfshape = project
     libraryDependencies ++= Seq(
       logbackClassic,
       scalaLogging
+    ),
+    excludeDependencies ++= Seq(
+      // Exclude slf4j backend if present in other dependencies to avoid
+      // warnings/conflicts with logback
+      ExclusionRule("org.slf4j", "slf4j-simple")
     )
   )
 // Server project in /modules: server
@@ -283,7 +288,7 @@ lazy val server = project
 
 // "sbt-github-actions" plugin settings
 lazy val JavaCIVersion  = "adopt@1.11"
-lazy val ScalaCIVersion = "2.13.6"
+lazy val ScalaCIVersion = scala213
 ThisBuild / githubWorkflowJavaVersions := Seq(JavaCIVersion)
 ThisBuild / githubWorkflowScalaVersions := Seq(ScalaCIVersion)
 
@@ -320,10 +325,10 @@ lazy val munitEffectVersion  = "1.0.7"
 lazy val plantumlVersion     = "1.2021.14"
 lazy val scalajVersion       = "2.4.2"
 // WESO dependencies
-lazy val shaclexVersion    = "0.1.103-ult_0"
-lazy val shexsVersion      = "0.1.108-ult_0"
+lazy val shaclexVersion    = "0.2.0"
+lazy val shexsVersion      = "0.2.0"
 lazy val umlShaclexVersion = "0.0.82"
-lazy val wesoUtilsVersion  = "0.2.2"
+lazy val wesoUtilsVersion  = "0.2.4"
 // Dependency modules
 lazy val http4sDsl = "org.http4s" %% "http4s-dsl" % http4sVersion
 lazy val http4sBlazeServer =

diff --git a/...main/scala/es/weso/rdfshape/server/api/routes/schema/logic/operations/SchemaConvert.scala b/...main/scala/es/weso/rdfshape/server/api/routes/schema/logic/operations/SchemaConvert.scala
@@ -150,7 +150,7 @@ private[api] object SchemaConvert extends LazyLogging {
               content = rawOutputSchema.trim,
               format = targetFormat,
               engine = schemaOut,
-              source = inputSchema.source
+              source = SchemaSource.TEXT
             )
           } yield SchemaConvert(
             inputSchema = inputSchema,

diff --git a/version.sbt b/version.sbt
@@ -1 +1 @@
-ThisBuild / version := "0.2.3"
+ThisBuild / version := "0.2.4"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		ThisBuild / version := "0.2.3"
		ThisBuild / version := "0.2.4"