summaryrefslogtreecommitdiff
path: root/build.sbt
Commit message (Collapse)AuthorAgeFilesLines
* fix typosSeth Tisue2017-03-201-1/+1
|
* Add partest paths to the list of watched sources.Paul Phillips2017-02-261-0/+3
| | | | | This allows running partest continuously (e.g. ~partest a/b/test) with it triggering on changes to the test source.
* Workaround bug in Scala runtime reflection on JDK 9Jason Zaugg2017-02-161-0/+1
| | | | | | | | | | | | | | | | | | | The underlying bug is tracked as https://github.com/scala/scala-dev/issues/304 and blocks our SBT starting on JDK 9. This commit avoids using the empty package in our build definition. After this change, I needed to manually clean the class files from the build definition as follows, which might indicate a bug in SBT. $ sbt ... /Users/jz/code/scala-java9-ci/build.sbt:0: warning: imported `BuildSettings' is permanently hidden by definition of object BuildSettings import ..., _root_.scala.build.BuildSettings, ... ^C % rm -rf project/target/scala-2.10/sbt-0.13/classes/ % sbt # okay second time
* Update IntelliJ template configurationJason Zaugg2017-01-271-1/+2
| | | | | | - Remove obsolete references to subproject for actors, forkjoin - Add a new subproject for the scalacheck suite, as spawned in the previous commit
* Move Scaladoc's Partest base classes to partest-extrasJason Zaugg2017-01-271-2/+2
| | | | | | They exist in the current location for historical reasons. partest-extras is a cleaner home for them, as we can avoid the dependency of the scaladoc project on partest.
* run ScalaCheck tests directly, not through partestSeth Tisue2017-01-271-7/+20
| | | | | | | | | | | ScalaCheck ever being under partest in the first place is ancient history, from back in the Ant build days (shudder) ScalaCheck support was removed from partest 1.1.0, which we already upgraded to in a recent commit also upgrades ScalaCheck from 1.11.6 to 1.13.4, since we might as well. no source changes were necessary.
* bump version (now 2.12.2) + and STARR (now 2.12.1)Seth Tisue2016-12-051-1/+1
| | | | as we normally do post-release
* Merge pull request #5532 from retronym/ticket/SD-264Adriaan Moors2016-11-161-1/+1
|\ | | | | Reinstate MiMa and address problems
| * Workaround a bug that rendered MiMa inoperativeJason Zaugg2016-11-161-1/+1
| | | | | | | | | | | | | | | | | | | | MiMa has been off-duty because of a bug in handling the default value of the new paramter `--direction`. This commit explicitly provides this parameter to get things working again post haste. Fixes scala/scala-dev#264
* | Merge pull request #5530 from dwijnand/j-single-unitStefan Zeiger2016-11-161-0/+1
|\ \ | |/ |/| Avoid double-compiling junit sources
| * Avoid double-compiling junit sourcesDale Wijnand2016-11-161-0/+1
| | | | | | | | Fixes scala/scala-dev#266
* | Merge pull request #5512 from szeiger/wip/more-compiler-scaladocSeth Tisue2016-11-151-0/+10
|\ \ | |/ |/| Add “test”, “scaladoc” and “repl” projects to scala-compiler docs
| * Add “test”, “scaladoc” and “repl” projects to scala-compiler docsStefan Zeiger2016-11-081-0/+10
| | | | | | | | This makes the scaladoc bundle for scala-compiler consistent with the binary and source bundles.
* | Define the root sbt project's scalaVersionDale Wijnand2016-11-101-6/+3
| | | | | | | | | | | | | | | | | | The root project is commonly used as the reference point for values, such as "the scala version" of the (entire) project. For example ENSIME uses it like that. Also disablePublishing already disables publish and publishLocal.
* | Merge pull request #5501 from SethTisue/sbt-deprecationsJason Zaugg2016-11-101-63/+70
|\ \ | | | | | | avoid deprecated sbt 0.12 operators
| * | sbt build: omit `: _*` when calling `.settings`Seth Tisue2016-11-081-51/+51
| | | | | | | | | | | | this is allowed in recent sbt versions
| * | Don’t rely on deprecated ScalaInstance methodsStefan Zeiger2016-11-071-2/+6
| | |
| * | Avoid 2 more deprecated sbt 0.12 operatorsDale Wijnand2016-11-041-1/+1
| | |
| * | avoid deprecated sbt 0.12 operatorsSeth Tisue2016-11-041-9/+12
| |/
* | Merge commit 'fe47ef0' into 2.12.xJason Zaugg2016-11-081-0/+4
|\ \ | |/ |/|
| * Merge pull request #5504 from retronym/topic/sbt-macro-warnSeth Tisue2016-11-071-0/+4
| |\ | | | | | | Silence SBT logging about macros and incremental compilation.
| | * Silence SBT logging about macros and incremental compilation.Jason Zaugg2016-11-071-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since upgrading to SBT 0.13.12, clean builds have incurred warnings like: Because JavaMirrors.scala contains a macro definition, the following dependencies are invalidated unconditionally: .... This commit disables this behaviour of the SBT incremental compiler in the library and reflect projects, as these aren't regular macros (the macro implementations are hard coded in the compiler in `FastTrack`) so the new behaviour isn't actually improving correctness of inc. compilation.
| * | [backport] Bump sbt.version to 0.13.12, without breakingDale Wijnand2016-10-191-0/+5
| |/
* | Revert "Temporarily insource Scalacheck 1.11.6"Adriaan Moors2016-11-011-3/+4
| | | | | | | | This reverts commit 22dac3118e97b2a4707d42ef1f47ac292a8ed385.
* | Bump baseVersion to 2.12.1 (#5389)Seth Tisue2016-11-011-1/+1
| | | | | | | | | | | | | | Binary version (for modules) is now 2.12, starr is 2.12.0-RC2. Also, drop repo_ref from jenkins.properties; It's propagated downstream by the '-main' build flows already.
* | Merge pull request #5379 from szeiger/wip/persist-buildcharacterStefan Zeiger2016-10-271-0/+15
|\ \ | | | | | | Store buildcharacter.properties in scala-compiler.jar
| * | Store buildcharacter.properties in scala-compiler.jarStefan Zeiger2016-09-061-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In addition to all the individual projects’ version properties files that we already keep in `scala-compiler.jar` we now write a new `scala-buildcharacter.properties` which is identical to the `buildcharacter.properties` written to the root directory by `generateBuildCharacterPropertiesFile`. The new task `extractBuildCharacterPropertiesFile` extracts it from the bootstrap Scala compiler and writes the usual `buildcharacter.properties`. This can be used to reproduce the exact version information for all modules in builds that start from an arbitrary published Scala version instead of being triggered directly by a bootstrap job.
* | | Merge 2.11.x into 2.12.xAdriaan Moors2016-10-181-8/+14
|\ \ \ | | |/ | |/| | | | Including PRs #5199, #5405
| * | Make removing forkjoin dependant on the organization keyDale Wijnand2016-06-201-10/+14
| | |
* | | Merge pull request #5386 from dwijnand/sbt-0.13.12Seth Tisue2016-10-181-0/+5
|\ \ \ | | | | | | | | Bump sbt.version to 0.13.12, without breaking
| * | | Bump sbt.version to 0.13.12, without breakingDale Wijnand2016-09-221-0/+5
| | |/ | |/|
* | | Avoid use of legacy JVM MaxPermSize option in partestJason Zaugg2016-10-181-1/+1
| | | | | | | | | | | | | | | | | | | | | In Java 8+, which we require on this branch, this option is a no-op and triggers a JVM warning these days. See http://openjdk.java.net/jeps/122
* | | Merge pull request #5416 from SethTisue/merge-2.12.0-to-2.12.x-sep-24Seth Tisue2016-10-051-7/+7
|\ \ \ | | | | | | | | merge 2.12.0 onto 2.12.x [ci: last-only]
| * \ \ Merge remote-tracking branch 'origin/2.12.0' into merge-2.12.0-to-2.12.x-sep-24Seth Tisue2016-10-041-1/+1
| |\ \ \
| | * | | Enable MiMa for 2.12.0Stefan Zeiger2016-09-291-1/+1
| | | | |
| * | | | Merge remote-tracking branch 'origin/2.12.0' into merge-2.12.0-to-2.12.x-sep-24Seth Tisue2016-09-281-6/+6
| |\| | |
| | * | | Including Lightbend in `-version` message.Adriaan Moors2016-09-271-1/+1
| | | | | | | | | | | | | | | | | | | | Also consistently use "LAMP/EPFL" and not "EPFL LAMP".
| | * | | Merge pull request #5414 from szeiger/wip/no-partest-in-packAdriaan Moors2016-09-261-4/+4
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Do not build partest-javaagent and partest-extras for `pack` See scala-dev#223
| | | * | | Do not build partest-javaagent and partest-extras for `pack`Stefan Zeiger2016-09-221-4/+4
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Building them as part of `dist/mkQuick` (and thus, by extension, `dist/mkPack`) was not necessary in the first place. Partest does not rely on these tasks for its dependencies. And when we do build the jars, they now go into their standard location under `target` instead of `build/pack/lib` so they don’t confuse sbt (see https://github.com/sbt/sbt/issues/2748).
| | * / / Fixed reference to script engine factory in META-INF/servicesRaphael Jolly2016-09-161-1/+1
| | |/ /
* | | | Merge pull request #5413 from szeiger/wip/less-verbose-testAllLukas Rytz2016-09-301-8/+13
|\ \ \ \ | |/ / / |/| | | Make output of errors in testAll less verbose
| * | | Make output of errors in testAll less verboseStefan Zeiger2016-09-211-8/+13
| |/ /
* / / Only compare group ID and artifact ID when looking for JLine JARStefan Zeiger2016-09-141-2/+8
|/ / | | | | | | | | | | If the JLine dependency is resolved through Ivy instead of Maven (which can happen with a local proxy setup in sbt that funnels all artifacts through an Ivy repo), the artifact may have a “configuration” set, which prevents a naive comparison of ModuleIDs from finding it.
* | Merge pull request #5368 from retronym/ticket/SD-208Adriaan Moors2016-09-061-3/+12
|\ \ | | | | | | | | | | | | SD-208 Restore 2.11 names for arrayOps implicits Fix scala/scala-dev#208
| * | Use STARR library for ManMakerJason Zaugg2016-08-311-2/+1
| | |
| * | Workaround sbt bug when partest itself throwsJason Zaugg2016-08-311-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | Discussion: https://github.com/sbt/sbt/issues/2722 This commit checks that some test events exist in the test log for `test/it:test` before trusting the result of `Success`.
* | | remove various references to Ant buildSeth Tisue2016-09-021-40/+14
| | |
* | | sbt build: fix "unchecked" warnings when compiling Java codeSeth Tisue2016-08-301-1/+1
|/ /
* | Decrease stack size for JUnit tests to 1M (same as the old ant build)Stefan Zeiger2016-08-291-1/+1
| |
* | increase stack size when running JUnit testsSeth Tisue2016-08-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | scala.collection.immutable.PagedSeqTest.test_SI6615 was failing intermittently during PR validation I verified that this change fixes the problem by: - changing the PageSize constant in PagedSeq (as shown by Jason Zaugg) until the test failed every time locally - making this build change and seeing the test pass again 5M is just an arbitrary number, considerably over the default (which varies according to platform & CPU). 5M is a lot of stack, but not so vastly much that it appreciably eats into the heap
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 17:34:37 +0000