From ffb8cdd3219fe33f57fc70c98645ab9ee7580b79 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 2 Nov 2021 08:28:00 +0100 Subject: [PATCH] Update scala-library, scala-reflect to 2.13.7 --- build.sbt | 119 +++++++++++++++++++++++++----------------------------- 1 file changed, 54 insertions(+), 65 deletions(-) diff --git a/build.sbt b/build.sbt index 15f2119..2488984 100644 --- a/build.sbt +++ b/build.sbt @@ -5,70 +5,60 @@ lazy val scalacheckVersion = "1.14.3" lazy val fastparseVersion = "1.0.1" lazy val agateSettings = Seq( - organization := "com.stripe", - scalaVersion := "2.13.1", - crossScalaVersions := Seq("2.11.12", "2.12.10", "2.13.1"), - + scalaVersion := "2.13.7", + crossScalaVersions := Seq("2.11.12", "2.12.10", "2.13.7"), Global / onChangedBuildSource := ReloadOnSourceChanges, - libraryDependencies ++= "org.scala-lang" % "scala-reflect" % scalaVersion.value :: - "com.chuusai" %% "shapeless" % "2.3.3" :: - "com.stripe" %% "dagon-core" % "0.3.3" :: - "org.scalameta" %% "fastparse" % fastparseVersion :: - "com.monovore" %% "decline" % "1.0.0" :: - "org.scalacheck" %% "scalacheck" % scalacheckVersion % "test" :: - "org.typelevel" %% "claimant" % "0.1.3" % "test" :: - "org.typelevel" %% "cats-core" % "2.0.0" :: - "org.typelevel" %% "cats-effect" % "2.0.0" :: - "org.typelevel" %% "paiges-core" % "0.3.0" :: - Nil, - + "com.chuusai" %% "shapeless" % "2.3.3" :: + "com.stripe" %% "dagon-core" % "0.3.3" :: + "org.scalameta" %% "fastparse" % fastparseVersion :: + "com.monovore" %% "decline" % "1.0.0" :: + "org.scalacheck" %% "scalacheck" % scalacheckVersion % "test" :: + "org.typelevel" %% "claimant" % "0.1.3" % "test" :: + "org.typelevel" %% "cats-core" % "2.0.0" :: + "org.typelevel" %% "cats-effect" % "2.0.0" :: + "org.typelevel" %% "paiges-core" % "0.3.0" :: + Nil, // shared scalac options scalacOptions ++= options, - // per-version scalac options scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match { case Some((2, x)) if x <= 12 => - "-Xfuture" :: // Turn on future language features. - "-Xlint:by-name-right-associative" :: // By-name parameter of right associative operator. - "-Xlint:unsound-match" :: // Pattern match may not be typesafe. - "-Yno-adapted-args" :: // Do not adapt an argument list (either by inserting () or creating a tuple) to match the receiver. - "-Ypartial-unification" :: // Enable partial unification in type constructor inference - "-Ywarn-inaccessible" :: // Warn about inaccessible types in method signatures. - "-Ywarn-infer-any" :: // Warn when a type argument is inferred to be `Any`. - "-Ywarn-nullary-override" :: // Warn when non-nullary `def f()' overrides nullary `def f'. - "-Ywarn-nullary-unit" :: // Warn when nullary methods return Unit. - Nil + "-Xfuture" :: // Turn on future language features. + "-Xlint:by-name-right-associative" :: // By-name parameter of right associative operator. + "-Xlint:unsound-match" :: // Pattern match may not be typesafe. + "-Yno-adapted-args" :: // Do not adapt an argument list (either by inserting () or creating a tuple) to match the receiver. + "-Ypartial-unification" :: // Enable partial unification in type constructor inference + "-Ywarn-inaccessible" :: // Warn about inaccessible types in method signatures. + "-Ywarn-infer-any" :: // Warn when a type argument is inferred to be `Any`. + "-Ywarn-nullary-override" :: // Warn when non-nullary `def f()' overrides nullary `def f'. + "-Ywarn-nullary-unit" :: // Warn when nullary methods return Unit. + Nil case _ => Nil }), scalacOptions in (Compile, console) ~= { _.filterNot("-Xlint" == _) }, scalacOptions in (Test, console) := (scalacOptions in (Compile, console)).value, - testOptions in Test ++= Tests.Argument(TestFrameworks.ScalaCheck, "-verbosity", "1") :: - Tests.Argument(TestFrameworks.ScalaCheck, "-minSuccessfulTests", "5000") :: - Nil, - + Tests.Argument(TestFrameworks.ScalaCheck, "-minSuccessfulTests", "5000") :: + Nil, // TODO: these should go in Publish but i can't figure out how to // make that work. ugh. sorry! releaseIgnoreUntrackedFiles := true, releaseCrossBuild := true, - // ignore generated files in coverage stats coverageExcludedPackages := """onnx\.onnx\..*;onnx\.onnx_operators\..*""", - // support type lambda syntax addCompilerPlugin("org.typelevel" %% "kind-projector" % "0.10.3"), - // optimize for-comprehensions addCompilerPlugin("com.olegpy" %% "better-monadic-for" % "0.3.1"), - PB.targets in Compile := Seq( scalapb.gen() -> (sourceManaged in Compile).value - )) + ) +) lazy val agate = project .in(file(".")) @@ -105,9 +95,7 @@ lazy val docs = project .settings(name := "agate-mdoc") .settings(agateSettings: _*) .settings(Publish.skip: _*) - .settings( - mdocVariables := Map("VERSION" -> readmeVersion), - mdocOut := file(".")) + .settings(mdocVariables := Map("VERSION" -> readmeVersion), mdocOut := file(".")) .dependsOn(core) .enablePlugins(MdocPlugin) @@ -122,32 +110,33 @@ lazy val bench = project // scalac options lazy val options = Seq( - "-deprecation", // Emit warning and location for usages of deprecated APIs. - "-encoding", "utf-8", // Specify character encoding used by source files. - "-explaintypes", // Explain type errors in more detail. - "-feature", // Emit warning and location for usages of features that should be imported explicitly. - "-language:existentials", // Existential types (besides wildcard types) can be written and inferred - "-language:experimental.macros", // Allow macro definition (besides implementation and application) - "-language:higherKinds", // Allow higher-kinded types - "-language:implicitConversions", // Allow definition of implicit functions called views - "-unchecked", // Enable additional warnings where generated code depends on assumptions. - "-Xcheckinit", // Wrap field accessors to throw an exception on uninitialized access. - "-Xfatal-warnings", // Fail the compilation if there are any warnings. - "-Xlint:adapted-args", // Warn if an argument list is modified to match the receiver. + "-deprecation", // Emit warning and location for usages of deprecated APIs. + "-encoding", + "utf-8", // Specify character encoding used by source files. + "-explaintypes", // Explain type errors in more detail. + "-feature", // Emit warning and location for usages of features that should be imported explicitly. + "-language:existentials", // Existential types (besides wildcard types) can be written and inferred + "-language:experimental.macros", // Allow macro definition (besides implementation and application) + "-language:higherKinds", // Allow higher-kinded types + "-language:implicitConversions", // Allow definition of implicit functions called views + "-unchecked", // Enable additional warnings where generated code depends on assumptions. + "-Xcheckinit", // Wrap field accessors to throw an exception on uninitialized access. + "-Xfatal-warnings", // Fail the compilation if there are any warnings. + "-Xlint:adapted-args", // Warn if an argument list is modified to match the receiver. //"-Xlint:constant", // Evaluation of a constant arithmetic expression results in an error. - "-Xlint:delayedinit-select", // Selecting member of DelayedInit. - "-Xlint:doc-detached", // A Scaladoc comment appears to be detached from its element. - "-Xlint:inaccessible", // Warn about inaccessible types in method signatures. - "-Xlint:infer-any", // Warn when a type argument is inferred to be `Any`. - "-Xlint:missing-interpolator", // A string literal appears to be missing an interpolator id. - "-Xlint:nullary-override", // Warn when non-nullary `def f()' overrides nullary `def f'. - "-Xlint:nullary-unit", // Warn when nullary methods return Unit. - "-Xlint:option-implicit", // Option.apply used implicit view. - "-Xlint:package-object-classes", // Class or object defined in package object. - "-Xlint:poly-implicit-overload", // Parameterized overloaded implicit methods are not visible as view bounds. - "-Xlint:private-shadow", // A private field (or class parameter) shadows a superclass field. - "-Xlint:stars-align", // Pattern sequence wildcard must align with sequence component. - "-Xlint:type-parameter-shadow", // A local type parameter shadows a type already in scope. + "-Xlint:delayedinit-select", // Selecting member of DelayedInit. + "-Xlint:doc-detached", // A Scaladoc comment appears to be detached from its element. + "-Xlint:inaccessible", // Warn about inaccessible types in method signatures. + "-Xlint:infer-any", // Warn when a type argument is inferred to be `Any`. + "-Xlint:missing-interpolator", // A string literal appears to be missing an interpolator id. + "-Xlint:nullary-override", // Warn when non-nullary `def f()' overrides nullary `def f'. + "-Xlint:nullary-unit", // Warn when nullary methods return Unit. + "-Xlint:option-implicit", // Option.apply used implicit view. + "-Xlint:package-object-classes", // Class or object defined in package object. + "-Xlint:poly-implicit-overload", // Parameterized overloaded implicit methods are not visible as view bounds. + "-Xlint:private-shadow", // A private field (or class parameter) shadows a superclass field. + "-Xlint:stars-align", // Pattern sequence wildcard must align with sequence component. + "-Xlint:type-parameter-shadow", // A local type parameter shadows a type already in scope. //"-Ywarn-dead-code", // Warn when dead code is identified. //"-Ywarn-extra-implicit", // Warn when more than one implicit parameter section is defined. //"-Ywarn-numeric-widen", // Warn when numerics are widened. @@ -158,5 +147,5 @@ lazy val options = Seq( //"-Ywarn-unused:patvars", // Warn if a variable bound in a pattern is unused. //"-Ywarn-unused:privates", // Warn if a private member is unused. //"-Ywarn-unused-imports", // Warn if an import selector is not referenced. - "-Ywarn-value-discard" // Warn when non-Unit expression results are unused. + "-Ywarn-value-discard" // Warn when non-Unit expression results are unused. )