Skip to content

Commit

Permalink
Merge pull request #3 from julianmendez/development
Browse files Browse the repository at this point in the history
Update versions used
  • Loading branch information
julianmendez authored Oct 28, 2024
2 parents b552ace + 28b322c commit bcf03c3
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 12 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,9 @@ jobs:
matrix:
java:
- 11.0.21
- 17.0.9
- 21.0.1
scala:
- 3.4.0
- 3.4.2
steps:
- name: Check out
uses: actions/checkout@v4
Expand Down
7 changes: 3 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import sbt.Keys.scalacOptions

lazy val scala3_4 = "3.4.0"
lazy val scala3_4 = "3.4.2"

lazy val commonSettings =
Seq(
Expand All @@ -13,8 +13,7 @@ lazy val commonSettings =
organizationName := "Umea University",
organizationHomepage := Some(url("https://www.umu.se/en/department-of-computing-science/")),
developers := List(
Developer("julianmendez", "Julian Alfredo Mendez", "[email protected]", new URL
("https://julianmendez.github.io"))
Developer("julianmendez", "Julian Alfredo Mendez", "[email protected]", url("https://julianmendez.github.io"))
),

/**
Expand All @@ -33,7 +32,7 @@ lazy val commonSettings =
* [[https://github.com/scalatest/scalatest]]
* [[https://repo1.maven.org/maven2/org/scalatest/]]
*/
libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.18" % "test",
libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.19" % "test",
resolvers += Resolver.mavenLocal,
publishTo := Some(Resolver.mavenLocal),
publishMavenStyle := true,
Expand Down
4 changes: 2 additions & 2 deletions docs/RELEASE-NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
- date: unreleased
- new_features:
- first operational example
- build: $ `sbt '++ 3.4.0' clean compile test package assembly`
- release: target/scala-3.4.0/market-0.1.0.jar
- build: $ `sbt '++ 3.4.2' clean compile test package assembly`
- release: target/scala-3.4.2/market-0.1.0.jar


4 changes: 2 additions & 2 deletions makeall.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#/bin/bash
#!/bin/bash

#
# This script builds the binary file.
Expand All @@ -7,7 +7,7 @@

sbt scalaVersion sbtVersion version clean compile test package assembly

scalaVersion="3.4.0"
scalaVersion="3.4.2"
binaryFile="market"
executableStub="exec java -jar \$0 \"\$@\" ; exit"
jarFile="target/scala-${scalaVersion}/${binaryFile}-*.jar"
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
# [https://repo1.maven.org/maven2/org/scala-sbt/sbt-launch/]
# [https://repo.scala-sbt.org/scalasbt/maven-releases/org/scala-sbt/sbt-launch/]
#
sbt.version=1.9.7
sbt.version=1.9.9

2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* [[https://github.com/sbt/sbt-assembly]]
* [[https://repo1.maven.org/maven2/com/eed3si9n/sbt-assembly_2.12_1.0/]]
*/
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.3")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.2.0")

/**
* scalastyle-sbt-plugin
Expand Down

0 comments on commit bcf03c3

Please sign in to comment.