Skip to content

Commit

Permalink
Merge branch 'dev' into df/#490-squants
Browse files Browse the repository at this point in the history
  • Loading branch information
danielfeismann committed Jun 5, 2023
2 parents a46a814 + 9fae07e commit 8d7e4a6
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
12 changes: 6 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ plugins {
id 'signing'
id 'maven-publish' // publish to a maven repo (local or mvn central, has to be defined)
id 'pmd' // code check, working on source code
id 'com.diffplug.spotless' version '6.18.0'// code format
id 'com.diffplug.spotless' version '6.19.0'// code format
id 'com.github.onslip.gradle-one-jar' version '1.0.6' // pack a self contained jar
id "com.github.ben-manes.versions" version '0.46.0'
id "de.undercouch.download" version "5.4.0" // downloads plugin
id "kr.motd.sphinx" version "2.10.1" // documentation generation
id "com.github.johnrengelman.shadow" version "7.1.2" // fat jar
id "org.sonarqube" version "4.0.0.2929" // sonarqube
id "org.scoverage" version "7.0.1" // scala code coverage scoverage
id "org.sonarqube" version "4.2.0.3129" // sonarqube
id "org.scoverage" version "8.0.2" // scala code coverage scoverage
id "com.github.maiflai.scalatest" version "0.32" // run scalatest without specific spec task
id 'org.hidetake.ssh' version '2.11.2'
id 'net.thauvin.erik.gradle.semver' version '1.0.4' // semantic versioning
Expand All @@ -32,7 +32,7 @@ ext {
tscfgVersion = '1.0.2'
scapegoatVersion = '1.4.17'

testContainerVersion = '0.40.15'
testContainerVersion = '0.40.16'

scriptsLocation = 'gradle' + File.separator + 'scripts' + File.separator // location of script plugins
}
Expand Down Expand Up @@ -108,7 +108,7 @@ dependencies {
testImplementation 'org.scalatestplus:mockito-3-4_2.13:3.2.10.0'
implementation 'org.mockito:mockito-core:5.3.1' // mocking framework
testImplementation "org.scalatest:scalatest_${scalaVersion}:3.2.16"
testRuntimeOnly 'com.vladsch.flexmark:flexmark-all:0.64.4' //scalatest html output
testRuntimeOnly 'com.vladsch.flexmark:flexmark-all:0.64.8' //scalatest html output
testImplementation group: 'org.pegdown', name: 'pegdown', version: '1.6.0'
testImplementation "com.typesafe.akka:akka-testkit_${scalaVersion}:${akkaVersion}" // akka testkit
testImplementation "com.typesafe.akka:akka-actor-testkit-typed_${scalaVersion}:${akkaVersion}"
Expand Down Expand Up @@ -153,7 +153,7 @@ dependencies {

implementation 'org.apache.commons:commons-math3:3.6.1' // apache commons math3
implementation 'org.apache.poi:poi-ooxml:5.2.3' // used for FilenameUtils
implementation 'javax.measure:unit-api:2.1.3'
implementation 'javax.measure:unit-api:2.2'
implementation 'tech.units:indriya:2.1.4' // quantities
implementation "org.typelevel:squants_${scalaVersion}:1.8.3"
implementation 'org.apache.commons:commons-csv:1.10.0'
Expand Down
1 change: 0 additions & 1 deletion gradle/scripts/scoverage.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
// https://github.com/scoverage/gradle-scoverage/issues/109 for details

scoverage {
scoverageVersion = "1.4.11"
scoverageScalaVersion = scalaBinaryVersion
coverageOutputHTML = false
coverageOutputXML = true
Expand Down

0 comments on commit 8d7e4a6

Please sign in to comment.