diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 33af699..adaed0e 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -1,2 +1,5 @@ # update scalafmt 3d5ca44d66c77a46770a65a895c9737c542690f6 + +# Scala Steward: Reformat with scalafmt 3.8.2 +f1360f44c61f8e12666965c10e79f11cd75d6d30 diff --git a/.scalafmt.conf b/.scalafmt.conf index d6d5ee1..5157e41 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.8.1" +version = "3.8.2" project.git = true maxColumn = 120 diff --git a/build.sbt b/build.sbt index c506f64..db62f42 100644 --- a/build.sbt +++ b/build.sbt @@ -37,7 +37,10 @@ "org.apache.commons" % "commons-email" % "1.6.0", "commons-net" % "commons-net" % "3.11.1", "org.apache.httpcomponents" % "httpclient" % "4.5.14", - "org.apache.sshd" % "apache-sshd" % "2.12.1" exclude ("org.slf4j", "slf4j-jdk14") exclude ("org.apache.sshd", "sshd-mina") exclude ("org.apache.sshd", "sshd-netty"), + "org.apache.sshd" % "apache-sshd" % "2.12.1" exclude ("org.slf4j", "slf4j-jdk14") exclude ( + "org.apache.sshd", + "sshd-mina" + ) exclude ("org.apache.sshd", "sshd-netty"), "org.apache.tika" % "tika-core" % "2.9.2", "com.github.takezoe" %% "blocking-slick" % "0.0.14", "com.novell.ldap" % "jldap" % "2009-10-07", @@ -152,8 +155,11 @@ // include jetty classes val jettyJars = Keys.update.value select configurationFilter(name = ExecutableConfig.name) jettyJars foreach { jar => - IO unzip (jar, temp, (name: String) => - (name startsWith "javax/") || (name startsWith "org/") || (name startsWith "META-INF/services/")) + IO unzip ( + jar, + temp, + (name: String) => (name startsWith "javax/") || (name startsWith "org/") || (name startsWith "META-INF/services/") + ) } // include original war file diff --git a/src/main/scala/gitbucket/core/util/JGitUtil.scala b/src/main/scala/gitbucket/core/util/JGitUtil.scala index 9affb3e..4d080f9 100644 --- a/src/main/scala/gitbucket/core/util/JGitUtil.scala +++ b/src/main/scala/gitbucket/core/util/JGitUtil.scala @@ -502,9 +502,15 @@ val linkUrl = if (treeWalk.getFileMode(0) == FileMode.GITLINK) { getSubmodules(git, revCommit.getTree, baseUrl).find(_.path == treeWalk.getPathString).map(_.viewerUrl) } else None - fileList +:= (treeWalk.getObjectId(0), treeWalk.getFileMode( - 0 - ), treeWalk.getNameString, treeWalk.getPathString, linkUrl) + fileList +:= ( + treeWalk.getObjectId(0), + treeWalk.getFileMode( + 0 + ), + treeWalk.getNameString, + treeWalk.getPathString, + linkUrl + ) } }