File tree 4 files changed +12
-8
lines changed
scalac-scoverage-plugin/src 4 files changed +12
-8
lines changed Original file line number Diff line number Diff line change 12
12
13
13
jobs :
14
14
test :
15
- runs-on : ubuntu-latest
15
+ runs-on : ${{ matrix.os }}
16
16
strategy :
17
17
fail-fast : false
18
18
matrix :
19
+ os : [ 'ubuntu-latest', 'windows-latest' ]
19
20
java : [ '8', '11' ]
20
21
scala : [
21
22
{ version: '2.11.12' },
Original file line number Diff line number Diff line change @@ -50,7 +50,7 @@ object Serializer {
50
50
|# - description (can be multi-line)
51
51
|# '\f' sign
52
52
|# ------------------------------------------
53
- | """ .stripMargin)
53
+ | """ .stripMargin.replaceAll( " ( \r\n )| \n | \r " , " \n " ) )
54
54
}
55
55
56
56
def writeStatement (stmt : Statement , writer : Writer ): Unit = {
@@ -71,7 +71,7 @@ object Serializer {
71
71
| ${stmt.ignored}
72
72
| ${stmt.desc}
73
73
|\f
74
- | """ .stripMargin)
74
+ | """ .stripMargin.replaceAll( " ( \r\n )| \n | \r " , " \n " ) )
75
75
}
76
76
77
77
writeHeader(writer)
Original file line number Diff line number Diff line change @@ -83,9 +83,12 @@ object ScoverageCompiler {
83
83
version : String
84
84
): Option [File ] = {
85
85
val userHome = System .getProperty(" user.home" )
86
- val jarPaths = Seq (
87
- s " $userHome/.cache/coursier/v1/https/repo1.maven.org/maven2/org/scala-lang/ $artifactId/ $version/ $artifactId- $version.jar " ,
88
- s " $userHome/Library/Caches/Coursier/v1/https/repo1.maven.org/maven2/org/scala-lang/ $artifactId/ $version/ $artifactId- $version.jar "
86
+ val jarPaths = Iterator (
87
+ " .cache/coursier" , // Linux
88
+ " Library/Caches/Coursier" , // MacOSX
89
+ " AppData/Local/Coursier/cache" // Windows
90
+ ).map(loc =>
91
+ s " $userHome/ $loc/v1/https/repo1.maven.org/maven2/org/scala-lang/ $artifactId/ $version/ $artifactId- $version.jar "
89
92
)
90
93
jarPaths.map(new File (_)).find(_.exists())
91
94
}
Original file line number Diff line number Diff line change @@ -67,7 +67,7 @@ class SerializerTest extends AnyFunSuite with OneInstancePerTest {
67
67
|false
68
68
|def test : String
69
69
|\f
70
- | """ .stripMargin
70
+ | """ .stripMargin.replaceAll( " ( \r\n )| \n | \r " , " \n " )
71
71
val writer = new StringWriter () // TODO-use UTF-8
72
72
val actual = Serializer .serialize(coverage, writer)
73
73
assert(expected === writer.toString)
@@ -111,7 +111,7 @@ class SerializerTest extends AnyFunSuite with OneInstancePerTest {
111
111
|false
112
112
|def test : String
113
113
|\f
114
- | """ .stripMargin.split(" \n " ).iterator
114
+ | """ .stripMargin.split(" ( \r\n )| \n | \r " ).iterator
115
115
val statements = List (
116
116
Statement (
117
117
Location (
You can’t perform that action at this time.
0 commit comments