summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Use jarlister in buildRaphael Jolly2016-05-213-9/+17
| | | | | | | The goal of this change is to exercize the "manifest classpath" mechanism, meant to bring the compiler its needed classes as resources, listed in jar manifests, as opposed to files, thus enabling to use the compiler in sandboxed environments (and also the scripting engine for that matter).
* Merge pull request #5178 from lrytz/readme211Adriaan Moors2016-05-203-185/+296
|\ | | | | [backport] identical readme in 2.11.x as in 2.12.x
| * [backport] identical readme in 2.11.x as in 2.12.xLukas Rytz2016-05-193-185/+296
|/
* Merge pull request #5172 from lrytz/move-testJason Zaugg2016-05-172-0/+0
|\ | | | | Move t8449 to correct place
| * Move t8449 to correct placeLukas Rytz2016-05-172-0/+0
| | | | | | | | Follow-up for https://github.com/scala/scala/pull/4117
* | Remove default value for sourcepath in scalac (ant version). (#5166)Krzysztof Romanowski2016-05-171-2/+0
|/
* Merge pull request #5152 from retronym/topic/silencioJason Zaugg2016-05-173-9/+46
|\ | | | | Eliminate major sources of daily noise in SBT build.
| * [backport] sbt build targets build/Adriaan Moors2016-05-171-5/+5
| | | | | | | | | | It avoids confusion with existing test/partest scripts that test the compiler in build/, while sbt it targeting build-sbt/.
| * Eliminate major sources of daily noise in SBT build.Jason Zaugg2016-05-163-4/+41
| | | | | | | | | | | | | | | | | | | | - Intercept incorrect "binary conflict" warning issued by SBT. Fixes https://github.com/scala/scala-dev/issues/100 - Bump to a new version of pantsbuild/jarjar to fix an incompatibility with Java 8 parameter names in class files, which we run into on the 2.12.x branch. See: https://github.com/pantsbuild/jarjar/pull/19 - Disable info level logging for dependency resolve/download.
* | Merge pull request #5090 from som-snytt/issue/9740-repl-bad-importLukas Rytz2016-05-118-92/+80
|\ \ | | | | | | SI-9740 Repl import fix -Yrepl-class-based
| * | SI-9740 Repl import fix -Yrepl-class-basedSom Snytt2016-05-028-92/+80
| |/ | | | | | | | | | | | | Under `-Yrepl-class-based`, templating must follow the same scoping as under traditional object-based. The new test shows a typical case where two values of the same simple name must be imported in different scopes.
* | Merge pull request #5128 from szeiger/wip/sbt-ivy-2.11Jason Zaugg2016-05-112-26/+53
|\ \ | |/ |/| Publish usable Scala distributions to Ivy repositories
| * Publish usable Scala distributions to Ivy repositoriesStefan Zeiger2016-05-062-26/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - sbt requires a `default` configuration in the Scala distribution but doesn’t publish such a configuration to Ivy repositories by default. This is not a problem when publishing to a Maven repository because Maven doesn’t use the concept of configurations and Ivy creates a standard set (including `default`) when resolving artifacts from Maven repositories, but it prevents the use of any Scala distribution published with `publishLocal`. The underlying issue is that sbt requires `default` instead of `default(compile)`. We work around this limitation by publishing a dummy `default` configuration. - sbt has hardcoded dependencies on the `scala-library` artifact of type `jar`. In the tradition of `sbt-osgi` we used type `bundle` when publishing via Ivy but this makes the artifacts unusable from sbt. We now publish the OSGi bundles directly as type `jar` (which is compatible with how they appear in Ivy after resolving from a Maven repository). - We have to be more aggressive about not publishing certain subprojects, otherwise `ivy.xml` files could still be published even when using `publishArtifacts := false`. - `removePomDependencies` now also modifies `ivy.xml` in addition to the Maven POM so that bogus dependencies do not leak into the Ivy descriptors. Fixes https://github.com/scala/scala-dev/issues/130
* | Merge pull request #5139 from SethTisue/disable-integrate-ideAdriaan Moors2016-04-281-0/+4
|\ \ | | | | | | disable integrate/ide script on 2.11.x
| * | disable integrate/ide script on 2.11.xSeth Tisue2016-04-281-0/+4
| | |
* | | CI: hardcode java path in integrate/windows scriptAdriaan Moors2016-04-211-5/+6
| | |
* | | Merge pull request #5113 from adriaanm/ci-win-java6Adriaan Moors2016-04-211-0/+3
|\ \ \ | | | | | | | | CI: use java 6 for windows integration
| * | | CI: use java 6 for windows integrationAdriaan Moors2016-04-211-0/+3
|/ / /
* | | SI-9734 Narrow type when import REPL history (#5084)som-snytt2016-04-203-1/+41
| | | | | | | | | | | | | | | Under `-Yrepl-class-based`, imports from historical `$read` instances must be singleton-typed so that path-dependent types remain so.
* | | SI-9735 REPL prefer standard escapes for code text (#5086)som-snytt2016-04-203-4/+48
| | | | | | | | | | | | | | | When constructing code text for compilation, the REPL should prefer standard escape sequences, in case unicode escapes are disabled.
* | | Updating README.md Eclipse version reference. (#5092)CodingTwinky2016-04-201-1/+1
| | |
* | | Automate Eclipse settings and update project files: (#5091)Iulian Dragos2016-04-209-27/+101
|/ / | | | | | | | | | | | | | | - remove `M2_REPO`. All dependencies are picked up from `build/deps` - add script to update an existing workspace directory with the required path variables - add the default Scala library to several projects for better out-of-the-box experience. This means that changes in the scale-library project may not be visible in the other projects, but makes it way easier to get a working config. If you really need that, you probably know what you’re doing anyway.
* | Merge pull request #5054 from lrytz/intellij-2.112.11.xLukas Rytz2016-03-2327-236/+507
|\ \ | | | | | | Update IntelliJ build for use with sbt
| * | Cleanup IntelliJ integration based on review feedbackLukas Rytz2016-03-221-31/+35
| | |
| * | Update IntelliJ build for use with sbtLukas Rytz2016-03-2127-236/+503
| |/
* | Merge pull request #5056 from viktorklang/wip-SI9488-Future.toString-√Lukas Rytz2016-03-234-2/+34
|\ \ | | | | | | SI-9488 - adds the same default toString format to Scala Futures as 2…
| * | SI-9488 - adds the same default toString format to Scala Futures as 2.12.xViktor Klang2016-03-224-2/+34
| |/ | | | | | | Includes tests to verify the toString representations.
* | Merge pull request #5026 from SethTisue/scala-xml-version-bumpLukas Rytz2016-03-221-1/+1
|\ \ | |/ |/| upgrade to latest scala-xml (namely 1.0.5)
| * Merge branch '2.11.x' into scala-xml-version-bumpSeth Tisue2016-03-094-5/+5
| |\
| * | upgrade to latest scala-xml (namely 1.0.5)Seth Tisue2016-03-081-1/+1
| | | | | | | | | | | | | | | there shouldn't be user-visible changes since 1.0.4, but regardless, it's good to depend on the latest
* | | Merge pull request #5030 from SethTisue/newer-akkaAdriaan Moors2016-03-151-1/+1
|\ \ \ | |_|/ |/| | bundle a newer Akka actors jar
| * | Merge branch '2.11.x' into newer-akkaSeth Tisue2016-03-094-5/+5
| |\ \ | |/ / |/| |
* | | Merge pull request #5025 from SethTisue/next-is-2-11-9Seth Tisue2016-03-094-5/+5
|\ \ \ | |_|/ |/| | bump versions after 2.11.8 release
| * | bump versions after 2.11.8 releaseSeth Tisue2016-03-084-5/+5
|/ /
| * bundle a newer Akka actors jarSeth Tisue2016-03-091-1/+1
|/ | | | | | | | | | might as well let people have the current stuff. I asked the Akka folks and nobody saw a reason not to upgrade. this version of Akka is the latest in the 2.3.x series, but is also some months old, so no stability worries. (this would have been included in 2.11.8 if I had thought of it in time)
* Merge pull request #5005 from janekdb/2.11.x-man-page-scalacv2.11.8Seth Tisue2016-03-041-25/+26
|\ | | | | Document -Xxml:coalescing in scalac man page
| * Document -Xxml:coalescing in scalac man pageJanek Bogucki2016-03-031-25/+26
| | | | | | | | The formatting style is based on -g and -target.
* | Merge pull request #4994 from dk14/patch-1Seth Tisue2016-03-041-1/+1
|\ \ | | | | | | explicitly specify insertion-order feature in docs
| * | explicitly specify insertion-order feature in docsdk142016-02-231-1/+1
| | |
* | | Merge pull request #5006 from SethTisue/more-cowbell-more-lightbendSeth Tisue2016-03-045-6/+6
|\ \ \ | | | | | | | | Typesafe -> Lightbend in more places
| * | | Typesafe -> Lightbend in more placesSeth Tisue2016-03-045-6/+6
|/ / /
* | | Merge pull request #5002 from retronym/ticket/9546Lukas Rytz2016-03-046-29/+107
|\ \ \ | |_|/ |/| | SI-9546 Fix regression in rewrite of case apply to constructor call
| * | SI-9425 Fix a residual bug with multi-param-list case classesJason Zaugg2016-03-042-3/+25
| | | | | | | | | | | | | | | | | | | | | | | | During code review for the fix for SI-9546, we found a corner case in the SI-9425 that remained broken. Using `finalResultType` peels off all the constructor param lists, and solves that problem.
| * | SI-9546 Fix regression in rewrite of case apply to constructor callJason Zaugg2016-03-022-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In SI-9425, I disabled the rewrite of `CaseClass.apply(x)` to `new CaseClass(x)` if the constructor was was less accessible than the apply method. This solved a problem with spurious "constructor cannot be accessed" errors during refchecks for case classes with non-public constructors. However, for polymorphic case classes, refchecks was persistent, and even after refusing to transform the `TypeApply` within: CaseClass.apply[String]("") It *would* try again to transform the enclosing `Select`, a code path only intended for monomorphic case classes. The tree has a `PolyType`, which foiled the newly added accessibility check. I've modified the call to `isSimpleCaseApply` from the transform of `Select` nodes to exclude polymorphic apply's from being considered twice.
| * | Refactor transform of case apply in refchecksJason Zaugg2016-03-024-28/+72
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've identified a dead call to `transformCaseApply` that seems to date back to Scala 2.6 vintages, in which case factory methods were a fictional companion method, rather than a real apply method in a companion module. This commit adds an abort in that code path to aide code review (if our test suite still passes, we know that I've removed dead code, rather than silently changing behaviour.) The following commit will remove it altogether I then inlined a slightly clunky abstraction in the two remaining calls to `transformCaseApply`. It was getting in the way of a clean fix to SI-9546, the topic of the next commit.
* | Merge pull request #5000 from felixmulder/patch-2Seth Tisue2016-03-011-1/+1
|\ \ | | | | | | Fix bold text in reflect API for 2.11.x
| * | Fix bold text in reflect API for 2.11.xFelix Mulder2016-02-271-1/+1
|/ / | | | | Same as #4999
* | Merge pull request #4993 from SethTisue/sbt-0.13.11Seth Tisue2016-02-263-48/+48
|\ \ | | | | | | upgrade to sbt 0.13.11
| * | upgrade to sbt 0.13.11Seth Tisue2016-02-223-48/+48
| | | | | | | | | | | | yum! delicious dogfood!
* | | Merge pull request #4995 from SethTisue/typesafe-is-now-lightbendSeth Tisue2016-02-2414-25/+25
|\ \ \ | | | | | | | | Typesafe is now Lightbend
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-01 00:39:05 +0000