Skip to content

Commit 53351f7

Browse files
abrightonabrighton
committed
Updated dependencies
1 parent 0b07609 commit 53351f7

10 files changed

Lines changed: 19 additions & 18 deletions

File tree

‎.github/workflows/integration.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717

1818
steps:
19-
- uses: actions/checkout@v2
19+
- uses: actions/checkout@v4
2020

2121
- uses: coursier/setup-action@v1.2.0
2222
with:
@@ -31,7 +31,7 @@ jobs:
3131
run: |
3232
curl -s https://get.sdkman.io | bash
3333
source "/home/runner/.sdkman/bin/sdkman-init.sh"
34-
sdk install kotlin
34+
sdk install kotlin 2.1.0
3535
sudo ln -s $(which kotlinc) /usr/local/bin/kotlinc
3636
3737
- name: Build
@@ -48,11 +48,11 @@ jobs:
4848
4949
- name: Tests
5050
working-directory: integration
51-
run: sbt -DenableFatalWarnings=true -DgenerateStoryReport=true test:test
51+
run: sbt -DenableFatalWarnings=true -DgenerateStoryReport=true Test/test
5252

5353
- name: Generate RTM
5454
working-directory: integration
55-
run: cs launch --channel https://raw.githubusercontent.com/tmtsoftware/osw-apps/Allan/pekko-scala3-update/apps.json rtm:b7997a9 -- target/RTM/testStoryMapping.txt ../tools/RTM/storyRequirementMapping.csv target/RTM/testRequirementsMapping.txt
55+
run: cs launch --channel https://raw.githubusercontent.com/tmtsoftware/osw-apps/Allan/pekko-scala3-update/apps.json rtm:d520268 -- target/RTM/testStoryMapping.txt ../tools/RTM/storyRequirementMapping.csv target/RTM/testRequirementsMapping.txt
5656

5757
- name: Upload RTM
5858
uses: actions/upload-artifact@v4

‎.github/workflows/iris.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343

4444
- name: Generate RTM
4545
working-directory: iris
46-
run: cs launch --channel https://raw.githubusercontent.com/tmtsoftware/osw-apps/Allan/pekko-scala3-update/apps.json rtm:b7997a9 -- target/RTM/testStoryMapping.txt ../tools/RTM/storyRequirementMapping.csv target/RTM/testRequirementsMapping.txt
46+
run: cs launch --channel https://raw.githubusercontent.com/tmtsoftware/osw-apps/Allan/pekko-scala3-update/apps.json rtm:d520268 -- target/RTM/testStoryMapping.txt ../tools/RTM/storyRequirementMapping.csv target/RTM/testRequirementsMapping.txt
4747

4848
- name: Generate Coverage
4949
working-directory: iris

‎.github/workflows/release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555

5656
- name: Integration- Generate RTM
5757
working-directory: integration
58-
run: cs launch --channel https://raw.githubusercontent.com/tmtsoftware/osw-apps/Allan/pekko-scala3-update/apps.json rtm:b7997a9 -- target/RTM/testStoryMapping.txt ../tools/RTM/storyRequirementMapping.csv target/RTM/testRequirementsMapping.txt
58+
run: cs launch --channel https://raw.githubusercontent.com/tmtsoftware/osw-apps/Allan/pekko-scala3-update/apps.json rtm:d520268 -- target/RTM/testStoryMapping.txt ../tools/RTM/storyRequirementMapping.csv target/RTM/testRequirementsMapping.txt
5959

6060
- name: Integration - Upload RTM
6161
uses: actions/upload-artifact@v2
@@ -76,7 +76,7 @@ jobs:
7676

7777
- name: IRIS - Generate RTM
7878
working-directory: iris
79-
run: cs launch --channel https://raw.githubusercontent.com/tmtsoftware/osw-apps/Allan/pekko-scala3-update/apps.json rtm:b7997a9 -- target/RTM/testStoryMapping.txt ../tools/RTM/storyRequirementMapping.csv target/RTM/testRequirementsMapping.txt
79+
run: cs launch --channel https://raw.githubusercontent.com/tmtsoftware/osw-apps/Allan/pekko-scala3-update/apps.json rtm:d520268 -- target/RTM/testStoryMapping.txt ../tools/RTM/storyRequirementMapping.csv target/RTM/testRequirementsMapping.txt
8080

8181
- name: IRIS - Generate Coverage
8282
working-directory: iris
@@ -102,7 +102,7 @@ jobs:
102102

103103
- name: WFOS - Generate RTM
104104
working-directory: wfos
105-
run: cs launch --channel https://raw.githubusercontent.com/tmtsoftware/osw-apps/Allan/pekko-scala3-update/apps.json rtm:b7997a9 -- target/RTM/testStoryMapping.txt ../tools/RTM/storyRequirementMapping.csv target/RTM/testRequirementsMapping.txt
105+
run: cs launch --channel https://raw.githubusercontent.com/tmtsoftware/osw-apps/Allan/pekko-scala3-update/apps.json rtm:d520268 -- target/RTM/testStoryMapping.txt ../tools/RTM/storyRequirementMapping.csv target/RTM/testRequirementsMapping.txt
106106

107107
- name: WFOS - Generate Coverage
108108
working-directory: wfos

‎.github/workflows/wfos.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343

