Skip to content
Merged
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
strategy:
matrix:
# change in sync with gradle.properties
scala: [2.12.20, 2.13.16]
scala: [2.12.20, 2.13.17]
# see build.gradle copy template tasks
db: [MySQL, H2]

Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# scala cross compilation
# by default, gradle invocations will use only this version. useful for ide invocations.
defaultScalaVersions=2.13.16
defaultScalaVersions=2.13.17
# if we need to cross-compile and rerun the entire task graph (like in a ci build or publish), run with -PallScalaVersions
# see https://github.com/ADTRAN/gradle-scala-multiversion-plugin#examples

# change in sync with defaultScalaVersions, and in .github/workflows/ci.yml
scalaVersions=2.12.20,2.13.16
scalaVersions=2.12.20,2.13.17

# during releases, we only want to create 1 repo tag.
# note that devSnapshot and snapshot tasks won't create repo tags
Expand Down
6 changes: 3 additions & 3 deletions versionInfo.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ project.ext.versions = [
, commonsIo: '2.16.0'
, coveralls: '2.8.2'
, flyway: '5.2.1'
, gatling: '3.8.4'
, gatling: '3.10.5'
, gradleGit: '4.1.1'
, gradleScoverage: '8.0.3'
, gradleJReleaser: '1.19.0'
Expand All @@ -31,7 +31,7 @@ project.ext.versions = [
, nebulaRelease: '15.0.3'
, nebulaPublish: '17.3.0'
, scalaCollectionCompat: '2.12.0'
, scalacScoverage: '2.3.0'
, scalacScoverage: '2.4.1'
, scalactic: '3.2.+'
, scalaJava8Compat: '1.0.2'
, scalafix: '0.1.14'
Expand All @@ -41,7 +41,7 @@ project.ext.versions = [
, scalatestplusjunit5: '1.0.0-M2'
, scalaStyle: '3.4.1'
, scalaz: '7.3.8'
, semanticDb: '4.9.9'
, semanticDb: '4.14.1'
, slf4j: '1.7.30'
, slick: '3.4.1'
, typesafeConfig: '1.4.+'
Expand Down
214 changes: 140 additions & 74 deletions warp-core-gatling/locking/warp-core-gatling_2.13.lockfile

Large diffs are not rendered by default.

15 changes: 8 additions & 7 deletions warp-core-macros/locking/warp-core-macros_2.13.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ com.typesafe.slick:slick_2.13:3.4.1=compileClasspath,default,runtimeClasspath,te
com.typesafe:config:1.4.0=scalastyle
com.typesafe:config:1.4.2=compileClasspath,testCompileClasspath
com.typesafe:config:1.4.3=default
com.typesafe:config:1.4.4=runtimeClasspath,testRuntimeClasspath
com.typesafe:config:1.4.5=runtimeClasspath,testRuntimeClasspath
com.zaxxer:HikariCP:4.0.3=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
commons-beanutils:commons-beanutils:1.9.3=checkstyle,runtimeClasspath,testRuntimeClasspath
commons-beanutils:commons-beanutils:1.9.4=default
Expand Down Expand Up @@ -103,7 +103,8 @@ org.scala-lang.modules:scala-xml_2.13:2.3.0=scoverage,zinc
org.scala-lang:scala-compiler:2.13.15=zinc
org.scala-lang:scala-library:2.13.1=scalastyle
org.scala-lang:scala-library:2.13.15=zinc
org.scala-lang:scala-library:2.13.16=compileClasspath,default,runtimeClasspath,scoverage,testCompileClasspath,testRuntimeClasspath
org.scala-lang:scala-library:2.13.16=default
org.scala-lang:scala-library:2.13.17=compileClasspath,runtimeClasspath,scoverage,testCompileClasspath,testRuntimeClasspath
org.scala-lang:scala-reflect:2.13.10=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.scala-lang:scala-reflect:2.13.15=zinc
org.scala-sbt.jline:jline:2.14.7-sbt-9c3b6aca11c57e339441442bbf58e550cdfecb79=zinc
Expand Down Expand Up @@ -147,10 +148,10 @@ org.scalatest:scalatest_2.13:3.2.19=compileClasspath,default,runtimeClasspath,te
org.scalatestplus:junit-4-12_2.13:3.1.1.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.scalatestplus:scalatestplus-junit_2.13:1.0.0-M2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.scalaz:scalaz-core_2.13:7.3.8=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.scoverage:scalac-scoverage-domain_2.13:2.3.0=scoverage
org.scoverage:scalac-scoverage-plugin_2.13.16:2.3.0=scoverage
org.scoverage:scalac-scoverage-reporter_2.13:2.3.0=scoverage
org.scoverage:scalac-scoverage-runtime_2.13:2.3.0=scoverage
org.scoverage:scalac-scoverage-serializer_2.13:2.3.0=scoverage
org.scoverage:scalac-scoverage-domain_2.13:2.4.1=scoverage
org.scoverage:scalac-scoverage-plugin_2.13.17:2.4.1=scoverage
org.scoverage:scalac-scoverage-reporter_2.13:2.4.1=scoverage
org.scoverage:scalac-scoverage-runtime_2.13:2.4.1=scoverage
org.scoverage:scalac-scoverage-serializer_2.13:2.4.1=scoverage
org.slf4j:slf4j-api:2.0.13=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
empty=annotationProcessor,archives,incrementalScalaAnalysisFormain,incrementalScalaAnalysisForscoverage,incrementalScalaAnalysisFortest,scalaCompilerPlugins,scalaToolchainRuntimeClasspath,scalafix,scoverageAnnotationProcessor,scoverageCompileClasspath,scoverageRuntimeClasspath,signatures,testAnnotationProcessor
12 changes: 6 additions & 6 deletions warp-core/locking/warp-core_2.12.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ com.typesafe.slick:slick-hikaricp_2.12:3.4.1=compileClasspath,default,runtimeCla
com.typesafe.slick:slick_2.12:3.4.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.typesafe:config:1.4.0=scalastyle
com.typesafe:config:1.4.3=default
com.typesafe:config:1.4.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.typesafe:config:1.4.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.zaxxer:HikariCP:4.0.3=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
commons-beanutils:commons-beanutils:1.9.3=checkstyle,runtimeClasspath,testRuntimeClasspath
commons-beanutils:commons-beanutils:1.9.4=default
Expand Down Expand Up @@ -144,10 +144,10 @@ org.scalatest:scalatest_2.12:3.2.19=compileClasspath,default,runtimeClasspath,te
org.scalatestplus:junit-4-12_2.12:3.1.1.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.scalatestplus:scalatestplus-junit_2.12:1.0.0-M2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.scalaz:scalaz-core_2.12:7.3.8=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.scoverage:scalac-scoverage-domain_2.12:2.3.0=scoverage
org.scoverage:scalac-scoverage-plugin_2.12.20:2.3.0=scoverage
org.scoverage:scalac-scoverage-reporter_2.12:2.3.0=scoverage
org.scoverage:scalac-scoverage-runtime_2.12:2.3.0=scoverage
org.scoverage:scalac-scoverage-serializer_2.12:2.3.0=scoverage
org.scoverage:scalac-scoverage-domain_2.12:2.4.1=scoverage
org.scoverage:scalac-scoverage-plugin_2.12.20:2.4.1=scoverage
org.scoverage:scalac-scoverage-reporter_2.12:2.4.1=scoverage
org.scoverage:scalac-scoverage-runtime_2.12:2.4.1=scoverage
org.scoverage:scalac-scoverage-serializer_2.12:2.4.1=scoverage
org.slf4j:slf4j-api:2.0.13=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
empty=annotationProcessor,archives,incrementalScalaAnalysisFormain,incrementalScalaAnalysisForscoverage,incrementalScalaAnalysisFortest,scalaCompilerPlugins,scalaToolchainRuntimeClasspath,scalafix,scoverageAnnotationProcessor,scoverageCompileClasspath,scoverageRuntimeClasspath,signatures,testAnnotationProcessor
15 changes: 8 additions & 7 deletions warp-core/locking/warp-core_2.13.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ com.typesafe.slick:slick-hikaricp_2.13:3.4.1=compileClasspath,default,runtimeCla
com.typesafe.slick:slick_2.13:3.4.1=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.typesafe:config:1.4.0=scalastyle
com.typesafe:config:1.4.3=default
com.typesafe:config:1.4.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.typesafe:config:1.4.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.zaxxer:HikariCP:4.0.3=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
commons-beanutils:commons-beanutils:1.9.3=checkstyle,runtimeClasspath,testRuntimeClasspath
commons-beanutils:commons-beanutils:1.9.4=default
Expand Down Expand Up @@ -99,7 +99,8 @@ org.scala-lang.modules:scala-xml_2.13:2.3.0=scoverage,zinc
org.scala-lang:scala-compiler:2.13.15=zinc
org.scala-lang:scala-library:2.13.1=scalastyle
org.scala-lang:scala-library:2.13.15=zinc
org.scala-lang:scala-library:2.13.16=compileClasspath,default,runtimeClasspath,scoverage,testCompileClasspath,testRuntimeClasspath
org.scala-lang:scala-library:2.13.16=default
org.scala-lang:scala-library:2.13.17=compileClasspath,runtimeClasspath,scoverage,testCompileClasspath,testRuntimeClasspath
org.scala-lang:scala-reflect:2.13.10=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.scala-lang:scala-reflect:2.13.15=zinc
org.scala-sbt.jline:jline:2.14.7-sbt-9c3b6aca11c57e339441442bbf58e550cdfecb79=zinc
Expand Down Expand Up @@ -143,10 +144,10 @@ org.scalatest:scalatest_2.13:3.2.19=compileClasspath,default,runtimeClasspath,te
org.scalatestplus:junit-4-12_2.13:3.1.1.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.scalatestplus:scalatestplus-junit_2.13:1.0.0-M2=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.scalaz:scalaz-core_2.13:7.3.8=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.scoverage:scalac-scoverage-domain_2.13:2.3.0=scoverage
org.scoverage:scalac-scoverage-plugin_2.13.16:2.3.0=scoverage
org.scoverage:scalac-scoverage-reporter_2.13:2.3.0=scoverage
org.scoverage:scalac-scoverage-runtime_2.13:2.3.0=scoverage
org.scoverage:scalac-scoverage-serializer_2.13:2.3.0=scoverage
org.scoverage:scalac-scoverage-domain_2.13:2.4.1=scoverage
org.scoverage:scalac-scoverage-plugin_2.13.17:2.4.1=scoverage
org.scoverage:scalac-scoverage-reporter_2.13:2.4.1=scoverage
org.scoverage:scalac-scoverage-runtime_2.13:2.4.1=scoverage
org.scoverage:scalac-scoverage-serializer_2.13:2.4.1=scoverage
org.slf4j:slf4j-api:2.0.13=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
empty=annotationProcessor,archives,incrementalScalaAnalysisFormain,incrementalScalaAnalysisForscoverage,incrementalScalaAnalysisFortest,scalaCompilerPlugins,scalaToolchainRuntimeClasspath,scalafix,scoverageAnnotationProcessor,scoverageCompileClasspath,scoverageRuntimeClasspath,signatures,testAnnotationProcessor