From 96a6341e566358f99e3ad23db5113c022fed41ee Mon Sep 17 00:00:00 2001 From: Benjamin M Date: Thu, 25 Jan 2024 11:04:46 +0100 Subject: [PATCH] Update all the things. (#124) * Update all the things. * Updated scala version in CI workflow. * codeFmt * Set Java 17 as docker base. --- .github/workflows/ci.yml | 10 ++++----- build.sbt | 5 ++--- .../com/fgrutsch/emergence/core/App.scala | 2 +- .../emergence/core/app/CliOptions.scala | 2 +- .../emergence/core/app/EmergenceAlg.scala | 2 +- .../emergence/core/app/EmergenceContext.scala | 2 +- .../emergence/core/condition/Condition.scala | 2 +- .../core/condition/ConditionMatcher.scala | 2 +- .../core/condition/ConditionMatcherAlg.scala | 2 +- .../core/condition/ConditionOperator.scala | 2 +- .../core/condition/ConditionValue.scala | 2 +- .../emergence/core/condition/Input.scala | 2 +- .../core/configuration/EmergenceConfig.scala | 2 +- .../EmergenceConfigResolverAlg.scala | 2 +- .../core/configuration/MergeConfig.scala | 2 +- .../core/configuration/RunConfig.scala | 2 +- .../emergence/core/merge/MergeAlg.scala | 2 +- .../emergence/core/model/Settings.scala | 2 +- .../emergence/core/model/VcsType.scala | 2 +- .../emergence/core/utils/config.scala | 2 +- .../emergence/core/utils/logging.scala | 2 +- .../fgrutsch/emergence/core/vcs/VcsAlg.scala | 2 +- .../emergence/core/vcs/VcsFactory.scala | 2 +- .../emergence/core/vcs/VcsSettings.scala | 2 +- .../bitbucketcloud/BitbucketCloudVcs.scala | 2 +- .../vcs/bitbucketcloud/DiffStatResponse.scala | 2 +- .../core/vcs/bitbucketcloud/Encoding.scala | 2 +- .../MergePullRequestRequest.scala | 2 +- .../core/vcs/bitbucketcloud/Page.scala | 2 +- .../emergence/core/vcs/github/Encoding.scala | 2 +- .../core/vcs/github/GithubPullRequest.scala | 2 +- .../emergence/core/vcs/github/GithubVcs.scala | 2 +- .../vcs/github/MergePullRequestRequest.scala | 2 +- .../emergence/core/vcs/github/Page.scala | 2 +- .../emergence/core/vcs/model/Author.scala | 2 +- .../emergence/core/vcs/model/BranchName.scala | 2 +- .../core/vcs/model/BuildStatus.scala | 2 +- .../core/vcs/model/BuildStatusName.scala | 2 +- .../core/vcs/model/BuildStatusState.scala | 2 +- .../emergence/core/vcs/model/Commit.scala | 2 +- .../emergence/core/vcs/model/MergCheck.scala | 2 +- .../core/vcs/model/MergeMessage.scala | 2 +- .../core/vcs/model/MergeStrategy.scala | 2 +- .../core/vcs/model/PullRequest.scala | 2 +- .../core/vcs/model/PullRequestNumber.scala | 2 +- .../core/vcs/model/PullRequestTitle.scala | 2 +- .../emergence/core/vcs/model/RepoFile.scala | 2 +- .../emergence/core/vcs/model/Repository.scala | 2 +- project/Dependencies.scala | 21 ++++++++----------- project/build.properties | 2 +- 50 files changed, 63 insertions(+), 67 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 24b18ee..a2fa4c5 100644 --- 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 index 481050f..3e23e6e 100644 --- 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 index 4f3e047..92fceb6 100644 --- 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 index 3d75008..d135112 100644 --- 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 index cbfdb58..9222dab 100644 --- 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 index 72ad0fd..1ba10f3 100644 --- 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 index 3bd3462..3e6fe04 100644 --- 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 index 77f727f..ccdebd8 100644 --- 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 index d3b68bf..97076eb 100644 --- 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 index dc9ab3c..3726ed1 100644 --- 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 index 5ba7080..c112e38 100644 --- 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 index 74da2a1..4af8f8e 100644 --- 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 index d50a063..168aaa4 100644 --- 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/core/src/main/scala/com/fgrutsch/emergence/core/configuration/EmergenceConfigResolverAlg.scala b/core/src/main/scala/com/fgrutsch/emergence/core/configuration/EmergenceConfigResolverAlg.scala index d7f210a..90e7a72 100644 --- a/core/src/main/scala/com/fgrutsch/emergence/core/configuration/EmergenceConfigResolverAlg.scala +++ b/core/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 index 43d278a..03b7d3c 100644 --- 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 index 4eda8ff..8b7fc92 100644 --- 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 index 6ac1eeb..c4feecb 100644 --- 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 index 68f7d5c..5c82d30 100644 --- 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 index 10f8eaf..a71e938 100644 --- 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 index 96300d8..74667ce 100644 --- 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 index 63143db..336b3a2 100644 --- 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 index 802f295..fcbe0f6 100644 --- 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 index af98246..ce79619 100644 --- 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 index ee34a40..124e49a 100644 --- 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 index f69b393..e8f896f 100644 --- 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 index 033def0..5c1f82d 100644 --- 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 index 4fa032d..bfc6b82 100644 --- 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/core/src/main/scala/com/fgrutsch/emergence/core/vcs/bitbucketcloud/MergePullRequestRequest.scala b/core/src/main/scala/com/fgrutsch/emergence/core/vcs/bitbucketcloud/MergePullRequestRequest.scala index cd21f88..0a6b311 100644 --- a/core/src/main/scala/com/fgrutsch/emergence/core/vcs/bitbucketcloud/MergePullRequestRequest.scala +++ b/core/src/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 index ef569a2..04e3a58 100644 --- 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 index 0ba220b..f4f2695 100644 --- 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 index 38f09d8..4268725 100644 --- 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 index b15d2ca..ba5d751 100644 --- 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 index f5c80c9..d79a095 100644 --- 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 index 7425881..2422153 100644 --- 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 index 0cac930..72c032a 100644 --- 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 index 0991363..cbe7ef7 100644 --- 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 index 4af0fe6..341b50c 100644 --- 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 index 02f57f0..5713b4b 100644 --- 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 index fa892a5..226e67e 100644 --- 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 index 7de065b..d7c6f67 100644 --- 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 index 0915807..a545240 100644 --- 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 index 1f7fddf..38d376c 100644 --- 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 index 46efcc1..9f12a84 100644 --- 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 index 109717a..83d7c79 100644 --- 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 index 53b2470..ec9b373 100644 --- 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 index 9339b65..51242d6 100644 --- 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 index acba032..8b80301 100644 --- 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 index d6ef16c..bf64966 100644 --- 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. diff --git a/project/Dependencies.scala b/project/Dependencies.scala index e4937ad..d6ad6e7 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -2,28 +2,25 @@ import sbt._ object Dependencies { - private val circeVersion = "0.14.5" - private val fs2Version = "3.8.0" - private val sttpClientVersion = "3.8.16" + private val circeVersion = "0.14.6" + private val fs2Version = "3.9.4" + private val sttpClientVersion = "3.9.2" val core: Seq[ModuleID] = Seq( - "ch.qos.logback" % "logback-classic" % "1.4.8", + "ch.qos.logback" % "logback-classic" % "1.4.14", "co.fs2" %% "fs2-io" % fs2Version, "co.fs2" %% "fs2-core" % fs2Version, - "com.fasterxml.jackson.dataformat" % "jackson-dataformat-yaml" % "2.14.3", + "com.fasterxml.jackson.dataformat" % "jackson-dataformat-yaml" % "2.16.1", "com.monovore" %% "decline-effect" % "2.4.1", "com.softwaremill.sttp.client3" %% "core" % sttpClientVersion, "com.softwaremill.sttp.client3" %% "circe" % sttpClientVersion, "com.softwaremill.sttp.client3" %% "async-http-client-backend-cats" % sttpClientVersion, - "com.typesafe" % "config" % "1.4.2", + "com.typesafe" % "config" % "1.4.3", "io.circe" %% "circe-core" % circeVersion, "io.circe" %% "circe-parser" % circeVersion, - "io.circe" %% "circe-yaml" % "0.14.2", - "org.scalatest" %% "scalatest" % "3.2.16" % Test, - "org.typelevel" %% "cats-effect" % "3.5.1", + "io.circe" %% "circe-yaml" % "0.15.1", + "org.scalatest" %% "scalatest" % "3.2.17" % Test, + "org.typelevel" %% "cats-effect" % "3.5.3", "org.typelevel" %% "log4cats-slf4j" % "2.6.0" ) - - val organizeimports: ModuleID = "com.github.liancheng" %% "organize-imports" % "0.6.0" - } diff --git a/project/build.properties b/project/build.properties index 52413ab..abbbce5 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.3 +sbt.version=1.9.8