Skip to content

Update scalafmt-core to 2.7.5 #93

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
merged 2 commits into from
Nov 12, 2021
Merged

Update scalafmt-core to 2.7.5 #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e9f999
Update scalafmt-core to 2.7.5
scala-steward Nov 4, 2021
e967eb7
Reformat with scalafmt 2.7.5
scala-steward Nov 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .scalafmt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version = "2.2.2"
version = "2.7.5"
maxColumn = 120
60 changes: 31 additions & 29 deletions src/main/scala/com/thoughtworks/sbtScalaJsMap/ScalaJsMap.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ object ScalaJsMap extends AutoPlugin {
val isLatestSourcePushed =
settingKey[Boolean]("Determine if the latest source files have been pushed to the remote git repository.")
val scalaJsMapToGithubScalacOptions = settingKey[Seq[String]](
"The scalac options to create Scala.js source map to the corresponding Github URI if any.")
"The scalac options to create Scala.js source map to the corresponding Github URI if any."
)

}

Expand Down Expand Up @@ -68,11 +69,12 @@ object ScalaJsMap extends AutoPlugin {
scalaJsMapToGithubScalacOptions ++= {
val repositoryBuilder = new FileRepositoryBuilder().findGitDir(sourceDirectory.value)
val repository = repositoryBuilder.build()
val head = try {
repository.resolve(HEAD)
} finally {
repository.close()
}
val head =
try {
repository.resolve(HEAD)
} finally {
repository.close()
}
if (repositoryBuilder.getGitDir == null) {
None
} else {
Expand All @@ -91,39 +93,39 @@ object ScalaJsMap extends AutoPlugin {
isLatestSourcePushed := {
def isCi = sys.env.contains("CI")
def isLatestSourcePushedFromWorkTree = {
val repositoryBuilder = new FileRepositoryBuilder().findGitDir(sourceDirectory.value)
if (repositoryBuilder.getGitDir == null) {
false
} else {
val repository = repositoryBuilder.build()
try {
val git = new Git(repository)
val repositoryBuilder = new FileRepositoryBuilder().findGitDir(sourceDirectory.value)
if (repositoryBuilder.getGitDir == null) {
false
} else {
val repository = repositoryBuilder.build()
try {
val git = new Git(repository)
try {
def isClean = git.status().call().isClean
def unreachableOriginBranches = {
val head = repository.resolve(HEAD)
val revWalk = new RevWalk(repository)
val head = repository.resolve(HEAD)
val revWalk = new RevWalk(repository)
try {
RevWalkUtils
.findBranchesReachableFrom(
revWalk.lookupCommit(head),
revWalk,
repository.getRefDatabase.getRefsByPrefix(s"$R_REMOTES$DEFAULT_REMOTE_NAME/")
)
.isEmpty
} finally {
revWalk.close()
RevWalkUtils
.findBranchesReachableFrom(
revWalk.lookupCommit(head),
revWalk,
repository.getRefDatabase.getRefsByPrefix(s"$R_REMOTES$DEFAULT_REMOTE_NAME/")
)
.isEmpty
} finally {
revWalk.close()
}
}
}
isClean && !unreachableOriginBranches
} finally {
git.close()
}
} finally {
git.close()
repository.close()
}
} finally {
repository.close()
}
}
}
isCi || isLatestSourcePushedFromWorkTree
},
scalacOptions ++= {
Expand Down