Skip to content

Commit cdc861c

Browse files
authored
Merge pull request #185 from ThoughtWorksInc/update/master/scalafmt-core-3.7.9
Update scalafmt-core to 3.7.9 in master
2 parents b158275 + 54668a2 commit cdc861c

File tree

3 files changed

+21
-8
lines changed

3 files changed

+21
-8
lines changed

.git-blame-ignore-revs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
# Scala Steward: Reformat with scalafmt 3.1.2
22
fb6cfb8aea15a1b339e3ed69e1e96acd7df4cae6
3+
4+
# Scala Steward: Reformat with scalafmt 3.7.9
5+
8ff009734ef47bf27bc49adac25fab17b41d4f5d

.scalafmt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
runner.dialect = scala212source3
2-
version = "3.7.5"
2+
version = "3.7.9"
33
maxColumn = 80

src/main/scala/com/thoughtworks/sbtScalaJsMap/ScalaJsMap.scala

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,12 @@ object ScalaJsMap extends AutoPlugin {
3535

3636
object autoImport {
3737

38-
val gitRemoteUris = settingKey[Seq[URIish]]("The remote git URIs to host the source code.")
38+
val gitRemoteUris =
39+
settingKey[Seq[URIish]]("The remote git URIs to host the source code.")
3940
val isLatestSourcePushed =
40-
settingKey[Boolean]("Determine if the latest source files have been pushed to the remote git repository.")
41+
settingKey[Boolean](
42+
"Determine if the latest source files have been pushed to the remote git repository."
43+
)
4144
val scalaJsMapToGithubScalacOptions = settingKey[Seq[String]](
4245
"The scalac options to create Scala.js source map to the corresponding Github URI if any."
4346
)
@@ -54,20 +57,25 @@ object ScalaJsMap extends AutoPlugin {
5457
override final def projectSettings =
5558
Seq(
5659
gitRemoteUris ++= {
57-
val repositoryBuilder = new FileRepositoryBuilder().findGitDir(sourceDirectory.value)
60+
val repositoryBuilder =
61+
new FileRepositoryBuilder().findGitDir(sourceDirectory.value)
5862
if (repositoryBuilder.getGitDir == null) {
5963
Seq.empty
6064
} else {
6165
val repository = repositoryBuilder.build()
6266
try {
63-
new RemoteConfig(repository.getConfig, DEFAULT_REMOTE_NAME).getURIs.asScala
67+
new RemoteConfig(
68+
repository.getConfig,
69+
DEFAULT_REMOTE_NAME
70+
).getURIs.asScala
6471
} finally {
6572
repository.close()
6673
}
6774
}
6875
},
6976
scalaJsMapToGithubScalacOptions ++= {
70-
val repositoryBuilder = new FileRepositoryBuilder().findGitDir(sourceDirectory.value)
77+
val repositoryBuilder =
78+
new FileRepositoryBuilder().findGitDir(sourceDirectory.value)
7179
val repository = repositoryBuilder.build()
7280
val head =
7381
try {
@@ -99,7 +107,8 @@ object ScalaJsMap extends AutoPlugin {
99107
isLatestSourcePushed := {
100108
def isCi = sys.env.contains("CI")
101109
def isLatestSourcePushedFromWorkTree = {
102-
val repositoryBuilder = new FileRepositoryBuilder().findGitDir(sourceDirectory.value)
110+
val repositoryBuilder =
111+
new FileRepositoryBuilder().findGitDir(sourceDirectory.value)
103112
if (repositoryBuilder.getGitDir == null) {
104113
false
105114
} else {
@@ -116,7 +125,8 @@ object ScalaJsMap extends AutoPlugin {
116125
.findBranchesReachableFrom(
117126
revWalk.lookupCommit(head),
118127
revWalk,
119-
repository.getRefDatabase.getRefsByPrefix(s"$R_REMOTES$DEFAULT_REMOTE_NAME/")
128+
repository.getRefDatabase
129+
.getRefsByPrefix(s"$R_REMOTES$DEFAULT_REMOTE_NAME/")
120130
)
121131
.isEmpty
122132
} finally {

0 commit comments

Comments
 (0)