Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Sep 25, 2014
  1. @huitseeker

    Merge pull request #806 from huitseeker/sbt-reordering-backport

    huitseeker authored
    Backports PR #804 to 3.0.x-2.10
Commits on Sep 23, 2014
  1. @huitseeker

    Adds a test which checks sbt reorders libs on classpath

    huitseeker authored
    The commment added in 6c9516b
    was not explicit enough, which led m2eclipse-scala to reorder the classpath
    manually..
  2. @huitseeker

    Bumping tycho version

    huitseeker authored
    bumping aspectj
    
    adding complianceLevel
Commits on Dec 19, 2013
  1. @dragos

    Merge pull request #614 from dragos/release/scala-ide-3.0.x-juno

    dragos authored
    Bump version number to 3.0.3
Commits on Dec 17, 2013
  1. @dragos

    Bump version number to 3.0.3.

    dragos authored
  2. @dragos

    Merge pull request #611 from dragos/release/scala-ide-3.0.x-juno

    dragos authored
    Backport caching jars
  3. @dragos

    Add synchronisation around map `getOrElse`.

    dragos authored
    Needed for proper visibility, in case this code
    is called on different threads.
  4. @dragos

    Cache info about jar files that might contain Scala classifies.

    dragos authored
    Deciding wether a class file is produced by Scala is expensive (it entails
    parsing the binary). Instead, we cache the information per package fragment,
    assuming that a jar contains Scala-only or Java-only classifies. For
    mixed Java/Scala jars, behaviour depends on the first classfile that is
    accessed. It might lead to using the Java icon/classfile editor for
    Scala classfiles.
    
    A more fine-grained strategy could be used (caching per package, instead
    of jar file), but this patch has been running at a customer and solved
    the issue, so we go for the tried-solution.
    
    Fixes #1001999
    (cherry picked from commit 492a546)
    
    Conflicts:
    	org.scala-ide.sdt.core/src/scala/tools/eclipse/javaelements/ScalaClassFileProvider.scala
Commits on Dec 13, 2013
  1. @dragos

    Merge pull request #599 from dragos/issue/pointcut-allow-subclasses

    dragos authored
    Make pointcut pick up subclasses of ScalaJavaBuilder.
Commits on Dec 11, 2013
  1. @dragos

    Make pointcut pick up subclasses of ScalaJavaBuilder.

    dragos authored
    This fixes a problem at a customer (cleaning output folders, leading to
    empty output folders after successful builds), but I could not reproduce
    locally. Confirmed it works for said customer, so rolling back to main
    project.
Commits on Oct 8, 2013
  1. @dotta

    Merge pull request #560 from dotta/merge/3.0.x-into-3.0.x-juno

    dotta authored
    Merge/3.0.x into 3.0.x juno
  2. @dotta

    Merge remote-tracking branch 'origin/release/scala-ide-3.0.x' into me…

    dotta authored
    …rge/3.0.x-into-3.0.x-juno
  3. @dotta

    Merge pull request #559 from dotta/backport/518-and-533

    dotta authored
    Backport/518 and 533
Commits on Oct 7, 2013
  1. @dotta

    Correctly build projects that depend through exported dependencies.

    dotta authored
    The Scala builder optimised the case where the builder was triggered with
    no changes in a project, by skipping the call to the underlying Sbt builder.
    This is wrong when the project has no changes itself, but a dependent project has.
    
    Fixed #1001904.
    
    Consider for back porting to 3.0.x(cherry picked from commit 8eeb650)
    
    Conflicts:
    
    	org.scala-ide.sdt.core/src/scala/tools/eclipse/buildmanager/sbtintegration/EclipseSbtBuildManager.scala
  2. @dragos @dotta

    Mark output folders as "Derived".

    dragos authored dotta committed
    Derived folders won't appear in "Open Resource", polluting
    names with classfiles.
    
    Fixes #1000260 (which regressed at some point in time).(cherry picked from commit f97085f)
Commits on Sep 17, 2013
  1. @dragos

    Merge branch 'release/scala-ide-3.0.x' into release/scala-ide-3.0.x-juno

    dragos authored
    Bringing the Juno branch up to date.
  2. @dragos

    Merge pull request #540 from dotta/backport/3.0.x/use-zinc-artifacts-…

    dragos authored
    …published-by-dbuild
    
    Backport/3.0.x/use zinc artifacts published by dbuild
