Skip to content

Commit

Permalink
Merge pull request #152 from p2m2/develop
Browse files Browse the repository at this point in the history
Prepare release 0.3.2
  • Loading branch information
ofilangi authored Jan 31, 2022
2 parents a7cb7f4 + 9d077d3 commit 67f8e74
Show file tree
Hide file tree
Showing 31 changed files with 77,318 additions and 54,594 deletions.
6 changes: 4 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,15 +90,15 @@ executors:
openjdk:
working_directory: ~/repo
docker:
- image: circleci/openjdk:8-jdk
- image: circleci/openjdk:11-jdk
auth:
username: ${DOCKER_USER}
password: ${DOCKER_PASS}

virtuoso_environment_executor:
working_directory: ~/repo
docker:
- image: circleci/openjdk:8-jdk
- image: circleci/openjdk:11-jdk
auth:
username: ${DOCKER_USER}
password: ${DOCKER_PASS}
Expand Down Expand Up @@ -211,6 +211,8 @@ jobs:
- run:
name: Test TypeScript
command: |
## bug with Node 17 -> https://github.com/webpack/webpack/issues/14532
export NODE_OPTIONS=--openssl-legacy-provider
sbt "discoveryJS / Compile / fastOptJS / webpack"
sbt npmPackageJson
npm i
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ further information and documentation, visit https://p2m2.github.io/discovery/
## Import discovery with SBT

```
libraryDependencies += "com.github.p2m2" %%% "discovery" % "0.2.0"
libraryDependencies += "com.github.p2m2" %%% "discovery" % "0.3.1"
```


45 changes: 24 additions & 21 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,16 @@ import sbt.Keys.scalacOptions
import sbtcrossproject.CrossPlugin.autoImport.crossProject

/* scala libs */
lazy val utestVersion = "0.7.10"
lazy val upickleVersion = "1.4.0"
lazy val airframeLogVersion = "21.6.0"
lazy val scalaJsDOMVersion = "1.1.0"
lazy val scalaStubVersion = "1.0.0"
lazy val scalatagVersion = "0.9.4"
lazy val rdf4jVersion = "3.7.2"
lazy val slf4j_version = "1.7.31"
lazy val utestVersion = "0.7.11"
lazy val upickleVersion = "1.5.0"
lazy val airframeLogVersion = "21.12.1"
lazy val sttpClient3Version = "3.4.1"
lazy val scalaStubVersion = "1.1.0"
lazy val scalatagVersion = "0.11.1"
lazy val rdf4jVersion = "3.7.4"
lazy val slf4j_version = "1.7.32"
lazy val scalaUriVersion = "3.6.0"
lazy val scalajsDom = "1.2.0"

/* p2m2 libs */
lazy val comunica_actor_init_sparql_rdfjs_version = "1.21.1"
Expand All @@ -18,18 +20,19 @@ lazy val n3js_facade_version = "1.11.1"
lazy val rdfxml_streaming_parser_version = "1.5.0"

/* npm libs */
lazy val npm_axios_version = "0.21.1"
lazy val npm_qs_version = "6.10.1"
lazy val npm_axios_version = "0.25.0"
lazy val npm_qs_version = "6.10.3"
lazy val npm_showdown_version = "1.9.1"
lazy val npm_comunica_version_datasource = "1.21.1"
lazy val npm_comunica_version_datasource = "1.22.2"

lazy val types_jest = "27.0.1"
lazy val jest = "27.0.6"
lazy val tsjest = "27.0.5"
lazy val types_jest = "27.4.0"
lazy val type_sax = "1.2.4"
lazy val jest = "27.4.7"
lazy val tsjest = "27.1.3"

releaseIgnoreUntrackedFiles := true

val static_version_build = "0.3.0-alpha.6"
val static_version_build = "0.3.2"
val version_build = scala.util.Properties.envOrElse("DISCOVERY_VERSION", static_version_build )
val SWDiscoveryVersionAtBuildTimeFile = "./shared/src/main/scala/inrae/semantic_web/SWDiscoveryVersionAtBuildTime.scala"

Expand All @@ -49,7 +52,7 @@ ThisBuild / name := "discovery"
ThisBuild / organizationName := "p2m2"
ThisBuild / name := "discovery"
ThisBuild / version := version_build
ThisBuild / scalaVersion := "2.13.5"
ThisBuild / scalaVersion := "2.13.7"
ThisBuild / organization := "com.github.p2m2"
ThisBuild / organizationName := "p2m2"
ThisBuild / organizationHomepage := Some(url("https://www6.inrae.fr/p2m2"))
Expand Down Expand Up @@ -105,16 +108,16 @@ lazy val root = (project in file("."))
lazy val discovery=crossProject(JSPlatform, JVMPlatform).in(file("."))
.settings(
libraryDependencies ++= Seq(
"com.softwaremill.sttp.client3" %% "core" % "3.3.4" % Test,
"com.softwaremill.sttp.client3" %% "core" % sttpClient3Version % Test,
"com.lihaoyi" %%% "utest" % utestVersion % Test,
"com.lihaoyi" %%% "upickle" % upickleVersion,
"org.wvlet.airframe" %%% "airframe-log" % airframeLogVersion,
"io.lemonlabs" %%% "scala-uri" % "3.5.0"
"io.lemonlabs" %%% "scala-uri" % scalaUriVersion
),
testFrameworks += new TestFramework("utest.runner.Framework"),
scalacOptions ++= Seq("-deprecation", "-feature"),
classLoaderLayeringStrategy := ClassLoaderLayeringStrategy.AllLibraryJars,
coverageMinimumStmtTotal := 70,
coverageMinimumStmtTotal := 86,
coverageFailOnMinimum := false,
coverageHighlighting := true,
Test / parallelExecution := false
Expand All @@ -133,7 +136,7 @@ lazy val discovery=crossProject(JSPlatform, JVMPlatform).in(file("."))
"qs" -> npm_qs_version,
"showdown" -> npm_showdown_version,
"@comunica/utils-datasource" -> npm_comunica_version_datasource,
"@types/sax" -> "1.2.1"
"@types/sax" -> type_sax
),

Compile / fastOptJS / scalaJSLinkerConfig ~= {
Expand All @@ -146,7 +149,7 @@ lazy val discovery=crossProject(JSPlatform, JVMPlatform).in(file("."))
.withModuleKind(ModuleKind.CommonJSModule)
},
libraryDependencies ++= Seq(
"org.scala-js" %%% "scalajs-dom" % "1.1.0"
"org.scala-js" %%% "scalajs-dom" % scalajsDom
)
)
.jvmSettings(
Expand Down
2 changes: 1 addition & 1 deletion dist/checksum
Original file line number Diff line number Diff line change
@@ -1 +1 @@
757050151db1317a2002e50f435bc086 -
9b095401d7dc1faa6a12ed1d9e02c44b -
Loading

0 comments on commit 67f8e74

Please sign in to comment.