Skip to content

Commit

Permalink
Update deps (#271)
Browse files Browse the repository at this point in the history
  • Loading branch information
mschuwalow authored Mar 10, 2024
1 parent ed103ab commit 7c06839
Show file tree
Hide file tree
Showing 9 changed files with 58 additions and 82 deletions.
20 changes: 0 additions & 20 deletions .github/workflows/auto-approve.yml

This file was deleted.

17 changes: 0 additions & 17 deletions .github/workflows/automerge.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
fail-fast: false
matrix:
java: ['17']
scala: ['2.12.17', '2.13.10', '3.3.3']
scala: ['2.12.19', '2.13.13', '3.3.3']
steps:
- name: Checkout current branch
uses: actions/[email protected]
Expand All @@ -63,7 +63,7 @@ jobs:
fail-fast: false
matrix:
java: ['8', '11', '17']
scala: ['2.12.17', '2.13.10', '3.3.3']
scala: ['2.12.19', '2.13.13', '3.3.3']
steps:
- name: Checkout current branch
uses: actions/[email protected]
Expand Down
46 changes: 46 additions & 0 deletions .github/workflows/label-pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
name: Label PR

on:
pull_request_target: {}

jobs:
update-pr-labels:
runs-on: ubuntu-latest
permissions:
contents: read
pull-requests: write
outputs:
labels: ${{ steps.get-pr-labels.outputs.value }}
env:
PR_URL: ${{github.event.pull_request.html_url}}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
steps:
- uses: srvaroa/labeler@v1
- run: gh pr view --json labels $PR_URL > pr-labels.json
- id: get-pr-labels
uses: sergeysova/jq-action@v2
with:
cmd: cat pr-labels.json | jq -c '.labels | map(.name)'

auto-approve:
needs: update-pr-labels
runs-on: ubuntu-latest
if: contains(fromJSON(needs.update-pr-labels.outputs.labels), 'auto-approve')
permissions:
pull-requests: write
steps:
- uses: hmarr/auto-approve-action@v3
with:
github-token: ${{ secrets.GITHUB_TOKEN }}

enable-auto-merge:
needs: update-pr-labels
runs-on: ubuntu-latest
if: contains(fromJSON(needs.update-pr-labels.outputs.labels), 'automerge')
permissions:
contents: write
steps:
- run: gh pr merge --merge --auto "$PR_URL"
env:
PR_URL: ${{github.event.pull_request.html_url}}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
15 changes: 0 additions & 15 deletions .github/workflows/pr-labeler.yml

This file was deleted.

25 changes: 6 additions & 19 deletions project/BuildHelper.scala
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import Keys._
import sbtbuildinfo._
import BuildInfoKeys._
import scalafix.sbt.ScalafixPlugin.autoImport._
import Dependencies.{silencerVersion, organizeImportsVersion}

object BuildHelper {
private val versions: Map[String, String] = {
Expand Down Expand Up @@ -39,25 +38,13 @@ object BuildHelper {
crossScalaVersions := List(Scala212, Scala213, Scala3),
ThisBuild / scalaVersion := defaultScalaVersion,
scalacOptions := stdOptions ++ extraOptions(scalaVersion.value, optimize = !isSnapshot.value),
libraryDependencies ++= {
if (scalaVersion.value == Scala3)
Seq(
"com.github.ghik" % s"silencer-lib_$Scala213" % silencerVersion % Provided
)
else
Seq(
"com.github.ghik" % "silencer-lib" % silencerVersion % Provided cross CrossVersion.full,
compilerPlugin("com.github.ghik" % "silencer-plugin" % silencerVersion cross CrossVersion.full)
)
},
semanticdbEnabled := scalaVersion.value == defaultScalaVersion,
semanticdbEnabled := scalaVersion.value == defaultScalaVersion,
semanticdbOptions ++= (if (scalaVersion.value != Scala3) List("-P:semanticdb:synthetics:on") else Nil),
semanticdbVersion := scalafixSemanticdb.revision,
ThisBuild / scalafixScalaBinaryVersion := CrossVersion.binaryScalaVersion(scalaVersion.value),
ThisBuild / scalafixDependencies += "com.github.liancheng" %% "organize-imports" % organizeImportsVersion,
Compile / fork := true,
Test / fork := true,
Test / parallelExecution := true,
semanticdbVersion := scalafixSemanticdb.revision,
ThisBuild / scalafixScalaBinaryVersion := CrossVersion.binaryScalaVersion(scalaVersion.value),
Compile / fork := true,
Test / fork := true,
Test / parallelExecution := true,
incOptions ~= (_.withLogRecompileOnMacro(false)),
autoAPIMappings := true,
buildInfoKeys := Seq[BuildInfoKey](organization, moduleName, name, version, scalaVersion, sbtVersion, isSnapshot),
Expand Down
4 changes: 1 addition & 3 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
object Dependencies {
val collectionCompatVersion = "2.11.0"
val jmhVersion = "1.36"
val organizeImportsVersion = "0.6.0"
val silencerVersion = "1.17.13"
val zioVersion = "2.0.14"
val zioVersion = "2.0.21"
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@

package zio.profiling.causal

import com.github.ghik.silencer.silent

import java.util.concurrent.ConcurrentHashMap
import scala.jdk.CollectionConverters._

Expand Down Expand Up @@ -57,7 +55,6 @@ final private class Experiment(
()
}

@silent("JavaConverters")
def toResult(): ExperimentResult =
ExperimentResult(
candidate,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ private[causal] object FiberState {
val state = new FiberState(
new AtomicLong(inheritedDelay),
CostCenter.getCurrentUnsafe(fiber),
true,
false,
false,
running = true,
lastEffectWasStateful = false,
inAsync = false,
0
)
state
Expand Down

0 comments on commit 7c06839

Please sign in to comment.