File tree 5 files changed +31
-11
lines changed
5 files changed +31
-11
lines changed Original file line number Diff line number Diff line change @@ -54,17 +54,24 @@ matrix:
54
54
# | oraclejdk8 | 2.13.0-M4 | jvm | | |
55
55
# | oraclejdk8 | 2.13.0-M4 | js | 0.6.23 | |
56
56
# | oraclejdk8 | 2.12.6 | jvm | | true |
57
-
57
+
58
58
before_script : ./checkCLA.sh
59
59
script :
60
60
- java -version
61
61
- admin/build.sh
62
62
63
- before_cache :
64
- - find $HOME/.sbt -name "*.lock" | xargs rm
65
- - find $HOME/.ivy2/cache -name "ivydata-*.properties" | xargs rm
66
63
cache :
67
64
directories :
68
- - $HOME/.ivy2/cache
69
- - $HOME/.sbt/boot
70
- - $HOME/.sbt/launchers
65
+ - " $HOME/.sbt/0.13/dependency"
66
+ - " $HOME/.sbt/boot/scala*"
67
+ - " $HOME/.sbt/launchers"
68
+ - " $HOME/.ivy2/cache"
69
+ - " $HOME/.coursier"
70
+
71
+ before_cache :
72
+ - du -h -d 1 $HOME/.ivy2/cache
73
+ - du -h -d 2 $HOME/.sbt/
74
+ - find $HOME/.sbt -name "*.lock" -type f -delete
75
+ - find $HOME/.ivy2/cache -name "ivydata-*.properties" -type f -delete
76
+ - find $HOME/.ivy2/cache -name "*scalafix*.xml" -type f -delete
77
+ - rm -rf $HOME/.ivy2/local
Original file line number Diff line number Diff line change @@ -20,11 +20,14 @@ RELEASE_COMBO=true
20
20
21
21
if [[ " $TEST_SCALAFIX " == " true" ]]; then
22
22
sbt scalafixTests/test
23
- exit 0
24
23
fi
25
24
26
25
if [ " $SCALAJS_VERSION " = " " ]; then
27
- projectPrefix=" compat"
26
+ if [[ " $TEST_SCALAFIX " == " true" ]]; then
27
+ projectPrefix=" scalafixRules"
28
+ else
29
+ projectPrefix=" compat"
30
+ fi
28
31
else
29
32
projectPrefix=" compatJS"
30
33
fi
@@ -52,4 +55,10 @@ if [[ "$TRAVIS_TAG" =~ $tagPat ]]; then
52
55
fi
53
56
fi
54
57
55
- sbt -Dhttps.protocols=TLSv1.2 " ++$TRAVIS_SCALA_VERSION " " $publishVersion " " $projectPrefix /clean" " $projectPrefix /test" " $projectPrefix /publishLocal" " $publishTask "
58
+ sbt -Dhttps.protocols=TLSv1.2 \
59
+ " ++$TRAVIS_SCALA_VERSION " \
60
+ " $publishVersion " \
61
+ " $projectPrefix /clean" \
62
+ " $projectPrefix /test" \
63
+ " $projectPrefix /publishLocal" \
64
+ " $publishTask "
Original file line number Diff line number Diff line change @@ -51,13 +51,13 @@ lazy val compatJS = compat.js
51
51
lazy val scalafixRules = project
52
52
.in(file(" scalafix-rules" ))
53
53
.settings(scalaModuleSettings)
54
+ .settings(scalaModuleSettingsJVM)
54
55
.settings(
55
56
name := " scala-collection-migrations" ,
56
57
scalaVersion := scalafixScala212,
57
58
libraryDependencies += " ch.epfl.scala" %% " scalafix-core" % scalafixVersion
58
59
)
59
60
60
-
61
61
// == Scalafix Test Setup ==
62
62
63
63
lazy val scalafixInput = project
Original file line number Diff line number Diff line change
1
+ import coursier .util .Properties .{version => coursierVersion }
2
+
1
3
if (System .getProperty(" java.version" ).startsWith(" 1." ))
2
4
Seq ()
3
5
else
@@ -12,3 +14,4 @@ addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.4.0")
12
14
addSbtPlugin(" org.scala-lang.modules" % " sbt-scala-module" % " 1.0.14" )
13
15
addSbtPlugin(" ch.epfl.scala" % " sbt-scalafix" % " 0.5.10" )
14
16
addSbtPlugin(" com.eed3si9n" % " sbt-buildinfo" % " 0.7.0" )
17
+ addSbtPlugin(" io.get-coursier" % " sbt-coursier" % coursierVersion)
Original file line number Diff line number Diff line change
1
+ addSbtPlugin(" io.get-coursier" % " sbt-coursier" % " 1.1.0-M4" )
You can’t perform that action at this time.
0 commit comments