Skip to content

Commit 3ed436c

Browse files
.
1 parent 4d35a8b commit 3ed436c

File tree

8 files changed

+49
-24
lines changed

8 files changed

+49
-24
lines changed

.travis.yml

+11-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
language: scala
22

33
scala:
4-
- 2.11.12
4+
# - 2.11.12
55
- 2.12.6
6-
- 2.13.0-M4
6+
# - 2.13.0-M4
77
jdk:
8-
- openjdk7
8+
# - openjdk7
99
- oraclejdk8
1010
env:
1111
global:
@@ -15,10 +15,10 @@ env:
1515
- secure: "oStf8s+LwXcmVENMnWU970OAImwXLV2E6FNXSLE7zdr4YL70cWVsDXDeAs0LSEmiOXTtHulmcIwUt6fCqZ1aiTxUxGX2avy0DSM9nCrQit7IXfwX8V9iK9/3t/SXo1g8yEfxyug+OK6CKOlLeA9HY/TJjO6fkYCsR1NrD8PLpgGtgSwS1GGjifbdahkQyyyivxROJ2UaRysm8PJ1X1966FoQoXKLU4HEztO48y3ZIlItZGwVv/1FJ18AniU2oCnV6XQVM+OB/j+IxNENzLBvd54/YjVtRRa22KTlC8j/NXo8Vq/f0ZhLjNLzYIEB1ER+2T2dthpek+Y8eMR5RdHrFj4Xp2kB04K70ZIL6pw2BDpqeiabjm1E3X6c+flj4pWR5p8uXguV7JmhYgl9d2UEqP7ZTzSbgh2S2WG9EjyK4C2L9jimgBP+Nih2yeW8GuURKgjQ5zrg3+7vxXqBjNN4PmTLpGiQ5shK1kZCpzdgfTl3LfUO4Uitg2Vl8yFC3Z9d3Fo5oV84DhL20pMIx7CtIcMX4b5QHArbUyICYFOvuz+8qP67kTPLVoErNmKWjqpp64VarqfoVbbe4NwRgGuNSMPR1nHb1LjloXv1CiNs9AocvnTknhV1T9I4F4XWi/J6mEwUbVW7GppzqszO6cAgcPLbqp92U8I+rexPjiieCZ0="
1616
# SONA_PASS
1717
- secure: "m0Fw/eH7RXJJoBTfqV6CMd7kaIN2pRPnQPNXJGb546UjqYAlYTkfjvVrWpsgpisRBptI1FEHn24yGbgAHjIes/4un/O62K66I0BffL8PbdeHeNcDjSrTesKEqage2mQfGOiqccVsmkgiKeXNYL8tPZRmPQQ3XZ97mS1SXWlqAJSMW6HfNnvqW14Gdb/snR6I8lQ2o5tRnLerWPnI96pp+xjZca2lD4XDvH2wLJXXLmYY61e23ZYzZMepxBxhGa7js3YTYzCWNrOfBLjFJ5nwRxbjR0WMuz5z5Gdy715WtguKS4Fffd/GJHycLROBU9LCAQDMTxMFvqzFqVFpfq0BuTmmkXFXj+a7dO+ABG0RfoDfoMjn7pHwyHNCZyMMuR1HCjMkbGFwC+Zme2UAYNivtcsuWWeMuypwjyqjfFfNns4FHJ0SXFtC/6+OJkAuUdbEJKReYWKWEsP5SnCH/8PLlc+uUl3tjQkFLc1sOAyx9cTWyBErwuJXhgTrjT9AWvO+fvhcm8z/p5+aaF/U9GIrzPqziX4hGjzc/WC+rsFJSiBDlFQl7br+m8WWs7/wuXqPGXmhf0BNQViDi7fZndDHcY3p3T0An05d/IMKjCUrgLDlJi6VYs9XN7S8ay6MH+XTwIsJGSxtGjfEO4rHGIjtR2GRr8TqdNfnpsI3ucbia1Y="
18-
matrix:
19-
- SCALAJS_VERSION=
20-
- SCALAJS_VERSION=0.6.23
21-
- SCALAJS_VERSION=1.0.0-M3
18+
# matrix:
19+
# - SCALAJS_VERSION=
20+
# - SCALAJS_VERSION=0.6.23
21+
# - SCALAJS_VERSION=1.0.0-M3
2222

2323
matrix:
2424
exclude:
@@ -57,15 +57,19 @@ matrix:
5757

5858
before_script: ./checkCLA.sh
5959
script:
60+
- admin/install-sbt.sh
6061
- java -version
6162
- admin/build.sh
6263

