summaryrefslogtreecommitdiff
path: root/versions.properties
Commit message (Collapse)AuthorAgeFilesLines
* Update to partest 1.0.13Jason Zaugg2016-02-121-1/+1
| | | | | Which lets us remove the dependency on sbt-partest-interface, as this has been incorporated into scala-partest itself.
* Update partest to 1.0.12, test case for reporting invalid flagsLukas Rytz2016-02-031-1/+1
|
* Bump starr to 2.12.0-M3Lukas Rytz2015-10-091-3/+3
|
* Merge branch '2.11.x' into 2.12.xAdriaan Moors2015-08-051-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Transcript: ``` ➜ scala git:(2.12.x) export MB=$(git merge-base 2.12.x 2.11.x) ➜ scala git:(2.12.x) echo $MB 0e9525aa618a2eca143a1c7379ff1e6efd23b86e ➜ scala git:(2.12.x) g log --oneline --graph $MB...2.11.x ``` Read this upside down :-). The last merge comes first, with merge commands interspersed in the git log. ``` ➜ scala git:(2.12.x) g merge 2.11.x Auto-merging versions.properties Auto-merging src/reflect/scala/reflect/internal/pickling/UnPickler.scala Auto-merging src/reflect/scala/reflect/internal/Types.scala Auto-merging src/reflect/scala/reflect/internal/TreeGen.scala Auto-merging src/library/scala/collection/immutable/Stream.scala Auto-merging src/library/scala/collection/convert/Wrappers.scala Auto-merging build.xml CONFLICT (content): Merge conflict in build.xml Auto-merging README.md Automatic merge failed; fix conflicts and then commit the result. ``` ``` * 928e6892d4 (scala/2.11.x, 2.11.x) Merge pull request #4682 from adriaanm/jline-quick.bin |\ | * b763dbf368 (adriaanm/jline-quick.bin, jline-quick.bin) Include jline on quick.bin tool path * | ccded7d179 Merge pull request #4680 from janekdb/2.11.x-option |\ \ | |/ |/| | * 58ae3e51f7 Delegate null test to Option |/ * a745f06e35 Merge pull request #4670 from retronym/ticket/9422 |\ | * ec95e534a2 SI-9422 Fix incorrect constant propagation * 65fa73dff3 Merge pull request #4669 from janekdb/2.11.x-scaladoc-reflect |\ | * e206a1837d ScalaDoc fixes for reflect * | 8e7e3b4a5f Merge pull request #4667 from janekdb/2.11.x-scaladoc-library-library-aux |\ \ | |/ |/| | * 69c2c106fe ScalaDoc fixes for library and library-aux * | 7de4cbc5e5 Merge pull request #4665 from lrytz/asm-504-3 |\ \ | * | cdc55c29d0 Upgrade scala-asm to 5.0.4-scala-3 |/ / * | d8da39a197 Merge pull request #4661 from retronym/ticket/9365 |\ \ | * | 0c99742c51 SI-9365 Don't null out dependencies of transient lazy vals | / * | 2279d3f3d9 Merge pull request #4662 from janekdb/2.11.x-redundant-val-modifier |\ \ | * | 173a6fad95 Remove redundant 'val' from case class params. * | | e0d21432d6 Merge pull request #4664 from SethTisue/remove-dead-link-in-readme |\ \ \ | |_|/ |/| | | * | 600fc4e6e1 fix readme for death of typesafe.artifactoryonline.com | |/ * | 7492bda816 Merge pull request #4636 from SethTisue/contributor-stuff-from-github-wiki |\ \ | |/ |/| | * ed5098dbc4 merge two reviewers lists in readme | * e136e4ad47 tighten up CONTRIBUTING.md a little | * f9ca6863d4 readme/contributor's guide tweaks | * 80e98b03a1 tiny readme fix | * 197845620c merge in text from pull request policy from old wiki | * e93ca409ae drop in pull request policy from old wiki | * 951939d1b3 contributor guide: add a morsel salvaged from GitHub wiki * f682441f6f Merge pull request #4653 from lrytz/t9403 |\ | * 2678d349b2 SI-9403 fix ICodeReader for negative BIPUSH / SIPUSH values ``` ``` ➜ scala git:(2.12.x) g merge -s ours f2d7838d90 Merge made by the 'ours' strategy. ``` ``` * f2d7838d90 Merge pull request #4657 from lrytz/backports |\ | * 241bb9ac19 Rename the ENUM / DEFAULTMETHOD flags to include JAVA_ | * 7a7f9927c3 SI-9393 fix modifiers of ClassBTypes for Java annotations | * 8946d60bd2 [backport] Fix bytecode stability when running the closure optimizer | * 3b6b2bfe9f [backport] SI-9392 Clarify the workaround comment and introduce a devWarning | * 091c1e6ed8 [backport] SI-9392 Avoid crash in GenBCode for incoherent trees | * 6177cb4481 [backport] SI-9393 Temporarily disable two assertions in GenBCode | * a1d471f7ba [backport] Refactor the ClosureOptimizer, run ProdCons only once per method | * f5e72765f2 [backport] SI-9387 Fix VerifyError introduced by indylambda | * 41b99e2531 [backport] Integrate the LMFInvokeDynamic extractor into LambdaMetaFactoryCall | * fc1cda2118 [backport] Small refactoring to the closure optimizer | * 8f272c0ad2 [backport] Accessibility checks for methods with an InvokeDynamic instruction | * 1c1d8259b5 [backport] Fix bytecode stability | * ef9d845676 [backport] Support methodHandle / invokeDynamic constant pool entries in scalap | * 60747c7555 [backport] Skip mirror class when invoking deserializeLambda | * 404e86239e [backport] Prevent infinite recursion in ProdConsAnalyzer | * 1b0703e74d [backport] SI-9376 don't crash when inlining a closure body that throws. | * e511375a90 [backport] Fix superclass for Java interface symbols created in JavaMirrors | * 1b57723169 [backport] `deserializeLambda` should not use encoded class name | * 8bafa8ed88 [backport] Java parser: default methods in interfaces are not `DEFERRED` | * 44e2761a9b [backport] SI-6613 fixed in GenBCode ``` ``` ➜ scala git:(2.12.x) g merge 4c6dcfe934 Auto-merging src/scaladoc/scala/tools/nsc/doc/html/page/Template.scala Auto-merging doc/License.rtf Auto-merging doc/LICENSE.md Auto-merging build.xml Auto-merging build.sbt Merge made by the 'recursive' strategy. Auto packing the repository in background for optimum performance. See "git help gc" for manual housekeeping. build.sbt | 2 +- build.xml | 2 +- doc/LICENSE.md | 4 ++-- doc/License.rtf | 4 ++-- src/scaladoc/scala/tools/nsc/doc/html/page/Template.scala | 2 +- src/scalap/decoder.properties | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) ``` ``` * | 4c6dcfe934 Merge pull request #4656 from lrytz/filtersOpenJDK |\ \ | |/ |/| | * 0b35bc29aa Ignore OpenJDK warnings in partest filters * 6eb0812050 Merge pull request #4644 from SethTisue/copyright-2015 * e0aac7c9ef bump copyright year to 2015 ```
| * Upgrade scala-asm to 5.0.4-scala-3Lukas Rytz2015-07-281-1/+1
| | | | | | | | | | Fixes a crash in the backend when the bytecode of a method is too large (https://github.com/scala/scala-asm/issues/8).
| * Bump versions after 2.11.7 releaseSeth Tisue2015-06-241-2/+2
| |
* | Merge pull request #4658 from SethTisue/remove-xml-coalescing-hackSeth Tisue2015-07-241-1/+1
|\ \ | | | | | | remove temporary XML coalescing hack we used to build M2
| * | remove temporary XML coalescing hack we used to build M2Seth Tisue2015-07-211-1/+1
| | | | | | | | | | | | | | | | | | | | | scala-xml 1.0.5 has the fix we need in order to run the scala-xml tests normally during bootstrapping. reverts 83554a3c0fb2b57efa293efcc81a947b98a19469
* | | remove legacy bincompat stuff in Predef.scala, Stream.scalaSeth Tisue2015-07-211-1/+1
|/ / | | | | | | | | | | | | | | it was only there to preserve binary compatibility within the 2.11.x series includes updated partest, since the old partest ran afoul of the Stream change
* | bump versions.properties now that 2.12.0-M2 is outSeth Tisue2015-07-161-4/+4
| |
* | Prepare build for inclusion of java8-compatLukas Rytz2015-07-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | <h1>Allow mixed builds in ant</h1> The `JFunction` classes depend on the `FunctionN` traits, so the Java compiler needs the Scala library on the classpath. At the same time, while compiling the Scala library, the symbols for `JFunction` classes need to be available to emit indy-lambda closures. Therefore we pass the `JFunctions` as Java sources while compiling the Scala library. <h1>Upgrade versions of osgi tools</h1> Set the required java version in bnd files (JavaSE-1.8). Introduce `scala-swing.version.osgi` as a quick hack to allow manually deriving an osgi-friendly version number for the `scala-swing.version.number`. The latter is used to resolve the artifact, the osgi version is just so we can generate a bundle that osgi will accept. Bnd 1.50 doesn't work with Java 8 classfiles, so upgrade to 2.4.1. Also upgrade all other tools to make tests pass. For `org.eclipse.osgi` we moved to the group ID `org.eclipse.tycho`, where there's a newer version available. The osgi tests would fail with the most recent version available in the `org.eclipse.osgi` groupID. The new version of bnd only copies *classfiles* from the original into the resulting jar, while the old version also copied all other files. This caused osgi test failure with a `NoClassDefFound`, which was really due to a `NumberFormatException` in `ScalaVersion`, as it couldn't find the properties file to parse the version in... Include resources from source jar into osgi bundle as follows: ``` Include-Resource: @@SOURCE_JARNAME@ ``` This makes bnd copy all resources from the source jar. I ran the following on the osgi artifacts of this branch, and on 2.11.x: ``` for f in `find build/osgi -name '*.jar' -a -not -name '*src.jar'`; do unzip -l $f | grep -v '\.class' ; done ``` Comparing the two file lists, things look OK: https://gist.github.com/lrytz/be08db051a53eded192d
* | Merge commit 'bb102e7' into merge-2.11-to-2.12-june-26Lukas Rytz2015-06-261-1/+1
|\|
| * Producers / Consumers AnalysisLukas Rytz2015-06-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ASM has a built-in `SourceValue` analysis which computes for each value a set of instructions that may possibly have constructed it. The ProdConsAnalyzer class provides additional queries over the result of the SourceValue analysis: - consumers of values - tracking producers / consumers through copying operations (load, store, etc) A fix to (and therefore a new version of) ASM was required. See here: https://github.com/scala/scala-asm/commit/94106a5472
* | Merge pull request #4578 from retronym/merge/2.11.x-to-2.12.x-20150624Adriaan Moors2015-06-241-1/+1
|\ \ | | | | | | Merge 2.11.x to 2.12.x
| * | Merge branch '2.11.x' into merge/2.11.x-to-2.12.x-20150624Jason Zaugg2015-06-241-1/+1
| |\|
| | * Nullness AnalysisLukas Rytz2015-05-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Tracks nullness of values using an ASM analyzer. Tracking nullness requires alias tracking for local variables and stack values. For example, after an instance call, local variables that point to the same object as the receiver are treated not-null.
* | | Bump swing version to 2.0.0-M2Lukas Rytz2015-06-241-1/+1
|/ / | | | | | | | | This will unbreak the nightly release, and allow building 2.12.0-M2 without overriding SWING_VER.
* | Merge commit '297eeb3' into merge-2.11-may-12Lukas Rytz2015-05-121-0/+1
|\|
| * Merge pull request #4499 from lrytz/removeAsmLukas Rytz2015-05-121-0/+1
| |\ | | | | | | Move ASM out of the repository [ci: last-only]
| | * Include ASM as a dependency in ANT buildLukas Rytz2015-05-111-0/+1
| | | | | | | | | | | | The classfiles are still integrated into scala-compiler.jar.
| * | [backport] Revert back to Scalacheck 1.11.x, fixes to bootstrap scriptAdriaan Moors2015-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Scalacheck 1.12.x cross-compiles to JS and will take more work to integrate. Make sure we never attempt to publish scalacheck to sonatype. Force checkout module refs in case of dirty workspace. Backport of f238586d1b9d93533ee9507b56a26a97c2b2501c
| * | [backport] Update versions.properitesLukas Rytz2015-05-061-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tagged revisions of the modules integrate the latest release of the sbt-scala-modules sbt plugin. This enables building with a new scala binary version (e.g. 2.12.0-M1) without failinig MiMa. Also updates the other external dependencies. Backport of 8da073cd6bfaaaf3789fc8b70a61ebb66a2f0ded
| * | [backport] Comments in versions.propertiesLukas Rytz2015-05-061-2/+8
| | | | | | | | | | | | Backport of f9153619380d755a531f887fe0bd63b6e6a91738
| * | [backport] Remove starr.use.released property (not in use anymore)Lukas Rytz2015-05-061-1/+0
| |/ | | | | | | Backport of 3b2abdf6af87debdfb01f22f185d2a35852218fc
* | Update versions.properties after 2.12.0-M1Lukas Rytz2015-05-051-3/+3
| | | | | | | | | | | | Use 2.12.0-M1 as starr. Also fixes comment in the bootstrap script.
* | Revert back to Scalacheck 1.11.x, fixes to bootstrap scriptAdriaan Moors2015-05-011-1/+1
| | | | | | | | | | | | | | | | | | Scalacheck 1.12.x cross-compiles to JS and will take more work to integrate. Make sure we never attempt to publish scalacheck to sonatype. Force checkout module refs in case of dirty workspace.
* | Remove akka-actor from scala-library-allLukas Rytz2015-04-301-1/+0
| | | | | | | | The 2.12 distribution will no longer ship an akka-actors jar.
* | Update versions.properitesLukas Rytz2015-04-301-9/+12
| | | | | | | | | | | | | | | | The tagged revisions of the modules integrate the latest release of the sbt-scala-modules sbt plugin. This enables building with a new scala binary version (e.g. 2.12.0-M1) without failinig MiMa. Also updates the other external dependencies.
* | Remove scala.actors and the actors migration module dependencyLukas Rytz2015-04-231-1/+0
| |
* | Remove the continuations plugin module dependencyLukas Rytz2015-04-231-5/+0
| |
* | Comments in versions.propertiesLukas Rytz2015-04-231-2/+8
| |
* | Remove starr.use.released property (not in use anymore)Lukas Rytz2015-04-231-1/+0
| |
* | Merge commit 'fedbfd7' into merge/2.11-to-2.12-apr-21Lukas Rytz2015-04-211-1/+1
|\|
| * Bump partest to 1.0.6Adriaan Moors2015-03-311-1/+1
| | | | | | | | To enable #4285
* | Merge commit 'f25a78e' into merge/2.11-to-2.12-apr-1Lukas Rytz2015-04-011-2/+2
|\|
| * Bump versions after 2.11.6 release.Adriaan Moors2015-03-021-2/+2
| |
* | Merge commit 'fcc20fe' into merge/2.11-to-2.12-apr-1Lukas Rytz2015-04-011-2/+2
|\|
| * Merge pull request #4296 from lrytz/t9105Adriaan Moors2015-02-131-1/+1
| |\ | | | | | | Fixes and tests for InnerClass / EnclsoingMethod classfile attributes
| | * Test java reflection on scala library / reflect / compiler jarsLukas Rytz2015-02-071-1/+1
| | | | | | | | | | | | | | | | | | | | | Run a number of Java reflection operations on all classes in scala library / reflect / compiler. The test is based on a draft by Jason.
| * | SI-8759 bump jline: support alt-gr-based keyboardsAdriaan Moors2015-02-121-1/+1
| |/ | | | | | | | | | | | | Users of German & Swedish keyboards can again type `]` in the REPL without crazy acrobatics. Fixed upstream in https://github.com/jline/jline2/pull/175
| * Merge pull request #4213 from soc/topic/scala-partest-1.0.3Adriaan Moors2015-02-051-1/+1
| |\ | | | | | | Update scala-partest dependency to 1.0.3
| | * Update scala-partest dependency to 1.0.3Simon Ochsenreither2014-12-161-1/+1
| | |
* | | Merge remote-tracking branch 'origin/2.11.x' into ↵Jason Zaugg2015-01-291-6/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | merge/2.11.x-to-2.12.x-20150129 Conflicts: build.number src/library/scala/concurrent/Future.scala versions.properties
| * | Bump versions for 2.11.5 release.Adriaan Moors2015-01-041-2/+2
| | |
| * | update to scala-parser-combinators 1.0.3Antoine Gourlay2014-12-151-1/+1
| |/
* | Merge commit '7ba38a0' into merge/2.11.x-to-2.12.x-20150129Jason Zaugg2015-01-291-2/+2
|\| | | | | | | | | | | | | | | Conflicts: build.number src/compiler/scala/tools/nsc/transform/ExtensionMethods.scala src/library/scala/collection/Iterator.scala versions.properties
| * Upgrade to scala-xml v1.0.3Adriaan Moors2014-12-041-1/+1
| | | | | | | | ... to avoid having to revert the fix for SI-8253
| * Fix InnerClass / EnclosingMethod attributesLukas Rytz2014-09-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit seems bigger than it is. Most of it is tests, and moving some code around. The actual changes are small, but a bit subtle. The InnerClass and EnclosingMethod attributes should now be close to the JVM spec (which is summarized in BTypes.scala). New tests make sure that changes to these attributes, and changes to the way Java reflection sees Scala classfiles, don't go unnoticed. A new file, BCodeAsmCommon, holds code that's shared between the two backend (it could hold more, future work). In general, the difficulty with emitting InnerClass / EnclosingMethod is that we need to find out source-level properties. We need to make sure to do enough phase-travelling, and work around destructive changes to the ownerchain in lambdalift (we use originalOwner a lot). The change to JavaMirrors is prompted by the change to the EnclosingMethod attribute, which changes Java reflection's answer to getEnclosingMethod and getEnclosingConstructor. Classes defined in field initializers no longer have an enclosing method, just an enclosing class, which broke an assumption in JavaMirrors. There's one change in erasure. Before this change, when an object declaration implements / overrides a method, and a bridge is required, then the bridge method was actually a ModuleSymbol (it would get the lateMETHOD flag and be emitted as a method anyway). This is confusing, when iterating through the members of a class, you can find two modules with the same name, and one of them doesn't have a module class. Now, such bridge methods will be MethodSymbols. Removed Symbol.originalEnclosingMethod, that is a backend thing and doesn't need to live in the symbol API.
| * Bump versions for Scala 2.11.2Lukas Rytz2014-07-231-6/+6
|/
* Bump jline version to 2.12 (Re: SI-8535)Adriaan Moors2014-07-151-0/+1
| | | | Move version info where it belongs: versions.properties
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-20 20:00:57 +0000