Update all the things. (#124)

* Update all the things. * Updated scala version in CI workflow. * codeFmt * Set Java 17 as docker base.
firstbirdtech · Jan 25, 2024 · 96a6341 · 96a6341
1 parent 9771a33
commit 96a6341
Show file tree

Hide file tree

Showing 50 changed files with 63 additions and 67 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,7 +23,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [3.3.0]
+        scala: [3.3.1]
         java: [temurin@11, temurin@17]
     runs-on: ${{ matrix.os }}
     steps:
@@ -79,7 +79,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [3.3.0]
+        scala: [3.3.1]
         java: [temurin@11]
     runs-on: ${{ matrix.os }}
     steps:
@@ -114,12 +114,12 @@ jobs:
             ~/Library/Caches/Coursier/v1
           key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
 
-      - name: Download target directories (3.3.0)
+      - name: Download target directories (3.3.1)
         uses: actions/download-artifact@v2
         with:
-          name: target-${{ matrix.os }}-3.3.0-${{ matrix.java }}
+          name: target-${{ matrix.os }}-3.3.1-${{ matrix.java }}
 
-      - name: Inflate target directories (3.3.0)
+      - name: Inflate target directories (3.3.1)
         run: |
           tar xf targets.tar
           rm targets.tar

diff --git a/build.sbt b/build.sbt
@@ -1,8 +1,7 @@
 import java.time.LocalDate
 
-ThisBuild / scalafixDependencies += Dependencies.organizeimports
 ThisBuild / dynverSeparator := "-" // Default uses '+' which is not valid for docker tags
-ThisBuild / scalaVersion    := "3.3.0"
+ThisBuild / scalaVersion    := "3.3.1"
 
 addCommandAlias("codeFmt", ";headerCreate;scalafmtAll;scalafmtSbt;scalafixAll")
 addCommandAlias("codeVerify", ";scalafmtCheckAll;scalafmtSbtCheck;scalafixAll --check;headerCheck")
@@ -71,7 +70,7 @@ lazy val core = project
     }.taskValue
   )
   .settings(
-    dockerBaseImage      := "eclipse-temurin:11",
+    dockerBaseImage      := "eclipse-temurin:17",
     Docker / packageName := "firstbird/emergence",
     dockerUpdateLatest   := true
   )