6364
cache:
6465
directories:
66+
- "$HOME/dl"
67+
- "$HOME/sbt"
6568
- "$HOME/.sbt/0.13/dependency"
6669
- "$HOME/.sbt/boot/scala*"
6770
- "$HOME/.sbt/launchers"
6871
- "$HOME/.ivy2/cache"
72+
- "$HOME/.coursier"
6973

7074
before_cache:
7175
- du -h -d 1 $HOME/.ivy2/cache

admin/build.sh

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22

33
set -e
44

@@ -18,10 +18,6 @@ set -e
1818

1919
RELEASE_COMBO=true
2020

21-
if [[ "$TEST_SCALAFIX" == "true" ]]; then
22-
sbt scalafixTests/test
23-
fi
24-
2521
if [ "$SCALAJS_VERSION" = "" ]; then
2622
if [[ "$TEST_SCALAFIX" == "true" ]]; then
2723
projectPrefix="scalafixRules"
@@ -32,9 +28,19 @@ else
3228
projectPrefix="compatJS"
3329
fi
3430

31+
if [[ "$TEST_SCALAFIX" == "true" ]]; then
32+
crossScalaVersion="noop"
33+
testProjectPrefix="scalafixTests"
34+
else
35+
crossScalaVersion="++$TRAVIS_SCALA_VERSION"
36+
testProjectPrefix="$projectPrefix"
37+
fi
38+
3539
verPat="[0-9]+\.[0-9]+\.[0-9]+(-[A-Za-z0-9-]+)?"
3640
tagPat="^v$verPat(#.*)?$"
3741

42+
publishVersion="noop"
43+
3844
if [[ "$TRAVIS_TAG" =~ $tagPat ]]; then
3945
tagVer=$(echo $TRAVIS_TAG | sed s/#.*// | sed s/^v//)
4046
publishVersion='set every version := "'$tagVer'"'
@@ -55,10 +61,4 @@ if [[ "$TRAVIS_TAG" =~ $tagPat ]]; then
5561
fi
5662
fi
5763
58-
sbt -Dhttps.protocols=TLSv1.2 \
59-
"++$TRAVIS_SCALA_VERSION" \
60-
"$publishVersion" \
61-
"$projectPrefix/clean" \
62-
"$projectPrefix/test" \
63-
"$projectPrefix/publishLocal" \
64-
"$publishTask"
64+
~/sbt/bin/sbt -Dhttps.protocols=TLSv1.2 ";$crossScalaVersion ;$publishVersion ;$projectPrefix/clean ;$testProjectPrefix/test" "$projectPrefix/publishLocal ;$publishTask"

admin/encryptEnvVars.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
2+
23
#
34
# Encrypt sonatype credentials so that they can be
45
# decrypted in trusted builds on Travis CI.

admin/genKeyPair.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
2+
23
#
34
# Generates a key pair for this repository to sign artifacts.
45
# Encrypt the private key and its passphrase in trusted builds

admin/install-sbt.sh

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#!/usr/bin/env bash
2+
3+
mkdir -p dl
4+
5+
if [ ! -f ~/dl/sbt-0.13.17.tgz ]; then
6+
wget https://piccolo.link/sbt-0.13.17.tgz -O ~/dl/sbt-0.13.17.tgz
7+
fi
8+
9+
if [ ! -f ~/sbt ]; then
10+
tar -xzvf ~/dl/sbt-0.13.17.tgz -C ~
11+
fi
12+
13+
mkdir -p ~/.sbt/0.13/plugins
14+
15+
# travis' sbt does not allow us to use global plugins
16+
echo 'addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.1.0-M4")' > ~/.sbt/0.13/plugins/plugins.sbt

build.sbt

+5-1
Original file line numberDiff line numberDiff line change
@@ -128,5 +128,9 @@ lazy val scala213Settings = Seq(
128128

129129
// required by sbt-scala-module
130130
inThisBuild(Seq(
131-
crossScalaVersions := Seq(scala212, scala213, "2.11.12")
131+
crossScalaVersions := Seq(scala212, scala213, "2.11.12"),
132+
commands += Command.command("noop") { state =>
133+
println("noop")
134+
state
135+
}
132136
))

project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.13.17
1+
sbt.version=0.13.16

scalafix/rules/src/main/scala/fix/package.scala

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import scalafix._
2-
import scalafix.syntax._
32
import scalafix.util._
43
import scala.meta._
54

0 commit comments

Comments
 (0)