diff --git a/sbt-app/src/sbt-test/actions/cross-advanced/test b/sbt-app/src/sbt-test/actions/cross-advanced/test index a27c92b86..898991be0 100644 --- a/sbt-app/src/sbt-test/actions/cross-advanced/test +++ b/sbt-app/src/sbt-test/actions/cross-advanced/test @@ -18,11 +18,11 @@ ## test + with command or alias > clean ## for command cross building you do need crossScalaVerions on root -> set root/crossScalaVersions := Seq("2.12.19", "2.13.12") +> set root/crossScalaVersions := Seq("2.12.20", "2.13.12") > + build -$ exists target/out/jvm/scala-2.12.19/foo +$ exists target/out/jvm/scala-2.12.20/foo $ exists target/out/jvm/scala-2.13.12/foo -$ exists target/out/jvm/scala-2.12.19/bar +$ exists target/out/jvm/scala-2.12.20/bar $ exists target/out/jvm/scala-2.13.12/bar -$ exists target/out/jvm/scala-2.12.19/client +$ exists target/out/jvm/scala-2.12.20/client $ exists target/out/jvm/scala-2.13.12/client diff --git a/sbt-app/src/sbt-test/actions/cross-multi-parser/test b/sbt-app/src/sbt-test/actions/cross-multi-parser/test index b2666730a..005518291 100644 --- a/sbt-app/src/sbt-test/actions/cross-multi-parser/test +++ b/sbt-app/src/sbt-test/actions/cross-multi-parser/test @@ -1,5 +1,5 @@ > ++2.11.12; compile -> ++ 2.12.19 ; compile; +> ++ 2.12.20 ; compile; -> ++ 2.12.19 ; compile +> ++ 2.12.20 ; compile diff --git a/sbt-app/src/sbt-test/actions/doc/test b/sbt-app/src/sbt-test/actions/doc/test index 14fd9b04d..bed324217 100644 --- a/sbt-app/src/sbt-test/actions/doc/test +++ b/sbt-app/src/sbt-test/actions/doc/test @@ -5,10 +5,10 @@ # hybrid project, only scaladoc run > doc > packageBin -$ exists target/out/jvm/scala-2.12.19/root/api/index.js -$ exists target/out/jvm/scala-2.12.19/root/api/A$.html -$ absent target/out/jvm/scala-2.12.19/root/api/scala -$ absent target/out/jvm/scala-2.12.19/root/api/java +$ exists target/out/jvm/scala-2.12.20/root/api/index.js +$ exists target/out/jvm/scala-2.12.20/root/api/A$.html +$ absent target/out/jvm/scala-2.12.20/root/api/scala +$ absent target/out/jvm/scala-2.12.20/root/api/java > setDocExtension scala @@ -19,12 +19,12 @@ $ copy-file changes/B.scala B.scala > clean ; compile ; doc # pure scala project, only scaladoc at top level -$ exists target/out/jvm/scala-2.12.19/root/api/index.js -$ exists target/out/jvm/scala-2.12.19/root/api/A$.html -$ exists target/out/jvm/scala-2.12.19/root/api/B$.html -$ absent target/out/jvm/scala-2.12.19/root/api/package-list -$ absent target/out/jvm/scala-2.12.19/root/api/scala -$ absent target/out/jvm/scala-2.12.19/root/api/java +$ exists target/out/jvm/scala-2.12.20/root/api/index.js +$ exists target/out/jvm/scala-2.12.20/root/api/A$.html +$ exists target/out/jvm/scala-2.12.20/root/api/B$.html +$ absent target/out/jvm/scala-2.12.20/root/api/package-list +$ absent target/out/jvm/scala-2.12.20/root/api/scala +$ absent target/out/jvm/scala-2.12.20/root/api/java > setDocExtension java @@ -34,14 +34,14 @@ $ absent target/out/jvm/scala-2.12.19/root/api/java > doc # pure java project, only javadoc at top level -$ exists target/out/jvm/scala-2.12.19/root/api/index.html -$ exists target/out/jvm/scala-2.12.19/root/api/pkg/J.html -$ absent target/out/jvm/scala-2.12.19/root/api/index.js +$ exists target/out/jvm/scala-2.12.20/root/api/index.html +$ exists target/out/jvm/scala-2.12.20/root/api/pkg/J.html +$ absent target/out/jvm/scala-2.12.20/root/api/index.js > setDocExtension scala > ++2.13.x > clean -$ absent target/out/jvm/scala-2.12.19/root/api/A$.html +$ absent target/out/jvm/scala-2.12.20/root/api/A$.html > doc $ exists target/out/jvm/scala-2.13.12/root/api/A$.html $ exists target/out/jvm/scala-2.13.12/root/api/B$.html diff --git a/sbt-app/src/sbt-test/actions/generator/test b/sbt-app/src/sbt-test/actions/generator/test index 672c7cc9f..613d5b7fc 100644 --- a/sbt-app/src/sbt-test/actions/generator/test +++ b/sbt-app/src/sbt-test/actions/generator/test @@ -1,2 +1,2 @@ > compile -$ exists target/out/jvm/scala-2.12.19/root/src_managed/BuildInfo.scala +$ exists target/out/jvm/scala-2.12.20/root/src_managed/BuildInfo.scala diff --git a/sbt-app/src/sbt-test/actions/multi-command/test b/sbt-app/src/sbt-test/actions/multi-command/test index 455953b6a..323702a6d 100644 --- a/sbt-app/src/sbt-test/actions/multi-command/test +++ b/sbt-app/src/sbt-test/actions/multi-command/test @@ -37,4 +37,4 @@ > ++ 2.11.12 compile; setStringValue bar; checkStringValue bar -> ++2.12.19 compile; setStringValue foo; checkStringValue foo +> ++2.12.20 compile; setStringValue foo; checkStringValue foo diff --git a/sbt-app/src/sbt-test/actions/package-delete-target/test b/sbt-app/src/sbt-test/actions/package-delete-target/test index cfca1bb64..ff30f1147 100644 --- a/sbt-app/src/sbt-test/actions/package-delete-target/test +++ b/sbt-app/src/sbt-test/actions/package-delete-target/test @@ -1,4 +1,4 @@ -$ mkdir target/out/jvm/scala-2.12.19/delete-target/delete-target_2.12-0.1.0-SNAPSHOT.jar -$ touch target/out/jvm/scala-2.12.19/delete-target/delete-target_2.12-0.1.0-SNAPSHOT.jar/hello +$ mkdir target/out/jvm/scala-2.12.20/delete-target/delete-target_2.12-0.1.0-SNAPSHOT.jar +$ touch target/out/jvm/scala-2.12.20/delete-target/delete-target_2.12-0.1.0-SNAPSHOT.jar/hello -> package -$ exists target/out/jvm/scala-2.12.19/delete-target/delete-target_2.12-0.1.0-SNAPSHOT.jar/hello +$ exists target/out/jvm/scala-2.12.20/delete-target/delete-target_2.12-0.1.0-SNAPSHOT.jar/hello diff --git a/sbt-app/src/sbt-test/actions/query/test b/sbt-app/src/sbt-test/actions/query/test index 51593d75e..72ca5f123 100644 --- a/sbt-app/src/sbt-test/actions/query/test +++ b/sbt-app/src/sbt-test/actions/query/test @@ -3,7 +3,7 @@ $ exists target/out/jvm/scala-3.3.3/root/root.txt $ exists target/out/jvm/scala-3.3.3/foo/foo.txt $ exists target/out/jvm/scala-3.3.3/bar/bar.txt -$ exists target/out/jvm/scala-2.12.19/baz/baz.txt +$ exists target/out/jvm/scala-2.12.20/baz/baz.txt > clean @@ -12,7 +12,7 @@ $ exists target/out/jvm/scala-2.12.19/baz/baz.txt $ absent target/out/jvm/scala-3.3.3/root/root.txt $ absent target/out/jvm/scala-3.3.3/foo/foo.txt $ exists target/out/jvm/scala-3.3.3/bar/bar.txt -$ exists target/out/jvm/scala-2.12.19/baz/baz.txt +$ exists target/out/jvm/scala-2.12.20/baz/baz.txt > clean @@ -21,4 +21,4 @@ $ exists target/out/jvm/scala-2.12.19/baz/baz.txt $ exists target/out/jvm/scala-3.3.3/root/root.txt $ exists target/out/jvm/scala-3.3.3/foo/foo.txt $ exists target/out/jvm/scala-3.3.3/bar/bar.txt -$ absent target/out/jvm/scala-2.12.19/baz/baz.txt +$ absent target/out/jvm/scala-2.12.20/baz/baz.txt diff --git a/sbt-app/src/sbt-test/compiler-project/separate-analysis-per-scala/test b/sbt-app/src/sbt-test/compiler-project/separate-analysis-per-scala/test index 1643abf15..e507b31bf 100644 --- a/sbt-app/src/sbt-test/compiler-project/separate-analysis-per-scala/test +++ b/sbt-app/src/sbt-test/compiler-project/separate-analysis-per-scala/test @@ -1,3 +1,3 @@ > + compile -$ exists target/out/jvm/scala-2.12.19/foo +$ exists target/out/jvm/scala-2.12.20/foo $ exists target/out/jvm/scala-2.13.12/foo diff --git a/sbt-app/src/sbt-test/project-matrix/lib/test b/sbt-app/src/sbt-test/project-matrix/lib/test index 5fd81a7d0..52c5fb5e1 100644 --- a/sbt-app/src/sbt-test/project-matrix/lib/test +++ b/sbt-app/src/sbt-test/project-matrix/lib/test @@ -6,10 +6,10 @@ # check root $ mkdir lib -$ copy-file target/out/jvm/scala-2.12.19/strayjar/strayjar_2.12-0.1.0-SNAPSHOT.jar lib/strayJar.jar +$ copy-file target/out/jvm/scala-2.12.20/strayjar/strayjar_2.12-0.1.0-SNAPSHOT.jar lib/strayJar.jar > root2_12/compile # check ss $ mkdir ss/lib -$ copy-file target/out/jvm/scala-2.12.19/strayjar/strayjar_2.12-0.1.0-SNAPSHOT.jar ss/lib/strayJar.jar +$ copy-file target/out/jvm/scala-2.12.20/strayjar/strayjar_2.12-0.1.0-SNAPSHOT.jar ss/lib/strayJar.jar > ss2_13/compile diff --git a/sbt-app/src/sbt-test/source-dependencies/constants/test b/sbt-app/src/sbt-test/source-dependencies/constants/test index 9d448cea2..28f6743d5 100644 --- a/sbt-app/src/sbt-test/source-dependencies/constants/test +++ b/sbt-app/src/sbt-test/source-dependencies/constants/test @@ -1,4 +1,4 @@ -> ++2.12.19! +> ++2.12.20! $ copy-file changes/B.scala B.scala diff --git a/sbt-app/src/sbt-test/source-dependencies/cross-source/test b/sbt-app/src/sbt-test/source-dependencies/cross-source/test index 53348a66c..21b560de7 100644 --- a/sbt-app/src/sbt-test/source-dependencies/cross-source/test +++ b/sbt-app/src/sbt-test/source-dependencies/cross-source/test @@ -1,3 +1,3 @@ # A.scala needs B.scala, it would be in source list -> ++2.12.19! +> ++2.12.20! > compile