diff --git a/core/src/main/scala/com/fgrutsch/emergence/core/App.scala b/core/src/main/scala/com/fgrutsch/emergence/core/App.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Emergence contributors
+ * Copyright 2024 Emergence contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala/com/fgrutsch/emergence/core/app/CliOptions.scala b/core/src/main/scala/com/fgrutsch/emergence/core/app/CliOptions.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Emergence contributors
+ * Copyright 2024 Emergence contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala/com/fgrutsch/emergence/core/app/EmergenceAlg.scala b/core/src/main/scala/com/fgrutsch/emergence/core/app/EmergenceAlg.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Emergence contributors
+ * Copyright 2024 Emergence contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala/com/fgrutsch/emergence/core/app/EmergenceContext.scala b/core/src/main/scala/com/fgrutsch/emergence/core/app/EmergenceContext.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Emergence contributors
+ * Copyright 2024 Emergence contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala/com/fgrutsch/emergence/core/condition/Condition.scala b/core/src/main/scala/com/fgrutsch/emergence/core/condition/Condition.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Emergence contributors
+ * Copyright 2024 Emergence contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala/com/fgrutsch/emergence/core/condition/ConditionMatcher.scala b/core/src/main/scala/com/fgrutsch/emergence/core/condition/ConditionMatcher.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Emergence contributors
+ * Copyright 2024 Emergence contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala/com/fgrutsch/emergence/core/condition/ConditionMatcherAlg.scala b/core/src/main/scala/com/fgrutsch/emergence/core/condition/ConditionMatcherAlg.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Emergence contributors
+ * Copyright 2024 Emergence contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala/com/fgrutsch/emergence/core/condition/ConditionOperator.scala b/core/src/main/scala/com/fgrutsch/emergence/core/condition/ConditionOperator.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Emergence contributors
+ * Copyright 2024 Emergence contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala/com/fgrutsch/emergence/core/condition/ConditionValue.scala b/core/src/main/scala/com/fgrutsch/emergence/core/condition/ConditionValue.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Emergence contributors
+ * Copyright 2024 Emergence contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala/com/fgrutsch/emergence/core/condition/Input.scala b/core/src/main/scala/com/fgrutsch/emergence/core/condition/Input.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Emergence contributors
+ * Copyright 2024 Emergence contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala/com/fgrutsch/emergence/core/configuration/EmergenceConfig.scala b/core/src/main/scala/com/fgrutsch/emergence/core/configuration/EmergenceConfig.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Emergence contributors
+ * Copyright 2024 Emergence contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...src/main/scala/com/fgrutsch/emergence/core/configuration/EmergenceConfigResolverAlg.scala b/...src/main/scala/com/fgrutsch/emergence/core/configuration/EmergenceConfigResolverAlg.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Emergence contributors
+ * Copyright 2024 Emergence contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala/com/fgrutsch/emergence/core/configuration/MergeConfig.scala b/core/src/main/scala/com/fgrutsch/emergence/core/configuration/MergeConfig.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Emergence contributors
+ * Copyright 2024 Emergence contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala/com/fgrutsch/emergence/core/configuration/RunConfig.scala b/core/src/main/scala/com/fgrutsch/emergence/core/configuration/RunConfig.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Emergence contributors
+ * Copyright 2024 Emergence contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala/com/fgrutsch/emergence/core/merge/MergeAlg.scala b/core/src/main/scala/com/fgrutsch/emergence/core/merge/MergeAlg.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Emergence contributors
+ * Copyright 2024 Emergence contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala/com/fgrutsch/emergence/core/model/Settings.scala b/core/src/main/scala/com/fgrutsch/emergence/core/model/Settings.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Emergence contributors
+ * Copyright 2024 Emergence contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala/com/fgrutsch/emergence/core/model/VcsType.scala b/core/src/main/scala/com/fgrutsch/emergence/core/model/VcsType.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Emergence contributors
+ * Copyright 2024 Emergence contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala/com/fgrutsch/emergence/core/utils/config.scala b/core/src/main/scala/com/fgrutsch/emergence/core/utils/config.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Emergence contributors
+ * Copyright 2024 Emergence contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala/com/fgrutsch/emergence/core/utils/logging.scala b/core/src/main/scala/com/fgrutsch/emergence/core/utils/logging.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Emergence contributors
+ * Copyright 2024 Emergence contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala/com/fgrutsch/emergence/core/vcs/VcsAlg.scala b/core/src/main/scala/com/fgrutsch/emergence/core/vcs/VcsAlg.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Emergence contributors
+ * Copyright 2024 Emergence contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala/com/fgrutsch/emergence/core/vcs/VcsFactory.scala b/core/src/main/scala/com/fgrutsch/emergence/core/vcs/VcsFactory.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Emergence contributors
+ * Copyright 2024 Emergence contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala/com/fgrutsch/emergence/core/vcs/VcsSettings.scala b/core/src/main/scala/com/fgrutsch/emergence/core/vcs/VcsSettings.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Emergence contributors
+ * Copyright 2024 Emergence contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala/com/fgrutsch/emergence/core/vcs/bitbucketcloud/BitbucketCloudVcs.scala b/core/src/main/scala/com/fgrutsch/emergence/core/vcs/bitbucketcloud/BitbucketCloudVcs.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Emergence contributors
+ * Copyright 2024 Emergence contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala/com/fgrutsch/emergence/core/vcs/bitbucketcloud/DiffStatResponse.scala b/core/src/main/scala/com/fgrutsch/emergence/core/vcs/bitbucketcloud/DiffStatResponse.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Emergence contributors
+ * Copyright 2024 Emergence contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala/com/fgrutsch/emergence/core/vcs/bitbucketcloud/Encoding.scala b/core/src/main/scala/com/fgrutsch/emergence/core/vcs/bitbucketcloud/Encoding.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Emergence contributors
+ * Copyright 2024 Emergence contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...c/main/scala/com/fgrutsch/emergence/core/vcs/bitbucketcloud/MergePullRequestRequest.scala b/...c/main/scala/com/fgrutsch/emergence/core/vcs/bitbucketcloud/MergePullRequestRequest.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Emergence contributors
+ * Copyright 2024 Emergence contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala/com/fgrutsch/emergence/core/vcs/bitbucketcloud/Page.scala b/core/src/main/scala/com/fgrutsch/emergence/core/vcs/bitbucketcloud/Page.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Emergence contributors
+ * Copyright 2024 Emergence contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala/com/fgrutsch/emergence/core/vcs/github/Encoding.scala b/core/src/main/scala/com/fgrutsch/emergence/core/vcs/github/Encoding.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Emergence contributors
+ * Copyright 2024 Emergence contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala/com/fgrutsch/emergence/core/vcs/github/GithubPullRequest.scala b/core/src/main/scala/com/fgrutsch/emergence/core/vcs/github/GithubPullRequest.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Emergence contributors
+ * Copyright 2024 Emergence contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala/com/fgrutsch/emergence/core/vcs/github/GithubVcs.scala b/core/src/main/scala/com/fgrutsch/emergence/core/vcs/github/GithubVcs.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Emergence contributors
+ * Copyright 2024 Emergence contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala/com/fgrutsch/emergence/core/vcs/github/MergePullRequestRequest.scala b/core/src/main/scala/com/fgrutsch/emergence/core/vcs/github/MergePullRequestRequest.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Emergence contributors
+ * Copyright 2024 Emergence contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala/com/fgrutsch/emergence/core/vcs/github/Page.scala b/core/src/main/scala/com/fgrutsch/emergence/core/vcs/github/Page.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Emergence contributors
+ * Copyright 2024 Emergence contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala/com/fgrutsch/emergence/core/vcs/model/Author.scala b/core/src/main/scala/com/fgrutsch/emergence/core/vcs/model/Author.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Emergence contributors
+ * Copyright 2024 Emergence contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala/com/fgrutsch/emergence/core/vcs/model/BranchName.scala b/core/src/main/scala/com/fgrutsch/emergence/core/vcs/model/BranchName.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Emergence contributors
+ * Copyright 2024 Emergence contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala/com/fgrutsch/emergence/core/vcs/model/BuildStatus.scala b/core/src/main/scala/com/fgrutsch/emergence/core/vcs/model/BuildStatus.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Emergence contributors
+ * Copyright 2024 Emergence contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala/com/fgrutsch/emergence/core/vcs/model/BuildStatusName.scala b/core/src/main/scala/com/fgrutsch/emergence/core/vcs/model/BuildStatusName.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Emergence contributors
+ * Copyright 2024 Emergence contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala/com/fgrutsch/emergence/core/vcs/model/BuildStatusState.scala b/core/src/main/scala/com/fgrutsch/emergence/core/vcs/model/BuildStatusState.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Emergence contributors
+ * Copyright 2024 Emergence contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala/com/fgrutsch/emergence/core/vcs/model/Commit.scala b/core/src/main/scala/com/fgrutsch/emergence/core/vcs/model/Commit.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Emergence contributors
+ * Copyright 2024 Emergence contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala/com/fgrutsch/emergence/core/vcs/model/MergCheck.scala b/core/src/main/scala/com/fgrutsch/emergence/core/vcs/model/MergCheck.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Emergence contributors
+ * Copyright 2024 Emergence contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala/com/fgrutsch/emergence/core/vcs/model/MergeMessage.scala b/core/src/main/scala/com/fgrutsch/emergence/core/vcs/model/MergeMessage.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Emergence contributors
+ * Copyright 2024 Emergence contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala/com/fgrutsch/emergence/core/vcs/model/MergeStrategy.scala b/core/src/main/scala/com/fgrutsch/emergence/core/vcs/model/MergeStrategy.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Emergence contributors
+ * Copyright 2024 Emergence contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala/com/fgrutsch/emergence/core/vcs/model/PullRequest.scala b/core/src/main/scala/com/fgrutsch/emergence/core/vcs/model/PullRequest.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Emergence contributors
+ * Copyright 2024 Emergence contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala/com/fgrutsch/emergence/core/vcs/model/PullRequestNumber.scala b/core/src/main/scala/com/fgrutsch/emergence/core/vcs/model/PullRequestNumber.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Emergence contributors
+ * Copyright 2024 Emergence contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala/com/fgrutsch/emergence/core/vcs/model/PullRequestTitle.scala b/core/src/main/scala/com/fgrutsch/emergence/core/vcs/model/PullRequestTitle.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Emergence contributors
+ * Copyright 2024 Emergence contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala/com/fgrutsch/emergence/core/vcs/model/RepoFile.scala b/core/src/main/scala/com/fgrutsch/emergence/core/vcs/model/RepoFile.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Emergence contributors
+ * Copyright 2024 Emergence contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/src/main/scala/com/fgrutsch/emergence/core/vcs/model/Repository.scala b/core/src/main/scala/com/fgrutsch/emergence/core/vcs/model/Repository.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Emergence contributors
+ * Copyright 2024 Emergence contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.