summaryrefslogtreecommitdiff
path: root/project
Commit message (Collapse)AuthorAgeFilesLines
* Merge 2.11.x into 2.12.xAdriaan Moors2017-04-071-1/+1
|\ | | | | | | Include 828a892 Merge pull request #5753
| * bump copyright year to 2017Philippus Baalman2017-03-021-1/+1
| |
* | Merge 2.11.x into 2.12.xAdriaan Moors2017-04-071-1/+1
|\| | | | | | | Include 011cc7e Merge pull request #5699 from SethTisue/mima-0.1.14
| * upgrade to MiMa 0.1.14Seth Tisue2017-02-141-1/+1
| | | | | | | | just on general dogfooding principle
* | Merge pull request #5747 from dwijnand/fix-root-package-taskSeth Tisue2017-03-211-1/+2
|\ \ | | | | | | SD-317 Fix package & compiler/package
| * | Rewire package to osgiBundle for OSGi-enabled projectsDale Wijnand2017-03-151-1/+2
| | | | | | | | | | | | Fixes scala/scala-dev#317.
* | | remove test/pending directory tooSeth Tisue2017-03-211-1/+1
| | | | | | | | | | | | | | | it will all stay right there in the Git history to be consulted anytime we want...
* | | fix typosSeth Tisue2017-03-201-1/+1
| | |
* | | new version numbers for snapshot and integration builds, new repositoryLukas Rytz2017-03-081-13/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Integration builds now have version number like `2.12.2-bin-sha7` or `2.13.0-pre-sha7` and are published to scala-integration (no longer scala-release-temp). scala-release-temp is still used in the bootstrap script for publishing intermediate artifacts (starr, locker). Various cleanups in the scripts.
* | | Get commit SHA and date with JGitStefan Zeiger2017-02-282-10/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to get the SHA and date we used to run shell scripts and parse the output of `git` commands. On Windows we even ran a batch file that looked for `bash.exe` and then ran the shell script in bash. Using JGit should be more robust than the old Rube Goldberg implementation. The values produced are the same, except for the time zone. Previously the timestamp was formatted with the local timezone, now we use UTC.
* | | Add partest paths to the list of watched sources.Paul Phillips2017-02-261-0/+4
|/ / | | | | | | | | This allows running partest continuously (e.g. ~partest a/b/test) with it triggering on changes to the test source.
* | Merge pull request #5732 from retronym/topic/build-info-malarkeyAdriaan Moors2017-02-241-0/+4
|\ \ | | | | | | More predictable performance of SBT build startup, reload
| * | More predictable performance of SBT build startup, reloadJason Zaugg2017-02-231-0/+4
| |/ | | | | | | | | | | | | | | | | | | | | | | Disable parallelism to avoid a nasty interaction between the SBT build info plugin, which internally uses `EvaluateTask`, and can get into a race condition with other concurrnently running tasks. This could be seen as frequent, unnecessary Ivy resolution during the `reload` command, even when nothing had changed. Gory details in https://github.com/sbt/sbt/issues/2970
| * support --show-log for partest commandAdriaan Moors2017-01-091-1/+1
| |
* | Merge pull request #5707 from retronym/topic/java9-prepareLukas Rytz2017-02-2012-0/+24
|\ \ | | | | | | More groundwork for JDK 9 support
| * | Workaround bug in Scala runtime reflection on JDK 9Jason Zaugg2017-02-1612-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge pull request #5684 from SethTisue/partest-sbt-only-plzSeth Tisue2017-02-161-1/+1
|\ \ \ | |/ / |/| | run partest from sbt always, command line never
| * | fix annoying extra space in tab completion of sbt `partest` commandJason Zaugg2017-02-141-1/+1
| | |
* | | Make partest --grep glob paths, not just filenamesDale Wijnand2017-02-011-2/+2
|/ / | | | | | | | | | | | | | | | | Allows for "partest --grep run/t365*" to work, while previous it returned: > partest --grep run\/t365* [error] no tests match pattern / glob [error] partest --grep run\/t365* [error] ^
* | run ScalaCheck tests directly, not through partestSeth Tisue2017-01-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | 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.
* | Fix how "sbt" is writtenDale Wijnand2016-12-214-4/+4
| | | | | | | | | | | | | | | | "sbt" is not an acronym (it used to be, but it isn't any longer). It's a proper name, like "iPhone" or "eBay". So, just like you wouldn't write "Get Started With EBay" or "How To Reset Your IPhone", we don't write "Using the Sbt Build".
* | Merge remote-tracking branch 'origin/2.11.x' into ↵Jason Zaugg2016-12-201-1/+1
|\| | | | | | | | | | | | | | | | | | | merge/2.11.x-to-2.12.x-20161220 Conflicts: bincompat-backward.whitelist.conf build.xml src/compiler/scala/tools/nsc/typechecker/Typers.scala src/library/scala/collection/immutable/NumericRange.scala
| * Upgrade MiMa to 0.1.13Martynas Mickevičius2016-12-081-1/+1
| |
* | Merge pull request #5558 from larsrh/topic/deprecated-y-flagsAdriaan Moors2016-12-131-1/+1
|\ \ | | | | | | Remove deprecated -Y flags
| * | remove deprecated compiler flag "-Yinfer-by-name"Lars Hupel2016-12-011-1/+1
| | | | | | | | | | | | This was slated for removal in 2.12.
| * | remove deprecated compiler flag "-Yeta-expand-keeps-star"Lars Hupel2016-12-011-1/+1
| | | | | | | | | | | | This was slated for removal in 2.12.
* | | Merge remote-tracking branch 'origin/2.11.x' into merge-2.11.x-to-2.12.x-dec-1Seth Tisue2016-12-011-1/+1
|\ \ \ | |/ / |/| / | |/
| * upgrade MiMa to 0.1.12Seth Tisue2016-12-011-1/+1
| | | | | | | | | | dogfooding the latest. upgrading all the way from 0.1.8 -- there have been a bunch of improvements since then.
| * Merge pull request #5464 from retronym/backport/5386Seth Tisue2016-10-191-1/+1
| |\ | | | | | | [backport] Bump sbt.version to 0.13.12, without breaking
| | * [backport] Bump sbt.version to 0.13.12, without breakingDale Wijnand2016-10-191-1/+1
| | |
| * | SI-2712 Add support for higher order unificationMiles Sabin2016-08-151-1/+1
| |/
* | Workaround a bug that rendered MiMa inoperativeJason Zaugg2016-11-161-2/+6
| | | | | | | | | | | | | | | | | | | | 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 #5497 from szeiger/wip/sd-254Jason Zaugg2016-11-111-4/+9
|\ \ | | | | | | Don’t include scala-asm.jar in scala-compiler.jar
| * | Don’t include scala-asm.jar in scala-compiler.jarStefan Zeiger2016-11-101-4/+9
| | | | | | | | | | | | Fixes https://github.com/scala/scala-dev/issues/254
* | | Merge pull request #5432 from dwijnand/partest-scalac_optsAdriaan Moors2016-11-101-1/+4
|\ \ \ | |/ / |/| | Add support for -Dpartest.scalac_opts to the partest command
| * | Add support for -Dpartest.scalac_opts to the partest commandDale Wijnand2016-09-291-1/+4
| | |
* | | Avoid 2 more deprecated sbt 0.12 operatorsDale Wijnand2016-11-041-1/+1
| | |
* | | avoid deprecated sbt 0.12 operatorsSeth Tisue2016-11-041-2/+2
| | |
* | | upgrade to sbt 0.13.13Seth Tisue2016-10-281-1/+1
| | |
* | | Merge pull request #5379 from szeiger/wip/persist-buildcharacterStefan Zeiger2016-10-271-3/+6
|\ \ \ | | | | | | | | Store buildcharacter.properties in scala-compiler.jar
| * | | Store buildcharacter.properties in scala-compiler.jarStefan Zeiger2016-09-061-3/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | assorted typo fixes, cleanup, updating of commentsSeth Tisue2016-10-241-1/+1
| | | | | | | | | | | | | | | | | | just in time for Halloween. "boostrap" is definitely the most adorable typo evah -- and one of the most common, too. but we don't want to scare anybody.
* | | dogfood the new MiMaSeth Tisue2016-10-191-1/+1
| | | | | | | | | | | | | | | it just has one little bugfix (a "synchronized" added to fix a concurrency thing was intermittently failing some CI builds)
* | | Merge pull request #5386 from dwijnand/sbt-0.13.12Seth Tisue2016-10-181-1/+1
|\ \ \ | | | | | | | | Bump sbt.version to 0.13.12, without breaking
| * | | Bump sbt.version to 0.13.12, without breakingDale Wijnand2016-09-221-1/+1
| |/ /
* | | Merge pull request #5416 from SethTisue/merge-2.12.0-to-2.12.x-sep-24Seth Tisue2016-10-052-2/+2
|\ \ \ | | | | | | | | merge 2.12.0 onto 2.12.x [ci: last-only]
| * | | Enable MiMa for 2.12.0Stefan Zeiger2016-09-291-1/+1
| | | |
| * | | Including Lightbend in `-version` message.Adriaan Moors2016-09-271-1/+1
| |/ / | | | | | | | | | Also consistently use "LAMP/EPFL" and not "EPFL LAMP".
* / / use proper lightbend.com and scala-sbt.org URLsSeth Tisue2016-09-281-1/+1
|/ / | | | | | | | | not dl.bintray.com, it's an implementation detail that they're our current provider
* | remove various references to Ant buildSeth Tisue2016-09-024-9/+6
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 15:04:04 +0000