From ad1f8ac733ee2046aecc6e164a03201370671555 Mon Sep 17 00:00:00 2001 From: oss-47 Date: Wed, 22 Jan 2025 05:13:58 +0000 Subject: [PATCH 1/6] Update scala3-compiler, scala3-library, ... to 3.6.3 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index dcef71ab1..a1fdc6c4f 100644 --- a/build.sbt +++ b/build.sbt @@ -1,5 +1,5 @@ val scala213 = "2.13.16" -val scala3 = "3.4.3" +val scala3 = "3.6.3" ThisBuild / organization := "io.higherkindness" ThisBuild / githubOrganization := "47degrees" From ade3689338d3364d39b72430a5d527f46a454825 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fede=20Fern=C3=A1ndez?= <720923+fedefernandez@users.noreply.github.com> Date: Tue, 18 Feb 2025 10:09:04 +0100 Subject: [PATCH 2/6] CI Setup --- .github/workflows/ci.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 20d61b70e..3f068079b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,6 +13,8 @@ jobs: test: if: "!contains(github.event.head_commit.message, 'skip ci')" runs-on: ubuntu-latest + env: + JAVA_OPTS: -Xms2048M -Xmx2048M -Xss6M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8 steps: - name: Checkout project (pull-request) if: github.event_name == 'pull_request' @@ -23,10 +25,13 @@ jobs: - name: Checkout project (main) if: github.event_name == 'push' uses: actions/checkout@v2 - - name: Setup Scala - uses: olafurpg/setup-scala@v11 + - name: Setup JDK + uses: actions/setup-java@v4 with: - java-version: adopt@1.11 + distribution: temurin + java-version: 17 + cache: sbt + - uses: sbt/setup-sbt@v1 - name: Setup Ruby uses: ruby/setup-ruby@v1 with: From b2c22a7775fce206133587fa126fcd2d8845116a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fede=20Fern=C3=A1ndez?= <720923+fedefernandez@users.noreply.github.com> Date: Tue, 18 Feb 2025 10:10:14 +0100 Subject: [PATCH 3/6] Update docs.yml --- .github/workflows/docs.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 809967581..d3712a236 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -14,6 +14,8 @@ jobs: documentation: if: "!contains(github.event.head_commit.message, 'skip ci')" runs-on: ubuntu-latest + env: + JAVA_OPTS: -Xms2048M -Xmx2048M -Xss6M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8 steps: - name: Checkout project uses: actions/checkout@v2 @@ -22,10 +24,13 @@ jobs: ref: main - name: Fetch tags run: git fetch --tags - - name: Setup Scala - uses: olafurpg/setup-scala@v11 + - name: Setup JDK + uses: actions/setup-java@v4 with: - java-version: adopt@1.11 + distribution: temurin + java-version: 17 + cache: sbt + - uses: sbt/setup-sbt@v1 - name: Setup Ruby uses: ruby/setup-ruby@v1 with: From 0c5d0031e345eb425ef850feecc45db9f92ee3b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fede=20Fern=C3=A1ndez?= <720923+fedefernandez@users.noreply.github.com> Date: Tue, 18 Feb 2025 10:10:47 +0100 Subject: [PATCH 4/6] Update release.yml --- .github/workflows/release.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8634d4c67..f61dc5a6d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,6 +14,8 @@ jobs: release: if: "!contains(github.event.head_commit.message, 'skip ci')" runs-on: ubuntu-latest + env: + JAVA_OPTS: -Xms2048M -Xmx2048M -Xss6M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8 steps: - name: Checkout project uses: actions/checkout@v2 @@ -21,10 +23,14 @@ jobs: fetch-depth: 0 - name: Fetch tags run: git fetch --tags - - name: Setup Scala - uses: olafurpg/setup-scala@v11 + - uses: actions/checkout@v4 + - name: Setup JDK + uses: actions/setup-java@v4 with: - java-version: adopt@1.11 + distribution: temurin + java-version: 17 + cache: sbt + - uses: sbt/setup-sbt@v1 - name: Setup Ruby uses: ruby/setup-ruby@v1 with: From fcb30bfac5a659ee8040b2aab992f82cc4152130 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fede=20Fern=C3=A1ndez?= <720923+fedefernandez@users.noreply.github.com> Date: Tue, 18 Feb 2025 10:21:38 +0100 Subject: [PATCH 5/6] Updates to Java 23 --- .github/workflows/ci.yml | 2 +- .github/workflows/docs.yml | 2 +- .github/workflows/release.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3f068079b..2f132fd1a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: temurin - java-version: 17 + java-version: 23 cache: sbt - uses: sbt/setup-sbt@v1 - name: Setup Ruby diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index d3712a236..c55e40ef3 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -28,7 +28,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: temurin - java-version: 17 + java-version: 23 cache: sbt - uses: sbt/setup-sbt@v1 - name: Setup Ruby diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f61dc5a6d..fdacecf51 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,7 +28,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: temurin - java-version: 17 + java-version: 23 cache: sbt - uses: sbt/setup-sbt@v1 - name: Setup Ruby From 489b52d85c0cbc07a2a17500647f2ee3719c8622 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fede=20Fern=C3=A1ndez?= <720923+fedefernandez@users.noreply.github.com> Date: Tue, 18 Feb 2025 10:52:45 +0100 Subject: [PATCH 6/6] Oracle distribution --- .github/workflows/ci.yml | 2 +- .github/workflows/docs.yml | 2 +- .github/workflows/release.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2f132fd1a..e6db796a4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: - name: Setup JDK uses: actions/setup-java@v4 with: - distribution: temurin + distribution: oracle java-version: 23 cache: sbt - uses: sbt/setup-sbt@v1 diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index c55e40ef3..a476909bb 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -27,7 +27,7 @@ jobs: - name: Setup JDK uses: actions/setup-java@v4 with: - distribution: temurin + distribution: oracle java-version: 23 cache: sbt - uses: sbt/setup-sbt@v1 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fdacecf51..441af9ddc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,7 +27,7 @@ jobs: - name: Setup JDK uses: actions/setup-java@v4 with: - distribution: temurin + distribution: oracle java-version: 23 cache: sbt - uses: sbt/setup-sbt@v1