From 136f945f536862eb6ff2ff72a3b498603d8fe636 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 18 Oct 2021 15:33:37 +0200 Subject: [PATCH 1/6] Update scala3-library to 3.1.0 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index e299ad87..c795964e 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -4,7 +4,7 @@ object Dependencies { object Versions { val scala212 = "2.12.15" val scala213 = "2.13.6" - val scala3 = "3.0.2" + val scala3 = "3.1.0" val trace4cats = "0.12.0" val trace4catsExporterHttp = "0.12.0" From 5c962d56058829b3493fd09f98818f4349b19ea4 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 18 Oct 2021 15:34:13 +0200 Subject: [PATCH 2/6] Regenerate workflow with sbt-github-actions --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1555f279..3793411e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.6, 2.12.15, 3.0.2] + scala: [2.13.6, 2.12.15, 3.1.0] java: [adopt@1.8, adopt@1.11] runs-on: ${{ matrix.os }} steps: @@ -126,12 +126,12 @@ jobs: tar xf targets.tar rm targets.tar - - name: Download target directories (3.0.2) + - name: Download target directories (3.1.0) uses: actions/download-artifact@v2 with: - name: target-${{ matrix.os }}-3.0.2-${{ matrix.java }} + name: target-${{ matrix.os }}-3.1.0-${{ matrix.java }} - - name: Inflate target directories (3.0.2) + - name: Inflate target directories (3.1.0) run: | tar xf targets.tar rm targets.tar From 8bb215c78da4abff85a3e9fb7b5f1cce106d8e0b Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 19 Nov 2021 17:47:05 +0100 Subject: [PATCH 3/6] Update scala3-library to 3.1.0 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 5425abd6..f1ee54c2 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -4,7 +4,7 @@ object Dependencies { object Versions { val scala212 = "2.12.15" val scala213 = "2.13.7" - val scala3 = "3.0.2" + val scala3 = "3.1.0" val trace4cats = "0.12.0" val trace4catsExporterHttp = "0.12.0" From 8798dd744d3fe61c5952ea1b3a9c1c50ac31893e Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 19 Nov 2021 17:47:37 +0100 Subject: [PATCH 4/6] Regenerate workflow with sbt-github-actions --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d69a064c..62264909 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.7, 2.12.15, 3.0.2] + scala: [2.13.7, 2.12.15, 3.1.0] java: [adopt@1.8, adopt@1.11] runs-on: ${{ matrix.os }} steps: From 247312208aa277be84c3023c674d10a1c89f0d07 Mon Sep 17 00:00:00 2001 From: catostrophe <40268503+catostrophe@users.noreply.github.com> Date: Sat, 20 Nov 2021 15:35:36 +0300 Subject: [PATCH 5/6] enable -Wconf on scala3 --- build.sbt | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/build.sbt b/build.sbt index a0ef4ce4..24ba1779 100644 --- a/build.sbt +++ b/build.sbt @@ -7,14 +7,7 @@ lazy val commonSettings = Seq( case _ => Seq.empty } }, - scalacOptions := { - val opts = scalacOptions.value - val wconf = "-Wconf:any:wv" - CrossVersion.partialVersion(scalaVersion.value) match { - case Some((2, _)) => opts :+ wconf - case _ => opts - } - }, + scalacOptions += "-Wconf:any:wv", Test / fork := true, resolvers += Resolver.sonatypeRepo("releases"), ) From 60ab0674673a060f1d04c54380c8a518977f029a Mon Sep 17 00:00:00 2001 From: catostrophe <40268503+catostrophe@users.noreply.github.com> Date: Sat, 20 Nov 2021 15:35:51 +0300 Subject: [PATCH 6/6] switch to the latest LTS JDK --- .github/mergify.yml | 24 ++++++++++++------------ .github/release-drafter.yml | 2 +- .github/workflows/ci.yml | 5 +++-- ci-release.sbt | 3 ++- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/.github/mergify.yml b/.github/mergify.yml index 8e9a6651..73d860dd 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -24,12 +24,12 @@ pull_request_rules: - body~=labels:.*semver-patch - "#approved-reviews-by>=1" - and: - - check-success~=Test \(ubuntu-latest, 2\.12\.\d+, adopt@1\.8\) - - check-success~=Test \(ubuntu-latest, 2\.12\.\d+, adopt@1\.11\) - - check-success~=Test \(ubuntu-latest, 2\.13\.\d+, adopt@1\.8\) - - check-success~=Test \(ubuntu-latest, 2\.13\.\d+, adopt@1\.11\) - - check-success~=Test \(ubuntu-latest, 3\.\d+\.\d+, adopt@1\.8\) - - check-success~=Test \(ubuntu-latest, 3\.\d+\.\d+, adopt@1\.11\) + - check-success~=Test \(ubuntu-latest, 2\.12\.\d+, adoptium@8\) + - check-success~=Test \(ubuntu-latest, 2\.12\.\d+, adoptium@17\) + - check-success~=Test \(ubuntu-latest, 2\.13\.\d+, adoptium@8\) + - check-success~=Test \(ubuntu-latest, 2\.13\.\d+, adoptium@17\) + - check-success~=Test \(ubuntu-latest, 3\.\d+\.\d+, adoptium@8\) + - check-success~=Test \(ubuntu-latest, 3\.\d+\.\d+, adoptium@17\) actions: merge: method: rebase @@ -44,12 +44,12 @@ pull_request_rules: - label=skip-release - label=ready-to-merge - and: - - check-success~=Test \(ubuntu-latest, 2\.12\.\d+, adopt@1\.8\) - - check-success~=Test \(ubuntu-latest, 2\.12\.\d+, adopt@1\.11\) - - check-success~=Test \(ubuntu-latest, 2\.13\.\d+, adopt@1\.8\) - - check-success~=Test \(ubuntu-latest, 2\.13\.\d+, adopt@1\.11\) - - check-success~=Test \(ubuntu-latest, 3\.\d+\.\d+, adopt@1\.8\) - - check-success~=Test \(ubuntu-latest, 3\.\d+\.\d+, adopt@1\.11\) + - check-success~=Test \(ubuntu-latest, 2\.12\.\d+, adoptium@8\) + - check-success~=Test \(ubuntu-latest, 2\.12\.\d+, adoptium@17\) + - check-success~=Test \(ubuntu-latest, 2\.13\.\d+, adoptium@8\) + - check-success~=Test \(ubuntu-latest, 2\.13\.\d+, adoptium@17\) + - check-success~=Test \(ubuntu-latest, 3\.\d+\.\d+, adoptium@8\) + - check-success~=Test \(ubuntu-latest, 3\.\d+\.\d+, adoptium@17\) actions: merge: method: rebase diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml index c983593d..fd4af27d 100644 --- a/.github/release-drafter.yml +++ b/.github/release-drafter.yml @@ -1,4 +1,4 @@ -name-template: 'Trace4Cats OpenTelemetry $NEXT_MINOR_VERSION' +name-template: 'v$NEXT_MINOR_VERSION' tag-template: 'v$NEXT_MINOR_VERSION' categories: - title: '🚀 Features' diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 62264909..6748e6f2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,6 +16,7 @@ on: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + JABBA_INDEX: 'https://github.com/typelevel/jdk-index/raw/main/index.json' jobs: build: @@ -24,7 +25,7 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.13.7, 2.12.15, 3.1.0] - java: [adopt@1.8, adopt@1.11] + java: [adoptium@8, adoptium@17] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -81,7 +82,7 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.13.7] - java: [adopt@1.8] + java: [adoptium@8] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) diff --git a/ci-release.sbt b/ci-release.sbt index 13801631..c3956274 100644 --- a/ci-release.sbt +++ b/ci-release.sbt @@ -5,7 +5,8 @@ ThisBuild / crossScalaVersions := Seq( Dependencies.Versions.scala3 ) ThisBuild / githubWorkflowTargetTags ++= Seq("v*") -ThisBuild / githubWorkflowJavaVersions := Seq("adopt@1.8", "adopt@1.11") +ThisBuild / githubWorkflowEnv += ("JABBA_INDEX" -> "https://github.com/typelevel/jdk-index/raw/main/index.json") +ThisBuild / githubWorkflowJavaVersions := Seq("adoptium@8", "adoptium@17") ThisBuild / githubWorkflowBuildPreamble += WorkflowStep.Run( commands = List("docker-compose up -d"),