Commits on Sep 13, 2013
  1. @dotta
  2. @dotta

    Deleted unneeded import-package clauses in toolchain MANIFESTs

    dotta authored
    The maven build does no longer spits out warnings for unused package imports in MANIFESTs.
    (cherry picked from commit 73315a1)
  3. @dotta

    Adding organisation information in the POM to reduce duplication

    dotta authored
    In fact, the default value for Bundle-Vendor is ${pom.organization.name}
    (cherry picked from commit 1103501)
  4. @dotta

    No reason for putting the manifest in the ${basedir}

    dotta authored
    The one single reason for doing it is to allow to import in the workspace the
    `sbt.full.library` project, so that it can be correctly consumed by the
    dependent projects (e.g., the `core project). However, given we practically
    never had to do so in the past 6 months, it feels reasonable to remove the
    flexiblity in the name of a cleaner build. In case you will need to import he
    `sbt.full.library` project in Eclipse at any point, just create the required
    .classpath and .project, and copy/paste in the project's root the META-INF
    folder generated by the build (look in the target/ folder). Make  sure to do
    the same for the `sbt.compiler.interface` project.
    (cherry picked from commit e8a3410)
  5. @dotta

    Updated our build to use Zinc artifacts

    dotta authored
    * Updated our build to use the Zinc artifacts built and published by dbuild.  The
    main advantage is that we no longer need to build and publish the Sbt artifacts
    (which are exactly the same used by Zinc) that are used in the Scala IDE for
    incremental compilation.
    (cherry picked from commit 6d40a3c)
    
    * No need to put the sbt version number in the bundle name
    (cherry picked from commit 5763bb8)
    
    * Lifed up version for Sbt bundles in variable ${sbt.osgi.version}
    (cherry picked from commit 65306fd)
Commits on Sep 12, 2013
  1. @dotta

    Merge pull request #538 from dotta/merge/3.0.x-into-3.0.x-juno

    dotta authored
    Merge/3.0.x into 3.0.x juno
  2. @dotta

    Merge remote-tracking branch 'origin/release/scala-ide-3.0.x' into me…

    dotta authored
    …rge/3.0.x-into-3.0.x-juno
Commits on Sep 10, 2013
  1. @dotta

    Merge pull request #536 from dotta/backport/3.0.x/pr-529

    dotta authored
    Backport/3.0.x/pr 529
  2. @dotta

    Dumbed down `MainClassVerifier` to only check class vs module mismatch

    dotta authored
    Experience taught us that `MainClassVerifier` is trying to be too smart, and
    often prevents user from launching perfectly fine Scala launch configurations.
    The last manifestation was that it would prevent users from launching a main if
    defined in a JAR.
    
    The matter was discussed with the team and the agreed descision is to reduce
    the scope of the `MainClassVerifier` to only prevent users from:
    
    * launching a Scala application if the project contains build errors, and
    * provide feedback when trying to launch a Scala `class`, instead of a `object`
    
    Consequently, we no longer prevent users from launching a Scala application
    that is incorrectly configured (i.e., the classfile doesn't exist). The
    consequence is that a `NoClassFoundException` will be reported to the user in
    this case, which actually matches the behavior in the Eclipse Java support.
    
    Let's dive into the details and describe what are the extent of the changes
    carried out by this commit:
    
    * Check for build errors is performed only if the a classfile for the
      `mainTypeName` provided in the Run config can't be found. Hence, if the
      classfile exist, this allows you to run your application even if there are
      errors in the project.
    
    * `ScalaLaunchDelegate.finalLaunchCheck` does not longer call `super`. This is
      to avoid the Java Eclipse prompt is displayed. Instead, the `UIReporter` is
      called, and I've improved it to be a standard platform dialog. The improved
      dialog also allows users to by-pass the check.
    
    * This patch consciously breaks source compatibility (because I removed the
      `MainClassVerifier` constructor, and deleted the `ErrorReporter` trait).
      I could re-introduce them and use deprecation, but it doesn't seem worth the
      effort (and none has complained about this change during the review process).
    
    backport to release/scala-ide-3.0.x
    
    Re #1001882
    Fixes #1001878
    (cherry picked from commit 25095ec)
  3. @dotta
  4. @dotta

    Removed unused `mainContent` from `MainClassVerifierTest`

    dotta authored
    (cherry picked from commit fc433bf)
Commits on Sep 6, 2013
  1. @dotta

    Merge pull request #530 from dotta/backport/3.0.x/rollback-additional…

    dotta authored
    …-pc-synchronization-because-of-deadlock-at-startup
    
    Backport/3.0.x/rollback additional pc synchronization because of deadlock at startup
Commits on Sep 5, 2013
  1. @dotta

    Revert "Sync 'isDefined' in presentation compiler cache."

    dotta authored
    This reverts commit 3608a81.
    
    We need to revert this because of a possible deadlock at startup between the PC
    and the classpath resolution. More information on the related ticket (#1001875).
    
    backport to release/scala-ide-3.0.x
    
    Review by @dragos
    
    Re #1001880
    Fixes #1001875
    (cherry picked from commit 0858c9e)
Commits on Sep 4, 2013
  1. @dotta

    Merge pull request #524 from dotta/3.0.x/bump-version

    dotta authored
    3.0.x/bump version
  2. @dotta

    Bump version to 3.0.2-SNAPSHOT for next development cycle

    dotta authored
    This should have been done right after we cut the 3.0.1 release
    (i.e., development for 3.0.2 started with SHA:
    25cd2a3).
Commits on Sep 3, 2013
  1. @dotta

    Merge pull request #526 from dotta/backport/juno/semantic-highlightin…

    dotta authored
    …g-on-classfiles
    
    Backport/juno/semantic highlighting on classfiles
  2. @dotta

    Merge pull request #522 from dotta/backport/semantic-highlighting-on-…

    dotta authored
    …classfiles
    
    Backport/semantic highlighting on classfiles
  3. @skyluc

    Merge pull request #520 from skyluc/backport/511

    skyluc authored
    Backport/511
Something went wrong with that request. Please try again.