4444
- name: Generate RTM
4545
working-directory: wfos
46-
run: cs launch --channel https://raw.githubusercontent.com/tmtsoftware/osw-apps/Allan/pekko-scala3-update/apps.json rtm:b7997a9 -- target/RTM/testStoryMapping.txt ../tools/RTM/storyRequirementMapping.csv target/RTM/testRequirementsMapping.txt
46+
run: cs launch --channel https://raw.githubusercontent.com/tmtsoftware/osw-apps/Allan/pekko-scala3-update/apps.json rtm:d520268 -- target/RTM/testStoryMapping.txt ../tools/RTM/storyRequirementMapping.csv target/RTM/testRequirementsMapping.txt
4747

4848
- name: Generate Coverage
4949
working-directory: wfos

‎integration/build.sbt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ name := "integration"
33
libraryDependencies += ("com.github.tmtsoftware.esw" %% "esw-testkit" % "bab4a64")
44
libraryDependencies += ("com.github.tmtsoftware.esw-observing-simulation" %% "iris-irisdeploy" % "87655c9")
55
libraryDependencies += ("com.github.tmtsoftware.esw-observing-simulation" %% "wfos-wfosdeploy" % "87655c9")
6-
//libraryDependencies += ("com.github.tmtsoftware" %% "rtm" % "b7997a9")
6+
libraryDependencies += ("com.github.tmtsoftware.rtm" %% "rtm" % "d520268")
77
scalafmtConfig := file("../.scalafmt.conf")
88

‎iris/project/Libs.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ object Libs {
1313
val `junit-4-13` = "org.scalatestplus" %% "junit-4-13" % "3.2.19.0"
1414
val `pekko-actor-testkit-typed` = "org.apache.pekko" %% "pekko-actor-testkit-typed" % "1.1.2"
1515
val `nom-tam-fits` = "gov.nasa.gsfc.heasarc" % "nom-tam-fits" % "1.20.2"
16-
val `tmt-test-reporter` = "com.github.tmtsoftware" %% "rtm" % "b7997a9"
16+
val `tmt-test-reporter` = "com.github.tmtsoftware.rtm" %% "rtm" % "d520268"
1717
}
1818

1919
object CSW {

‎jenkins/stil-nightly‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ pipeline {
6868
sh "mkdir -p target/RTM"
6969
sh "cat iris/target/RTM/testStoryMapping.txt wfos/target/RTM/testStoryMapping.txt integration/target/RTM/testStoryMapping.txt > target/RTM/testStoryMappingAll.txt"
7070
// Generate RTM
71-
sh "cs launch --channel https://raw.githubusercontent.com/tmtsoftware/osw-apps/Allan/pekko-scala3-update/apps.json rtm:b7997a9 -- target/RTM/testStoryMappingAll.txt tools/RTM/storyRequirementMapping.csv target/RTM/testRequirementsMapping.txt"
71+
sh "cs launch --channel https://raw.githubusercontent.com/tmtsoftware/osw-apps/Allan/pekko-scala3-update/apps.json rtm:d520268 -- target/RTM/testStoryMappingAll.txt tools/RTM/storyRequirementMapping.csv target/RTM/testRequirementsMapping.txt"
7272
// Upload RTM
7373
publishHTML(target: [
7474
alwaysLinkToLastBuild: false,

‎simulation-scripts/install-tcs-assemblies.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/usr/bin/env bash
2+
set -x
23
version=$1
34

45
if [[ "$OSTYPE" == "darwin"* ]]; then

‎simulation-scripts/versions.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
export ESW_VERSION=4d97ed9
44
export CSW_VERSION=2f05249
55
export SEQ_SCRIPT_VERSION=204f3e4
6-
export TCS_VERSION=e86b733
6+
export TCS_VERSION=0.11
77
export ENG_UI_VERSION=82b542e
88
export CHANNEL="https://raw.githubusercontent.com/tmtsoftware/osw-apps/Allan/pekko-scala3-update/apps.json"

‎wfos/project/Libs.scala‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ import scala.util.control.NonFatal
88
object Libs {
99
val ScalaVersion = "3.6.2"
1010

11-
val `scalatest` = "org.scalatest" %% "scalatest" % "3.2.19" // Apache License 2.0
11+
val `scalatest` = "org.scalatest" %% "scalatest" % "3.2.19" // Apache License 2.0
1212
// val `dotty-cps-async` = "com.github.rssh" %% "dotty-cps-async" % "0.9.23"
13-
val `junit-4-13` = "org.scalatestplus" %% "junit-4-13" % "3.2.19.0"
14-
val `pekko-actor-testkit-typed` = "org.apache.pekko" %% "pekko-actor-testkit-typed" % "1.1.2"
15-
val `nom-tam-fits` = "gov.nasa.gsfc.heasarc" % "nom-tam-fits" % "1.20.2"
16-
val `tmt-test-reporter` = "com.github.tmtsoftware" %% "rtm" % "b7997a9"
13+
val `junit-4-13` = "org.scalatestplus" %% "junit-4-13" % "3.2.19.0"
14+
val `pekko-actor-testkit-typed` = "org.apache.pekko" %% "pekko-actor-testkit-typed" % "1.1.2"
15+
val `nom-tam-fits` = "gov.nasa.gsfc.heasarc" % "nom-tam-fits" % "1.20.2"
16+
val `tmt-test-reporter` = "com.github.tmtsoftware.rtm" %% "rtm" % "d520268"
1717
}
1818

1919
object CSW {

0 commit comments

Comments
 (0)