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: scalaqube/scala-module-dependency-sample
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0d904f2
Choose a base ref
...
head repository: scala/scala-module-dependency-sample
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0684f5d
Choose a head ref
  • 12 commits
  • 8 files changed
  • 3 contributors

Commits on Oct 8, 2018

  1. Use scala.compat.version 

    Fixes warning:

    Expected all dependencies to require Scala version: 2.11.8
     sample:scala-module-dependency-sample:1.0-SNAPSHOT requires scala version: 2.11.8
     org.scala-lang.modules:scala-xml_2.11:1.0.6 requires scala version: 2.11.8
     org.scala-lang.modules:scala-parser-combinators_2.11:1.0.4 requires scala version: 2.11.6
    Multiple versions of scala libraries detected!
    @ashawley
    ashawley committed Oct 8, 2018
    Configuration menu
    Copy the full SHA
    d02477d View commit details
    Browse the repository at this point in the history

  2. Set encoding to UTF-8 

    Fix warning:

    Using platform encoding (UTF-8 actually) to copy filtered
    resources, i.e. build is platform dependent!
    @ashawley
    ashawley committed Oct 8, 2018
    Configuration menu
    Copy the full SHA
    6b3c5bd View commit details
    Browse the repository at this point in the history

  3. Add empty resources dirs 

    Fixes entry in build log:

    [INFO] skip non existing resourceDirectory maven-sample/src/main/resources
    [INFO] skip non existing resourceDirectory maven-sample/src/test/resources
    @ashawley
    ashawley committed Oct 8, 2018
    Configuration menu
    Copy the full SHA
    88437ee View commit details
    Browse the repository at this point in the history

  4. Mention scala.compat.version in README

    @ashawley
    ashawley committed Oct 8, 2018
    Configuration menu
    Copy the full SHA
    6151fb7 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2018

  1. Merge pull request scala#16 from ashawley/scala-compat-version 

    Use scala.compat.version
    @SethTisue
    SethTisue authored Oct 16, 2018
    Configuration menu
    Copy the full SHA
    2eb1a24 View commit details
    Browse the repository at this point in the history

  2. Update versions in examples

    @ashawley
    ashawley committed Oct 16, 2018
    Configuration menu
    Copy the full SHA
    fc58ff8 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2018

  1. Merge pull request scala#17 from ashawley/updates 

    Update versions in examples
    @SethTisue
    SethTisue authored Oct 17, 2018
    Configuration menu
    Copy the full SHA
    d2fda0a View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2018

  1. Run maven on 2.10 and 2.11 profiles

    @ashawley
    ashawley committed Oct 18, 2018
    Configuration menu
    Copy the full SHA
    a32995f View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2018

  1. Merge pull request scala#19 from ashawley/maven-profiles 

    Run maven on 2.10 and 2.11 profiles
    @SethTisue
    SethTisue authored Oct 19, 2018
    Configuration menu
    Copy the full SHA
    2cc8e9f View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2018

  1. Update sbt to 1.2.6, closes scala#18

    @Philippus
    Philippus committed Nov 3, 2018
    Configuration menu
    Copy the full SHA
    fd1f434 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2018

  1. Merge pull request scala#20 from Philippus/update-sbt 

    Update sbt to 1.2.6
    @SethTisue
    SethTisue authored Nov 14, 2018
    Configuration menu
    Copy the full SHA
    327a0ba View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2019

  1. add CC0 license

    @SethTisue
    SethTisue committed Feb 20, 2019
    Configuration menu
    Copy the full SHA
    0684f5d View commit details
    Browse the repository at this point in the history
Loading