diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 233da4ea..5b6ba546 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.12] + scala: [2.13.13] java: [temurin@11] runs-on: ${{ matrix.os }} steps: @@ -86,7 +86,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.12] + scala: [2.13.13] java: [temurin@11] runs-on: ${{ matrix.os }} steps: @@ -103,12 +103,12 @@ jobs: java-version: 11 cache: sbt - - name: Download target directories (2.13.12) + - name: Download target directories (2.13.13) uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-2.13.12-${{ matrix.java }} + name: target-${{ matrix.os }}-2.13.13-${{ matrix.java }} - - name: Inflate target directories (2.13.12) + - name: Inflate target directories (2.13.13) run: | tar xf targets.tar rm targets.tar diff --git a/build.sbt b/build.sbt index 9f11d5a3..be55b7c9 100644 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,7 @@ import com.jsuereth.sbtpgp.PgpKeys.publishSigned import com.lightbend.paradox.apidoc.ApidocPlugin.autoImport.apidocRootPackage -val scala213 = "2.13.12" +val scala213 = "2.13.13" ThisBuild / scalaVersion := scala213 ThisBuild / organization := "aiven.io" diff --git a/core-backup/src/test/scala/io/aiven/guardian/kafka/backup/BackupClientInterfaceTest.scala b/core-backup/src/test/scala/io/aiven/guardian/kafka/backup/BackupClientInterfaceTest.scala index dec98829..0374343c 100644 --- a/core-backup/src/test/scala/io/aiven/guardian/kafka/backup/BackupClientInterfaceTest.scala +++ b/core-backup/src/test/scala/io/aiven/guardian/kafka/backup/BackupClientInterfaceTest.scala @@ -86,14 +86,14 @@ trait BackupClientInterfaceTest if (allBoundariesWithoutMiddles.length > 1) { @nowarn("msg=not.*?exhaustive") val withBeforeAndAfter = - allBoundariesWithoutMiddles.sliding(2).map { case Seq(before, after) => (before, after) }.toList + allBoundariesWithoutMiddles.sliding(2).map { case Seq(first, second) => (first, second) }.toList val initialTime = kafkaDataWithTimePeriod.data.head.timestamp - Inspectors.forEvery(withBeforeAndAfter) { case (before, after) => + Inspectors.forEvery(withBeforeAndAfter) { case (first, second) => val periodAsMillis = kafkaDataWithTimePeriod.periodSlice.toMillis - ((before.reducedConsumerRecord.timestamp - initialTime) / periodAsMillis) mustNot equal( - (after.reducedConsumerRecord.timestamp - initialTime) / periodAsMillis + ((first.reducedConsumerRecord.timestamp - initialTime) / periodAsMillis) mustNot equal( + (second.reducedConsumerRecord.timestamp - initialTime) / periodAsMillis ) } } @@ -113,14 +113,14 @@ trait BackupClientInterfaceTest val allCoupledMiddles = result .sliding(2) - .collect { case Seq(before: mock.Element, after: mock.Element) => - (before, after) + .collect { case Seq(first: mock.Element, second: mock.Element) => + (first, second) } .toList - Inspectors.forEvery(allCoupledMiddles) { case (before, after) => - ChronoUnit.MICROS.between(before.reducedConsumerRecord.toOffsetDateTime, - after.reducedConsumerRecord.toOffsetDateTime + Inspectors.forEvery(allCoupledMiddles) { case (first, second) => + ChronoUnit.MICROS.between(first.reducedConsumerRecord.toOffsetDateTime, + second.reducedConsumerRecord.toOffsetDateTime ) must be < kafkaDataWithTimePeriod.periodSlice.toMicros } }