From aa294261c145d14d3eb3169c9455495bf3766a75 Mon Sep 17 00:00:00 2001 From: Julian Mendez Date: Tue, 30 Jul 2024 23:06:39 +0200 Subject: [PATCH 1/3] Update script to build executable binary file --- makeall.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makeall.sh b/makeall.sh index 91b529e..ecebb01 100644 --- a/makeall.sh +++ b/makeall.sh @@ -1,4 +1,4 @@ -#/bin/bash +#!/bin/bash # # This script builds the binary file. From 7732888c450d2682bfd3b3b20c904c02a3c191e8 Mon Sep 17 00:00:00 2001 From: Julian Mendez Date: Thu, 8 Aug 2024 00:34:24 +0200 Subject: [PATCH 2/3] Update build.properties and plugins.sbt --- project/build.properties | 2 +- project/plugins.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project/build.properties b/project/build.properties index 28a421f..dd534fa 100644 --- a/project/build.properties +++ b/project/build.properties @@ -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 diff --git a/project/plugins.sbt b/project/plugins.sbt index 6959a45..a16e054 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -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 From 28b322c78b2d8a105054b33bc2a2b042eaabd074 Mon Sep 17 00:00:00 2001 From: Julian Mendez Date: Thu, 8 Aug 2024 00:35:48 +0200 Subject: [PATCH 3/3] Use Scala 3.4.2 --- .github/workflows/ci.yml | 3 +-- build.sbt | 7 +++---- docs/RELEASE-NOTES.md | 4 ++-- makeall.sh | 2 +- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bb5c42c..a02ffb1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 diff --git a/build.sbt b/build.sbt index 7a61f2c..a52c00b 100644 --- a/build.sbt +++ b/build.sbt @@ -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( @@ -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", "julian.mendez@gmail.com", new URL - ("https://julianmendez.github.io")) + Developer("julianmendez", "Julian Alfredo Mendez", "julian.mendez@gmail.com", url("https://julianmendez.github.io")) ), /** @@ -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, diff --git a/docs/RELEASE-NOTES.md b/docs/RELEASE-NOTES.md index aabb848..e2759f0 100644 --- a/docs/RELEASE-NOTES.md +++ b/docs/RELEASE-NOTES.md @@ -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 diff --git a/makeall.sh b/makeall.sh index ecebb01..776c363 100644 --- a/makeall.sh +++ b/makeall.sh @@ -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"