Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: sbt/sbt
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.9.1
Choose a base ref
...
head repository: sbt/sbt
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.9.3
Choose a head ref
  • 11 commits
  • 9 files changed
  • 2 contributors

Commits on Jul 9, 2023

  1. Let ++ fall back to a bincompat Scala version 

    Fixes #7327

**Problem**
In builds with mixed Scala patch versions (like scalameta),
it's possible for a core subproject to be set to the lastest 2.12.x,
but the compiler plugin component is cross published to 2.12.0 etc.
`++ 2.12.0` in this case does not work since sbt 1.7.x onwards requires
the queried Scala version to be listed in `crossScalaVersions`.

**Solution**
This implements sbt 1.6.x-like fallback mechanism,
but instead of using the queried version (e.g. 2.12.0) it will set
the Scala version to one of listed versions that is binary compatible.
    @eed3si9n
    eed3si9n committed Jul 9, 2023
    Configuration menu
    Copy the full SHA
    de20328 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2023

  1. Merge pull request #7328 from eed3si9n/wip/cross_fix 

    Let ++ fall back to a bincompat Scala version
    @eed3si9n
    eed3si9n authored Jul 10, 2023
    Configuration menu
    Copy the full SHA
    bcc286d View commit details
    Browse the repository at this point in the history

  2. sbt 1.9.2

    @eed3si9n
    eed3si9n committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    5f6eb1b View commit details
    Browse the repository at this point in the history

  3. Add the aarch64 binaries for macOS to the sbtn mappings

    @julienrf
    julienrf committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    4111a8f View commit details
    Browse the repository at this point in the history

  4. Merge pull request #7329 from scalacenter/package-arm64-macos 

    Add the aarch64 binaries for macOS to the sbtn mappings
    @eed3si9n
    eed3si9n authored Jul 10, 2023
    Configuration menu
    Copy the full SHA
    fe4c515 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2023

  1. Revert "Add timeout to scripted statements" 

    This reverts commit 155526f.
    @eed3si9n
    eed3si9n committed Jul 23, 2023
    Configuration menu
    Copy the full SHA
    d5cde98 View commit details
    Browse the repository at this point in the history

  2. Keep the close method

    @eed3si9n
    eed3si9n committed Jul 23, 2023
    Configuration menu
    Copy the full SHA
    4c96f45 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #7336 from eed3si9n/wip/revert_timeout 

    Revert scripted timeout
    @eed3si9n
    eed3si9n authored Jul 23, 2023
    Configuration menu
    Copy the full SHA
    8d818e2 View commit details
    Browse the repository at this point in the history

  4. Zinc 1.9.3

    @eed3si9n
    eed3si9n committed Jul 23, 2023
    Configuration menu
    Copy the full SHA
    797b9da View commit details
    Browse the repository at this point in the history

  5. Merge pull request #7337 from eed3si9n/wip/bump_zinc 

    Zinc 1.9.3
    @eed3si9n
    eed3si9n authored Jul 23, 2023
    Configuration menu
    Copy the full SHA
    078d8c1 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2023

  1. sbt 1.9.3

    @eed3si9n
    eed3si9n committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    e1ffc2a View commit details
    Browse the repository at this point in the history
Loading