File tree Expand file tree Collapse file tree 4 files changed +21
-3
lines changed
src/main/scala/com/sourcegraph/sbtsourcegraph Expand file tree Collapse file tree 4 files changed +21
-3
lines changed Original file line number Diff line number Diff line change 16
16
steps :
17
17
- uses : actions/checkout@v2
18
18
- uses : olafurpg/setup-scala@v13
19
- - run : sbt scalafmtCheckAll scalafmtSbtCheck "scalafixAll --check"
19
+ - run : sbt checkAll
Original file line number Diff line number Diff line change @@ -25,6 +25,18 @@ developers := List(
25
25
)
26
26
)
27
27
28
+ commands +=
29
+ Command .command(" fixAll" ) { s =>
30
+ " scalafixAll" :: " scalafmtAll" :: " scalafmtSbt" :: s
31
+ }
32
+
33
+ commands +=
34
+ Command .command(" checkAll" ) { s =>
35
+ " scalafmtCheckAll" :: " scalafmtSbtCheck" ::
36
+ " scalafixAll --check" :: " publishLocal" ::
37
+ s
38
+ }
39
+
28
40
// Cross-building settings (see https://github.com/sbt/sbt/issues/3473#issuecomment-325729747)
29
41
def scala212 = " 2.12.13"
30
42
def scala210 = " 2.10.7"
Original file line number Diff line number Diff line change @@ -22,6 +22,8 @@ object SourcegraphPlugin extends AutoPlugin {
22
22
taskKey[File ](
23
23
" Task to generate a single LSIF index for all SemanticDB files in this workspace."
24
24
)
25
+ val sourcegraphLsifJavaVersion : SettingKey [String ] =
26
+ settingKey[String ](" The version of the `lsif-java` command-line tool." )
25
27
val sourcegraphSemanticdbDirectories : TaskKey [List [File ]] =
26
28
taskKey[List [File ]](
27
29
" Task to compile all projects in this build and aggregate all SemanticDB directories."
@@ -69,6 +71,10 @@ object SourcegraphPlugin extends AutoPlugin {
69
71
import autoImport ._
70
72
71
73
override lazy val buildSettings : Seq [Def .Setting [_]] = List (
74
+ sourcegraphLsifJavaVersion := {
75
+ scala.util.Properties
76
+ .propOrElse(" lsif-java-version" , Versions .semanticdbJavacVersion())
77
+ },
72
78
sourcegraphLsif := {
73
79
val out = target.in(Sourcegraph ).value / " dump.lsif"
74
80
out.getParentFile.mkdirs()
@@ -87,7 +93,7 @@ object SourcegraphPlugin extends AutoPlugin {
87
93
sourcegraphCoursierBinary.value ::
88
94
" launch" ::
89
95
" --contrib" ::
90
- " lsif-java" ::
96
+ s " lsif-java: ${sourcegraphLsifJavaVersion.value} " ::
91
97
" --" ::
92
98
" index-semanticdb" ::
93
99
s " --output= $out" ::
Original file line number Diff line number Diff line change @@ -25,7 +25,7 @@ object Versions {
25
25
props.asScala.toMap
26
26
} else {
27
27
Map (
28
- semanticdbJavacKey -> " 0.6.2 " ,
28
+ semanticdbJavacKey -> " 0.6.3 " ,
29
29
" 2.12.12" -> scalametaVersion,
30
30
" 2.13.6" -> scalametaVersion,
31
31
" 2.11.12" -> scalametaVersion
You can’t perform that action at this time.
0 commit comments