summaryrefslogtreecommitdiff
path: root/versions.properties
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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
* Bump versions for Scala 2.11.1Adriaan Moors2014-05-201-6/+6
|
* Bump akka-actor version to 2.3.3 (ref SI-8549)Adriaan Moors2014-05-191-1/+1
| | | | | Because serialization affected akka, we're upgrading the included akka-actor to 2.3.3, which is built with Scala 2.11.1.
* Bump versions after release of 2.11.0-finalJason Zaugg2014-04-161-4/+4
| | | | | | New versions.properties generated by: https://scala-webapps.epfl.ch/jenkins/view/scala-release-2.11.x/job/scala-release-2.11.x/57/
* Bump Akka version to 2.3.2Jason Zaugg2014-04-151-1/+1
| | | | | | | | | | | | Quoth @rkuhn: > seeing that you are cutting a Scala release, we’ll need to > decide on which Akka version to bundle with it. 2.3.0 has > some remoting bugs which we’d like to leave behind Given the difficult of overriding the bundled Akka version from the Scala script runner (SI-8472), we've deemed it worthwhile to bump the Akka version before releasing 2.11.0.
* Bump versions after release of Scala 2.11.0-RC4Jason Zaugg2014-04-151-4/+4
| | | | | | | | | | Based on: https://scala-webapps.epfl.ch/jenkins/view/scala-release-2.11.x/job/scala-release-2.11.x/52/artifact/scala/versions.properties With a manual edit of the new property, scala.full.version, which was not written out by `ant -Dupdate.versions`. That has since been remedied.
* Render scala.full.version to versions.properties.Adriaan Moors2014-04-041-3/+7
| | | | | | | | | | | | | | | When called with -Dupdate.versions, the build will render its current set of versions to versions properties. This is used during releases, when bootstrapping to a consistent set of modules that constitute a release. Particularly, scala.full.version is the non-SNAPSHOT full version of scala that's closed to maven.version.number. It's similar in spirit to the module build's snapshotScalaBinaryVersion, except that it's always the full version, so, e.g., 2.11.1 rather than 2.11. This version is so far only used to determine the dependency on scala-continuations-plugin in scala-dist.
* Further tweak version of continuations plugin in scala-dist.pomJason Zaugg2014-04-031-0/+4
| | | | | | | | | | | | | | | | | | | | While we must use full version, rather than the cross version (12720e699), we need to use latest non-snapshot version. This should avoid failures like: https://jenkins.scala-ide.org:8496/jenkins/view/Scala%20Xsource%20flag%20nightlies/job/Akka/63/console Such as: [warn] :::::::::::::::::::::::::::::::::::::::::::::: [warn] :: UNRESOLVED DEPENDENCIES :: [warn] :::::::::::::::::::::::::::::::::::::::::::::: [warn] :: org.scala-lang.plugins#scala-continuations-plugin_2.11.0-SNAPSHOT;1.0.1: not found [warn] :::::::::::::::::::::::::::::::::::::::::::::: sbt.ResolveException: unresolved dependency: org.scala-lang.plugins#scala-continuations-plugin_2.11.0-SNAPSHOT;1.0.1:
* Bump versions for 2.11.0-RC3Adriaan Moors2014-03-181-8/+8
|
* RC3 will ship with akka-actor 2.3.0v2.11.0-RC3Adriaan Moors2014-03-181-1/+1
|