Skip to content

Poor Man's MiMa #471

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
japgolly merged 11 commits into from
Aug 12, 2021
Merged

Poor Man's MiMa #471

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
31b8a81
Ignore .sbtboot
japgolly Aug 10, 2021
293419b
Get local scalafix working
japgolly Aug 10, 2021
84ff47e
Generate an api.txt report on compile
japgolly Aug 10, 2021
31ef32e
Tidy up
japgolly Aug 10, 2021
978e4a5
Make work on all versions of Scala
japgolly Aug 11, 2021
804c11b
Validate API reports are up-to-date in CI
japgolly Aug 11, 2021
0548f7f
CI: Only run api report validation where it makes sense
japgolly Aug 11, 2021
90622a5
Restore missing package objects in api report
japgolly Aug 11, 2021
fb7ecc2
Add a `prePR` sbt command and remove scalafix on compile
japgolly Aug 12, 2021
3744649
Add a PR template instructing users to run prePR
japgolly Aug 12, 2021
69df48c
CI: Add temporary hack for Scala 2.10
japgolly Aug 12, 2021
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Tidy up
  • Loading branch information
@japgolly
japgolly committed Aug 12, 2021
commit 31ef32eb0e06b2815f5a110308a35fbc35af11c5
20 changes: 8 additions & 12 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
import _root_.scalafix.sbt.BuildInfo.scalafixVersion
import scalatex.ScalatexReadme

ThisBuild / shellPrompt := ((s: State) => Project.extract(s).currentRef.project + "> ")

lazy val scalafixRules = project
.in(file("scalafix"))
.settings(
libraryDependencies += "ch.epfl.scala" %% "scalafix-core" % scalafixVersion,
)

lazy val root = project
.in(file("."))
.enablePlugins(ScalaJSPlugin)
Expand All @@ -15,8 +22,7 @@ ThisBuild / crossScalaVersions := {
if (scalaJSVersion.startsWith("1.")) Seq("2.12.10", "2.11.12", "2.13.1")
else Seq("2.12.10", "2.11.12", "2.10.7", "2.13.1")
}
// ThisBuild / scalaVersion := crossScalaVersions.value.head
ThisBuild / scalaVersion := "2.13.1"
ThisBuild / scalaVersion := crossScalaVersions.value.head

val commonSettings = Seq(
organization := "org.scala-js",
Expand Down Expand Up @@ -117,13 +123,3 @@ lazy val example = project.
settings(commonSettings: _*).
settings(noPublishSettings: _*).
dependsOn(root)


import _root_.scalafix.sbt.BuildInfo.scalafixVersion

lazy val scalafixRules = project
.in(file("scalafix"))
.enablePlugins(ScalaJSPlugin)
.settings(
libraryDependencies += "ch.epfl.scala" %% "scalafix-core" % scalafixVersion,
)
2 changes: 1 addition & 1 deletion scalafix.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ThisBuild / semanticdbEnabled := true
ThisBuild / semanticdbVersion := "4.4.26"
ThisBuild / semanticdbVersion := "4.4.27"
ThisBuild / scalafixScalaBinaryVersion := CrossVersion.binaryScalaVersion(scalaVersion.value)

ThisBuild / scalacOptions ++= {
Expand Down
7 changes: 2 additions & 5 deletions scalafix/src/main/scala/org/scalajs/dom/scalafix/GenerateApiReport.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ class GenerateApiReport extends SemanticRule("GenerateApiReport") {
override def fix(implicit doc: SemanticDocument): Patch = {

doc.tree.traverse {
// case a: Defn.Object if a.name.value.contains("AesCbcParams") => process(a.symbol, a.templ, ScopeType.Object)

case a: Defn.Class => process(a.symbol, a.templ, ScopeType.Class)
case a: Defn.Object => process(a.symbol, a.templ, ScopeType.Object)
case a: Defn.Trait => process(a.symbol, a.templ, ScopeType.Trait)
Expand All @@ -28,7 +26,7 @@ class GenerateApiReport extends SemanticRule("GenerateApiReport") {
}

private def process(sym: Symbol, body: Template, typ: ScopeType)(implicit doc: SemanticDocument): Unit = {
// Skip non-public API
// Skip non-public scopes
if (!sym.info.get.isPublic)
return

Expand All @@ -38,8 +36,7 @@ class GenerateApiReport extends SemanticRule("GenerateApiReport") {
val s = state.register(sym, isJsType, typ, domParents)

def letsSeeHowLazyWeCanBeLol(t: Tree): Unit = {

// Skip non-public API
// Skip non-public members
if (!t.symbol.info.get.isPublic)
return

Expand Down