Merge pull request #46 from guardian/mc/upgrade-brotli4j

Upgrade brotli4j
guardian · Jan 15, 2025 · 72aa341 · 72aa341
2 parents d3d97fb + 61d2ac5
commit 72aa341
Show file tree

Hide file tree

Showing 17 changed files with 16 additions and 14 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -26,11 +26,14 @@ jobs:
           distribution: 'adopt'
           java-version: ${{ matrix.java }}
           cache: 'sbt'
-          
+
       - name: Setup SBT
-        if: matrix.os == 'macos-14' || matrix.os == 'macos-latest'
+        uses: sbt/setup-sbt@v1
+
+      - name: Set local hostname
+        if: runner.os == 'macOS'
         run: |
-          brew install sbt
+          sudo scutil --set HostName $(scutil --get LocalHostName)
 
       - name: Build
         run: |

diff --git a/.github/workflows/sbt-dependency-graph.yaml b/.github/workflows/sbt-dependency-graph.yaml
@@ -3,18 +3,17 @@ on:
   push:
     branches:
       - main
-      - sbt-dependency-graph-da246ccca8770ea4
   workflow_dispatch: 
 jobs:
   dependency-graph:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout branch
         id: checkout
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@v4
       - name: Submit dependencies
         id: submit
-        uses: scalacenter/sbt-dependency-submission@7ebd561e5280336d3d5b445a59013810ff79325e # v3.0.1
+        uses: scalacenter/sbt-dependency-submission@v3
       - name: Log snapshot for user validation
         id: validate
         run: cat ${{ steps.submit.outputs.snapshot-json-path }} | jq

diff --git a/build.sbt b/build.sbt
@@ -21,7 +21,7 @@ lazy val sharedSettings = Seq(
   publishConfiguration := publishConfiguration.value.withOverwrite(true)
 )
 
-val Brotli4jVersion = "1.17.0"
+val Brotli4jVersion = "1.18.0"
 lazy val common = project
   .settings(
     name:="brotli4s",
@@ -146,9 +146,9 @@ lazy val `play-v29` = project
     description := "A brotli filter module for Play 2.9",
     crossScalaVersions := Seq(Scala213, Scala3),
     libraryDependencies ++= Seq( 
-      "com.typesafe.play" %% "play" % "2.9.5" % Provided,
+      "com.typesafe.play" %% "play" % "2.9.6" % Provided,
       "com.typesafe.play" %% "filters-helpers" % "2.9.0-M6" % Test,
-      "com.typesafe.play" %% "play-specs2" % "2.9.5" % Test,
+      "com.typesafe.play" %% "play-specs2" % "2.9.6" % Test,
     ),
 
     artifactPomMetadataSettings
@@ -162,9 +162,9 @@ lazy val `play-v29` = project
     description := "A brotli filter module for Play 3",
     crossScalaVersions := Seq(Scala213, Scala3),
     libraryDependencies ++= Seq( 
-      "org.playframework" %% "play" % "3.0.5" % Provided,
-      "org.playframework" %% "play-filters-helpers" % "3.0.5" % Test,
-      "org.playframework" %% "play-specs2" % "3.0.5" % Test,
+      "org.playframework" %% "play" % "3.0.6" % Provided,
+      "org.playframework" %% "play-filters-helpers" % "3.0.6" % Test,
+      "org.playframework" %% "play-specs2" % "3.0.6" % Test,
     ),
 
     artifactPomMetadataSettings

diff --git a/common/lib/native-linux-aarch64-1.17.0.jar → common/lib/native-linux-aarch64-1.18.0.jar b/common/lib/native-linux-aarch64-1.17.0.jar → common/lib/native-linux-aarch64-1.18.0.jar
diff --git a/common/lib/native-linux-armv7-1.17.0.jar → common/lib/native-linux-armv7-1.18.0.jar b/common/lib/native-linux-armv7-1.17.0.jar → common/lib/native-linux-armv7-1.18.0.jar
diff --git a/common/lib/native-linux-ppc64le-1.17.0.jar → common/lib/native-linux-ppc64le-1.18.0.jar b/common/lib/native-linux-ppc64le-1.17.0.jar → common/lib/native-linux-ppc64le-1.18.0.jar
diff --git a/common/lib/native-linux-riscv64-1.17.0.jar → common/lib/native-linux-riscv64-1.18.0.jar b/common/lib/native-linux-riscv64-1.17.0.jar → common/lib/native-linux-riscv64-1.18.0.jar
diff --git a/common/lib/native-linux-s390x-1.17.0.jar → common/lib/native-linux-s390x-1.18.0.jar b/common/lib/native-linux-s390x-1.17.0.jar → common/lib/native-linux-s390x-1.18.0.jar
diff --git a/common/lib/native-linux-x86_64-1.17.0.jar → common/lib/native-linux-x86_64-1.18.0.jar b/common/lib/native-linux-x86_64-1.17.0.jar → common/lib/native-linux-x86_64-1.18.0.jar
diff --git a/common/lib/native-osx-aarch64-1.17.0.jar → common/lib/native-osx-aarch64-1.18.0.jar b/common/lib/native-osx-aarch64-1.17.0.jar → common/lib/native-osx-aarch64-1.18.0.jar
diff --git a/common/lib/native-osx-x86_64-1.17.0.jar → common/lib/native-osx-x86_64-1.18.0.jar b/common/lib/native-osx-x86_64-1.17.0.jar → common/lib/native-osx-x86_64-1.18.0.jar
diff --git a/common/lib/native-windows-aarch64-1.17.0.jar b/common/lib/native-windows-aarch64-1.17.0.jar
diff --git a/common/lib/native-windows-aarch64-1.18.0.jar b/common/lib/native-windows-aarch64-1.18.0.jar
diff --git a/common/lib/native-windows-x86_64-1.17.0.jar b/common/lib/native-windows-x86_64-1.17.0.jar
diff --git a/common/lib/native-windows-x86_64-1.18.0.jar b/common/lib/native-windows-x86_64-1.18.0.jar
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.10.4
+sbt.version=1.10.7
diff --git a/scripts/update-lib.sh b/scripts/update-lib.sh
@@ -2,7 +2,7 @@
 
 cd ../common/lib/
 
-version='1.17.0'
+version='1.18.0'
 
 for platform in 'native-osx-aarch64' \
                 'native-osx-x86_64' \