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: heremaps/here-sbt-bom
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.0.17
Choose a base ref
...
head repository: heremaps/here-sbt-bom
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1.0.18
Choose a head ref
  • 1 commit
  • 5 files changed
  • 1 contributor

Commits on Dec 10, 2024

  1. SDKJAVA-254 Failed to resolve NormalizedArtifact when -Dsbt.ivy.home … 

    …sets in .sbtops (#32)

Signed-off-by: Oleksandr Vyshniak <ext-oleksandr.vyshniak@here.com>
    @molekyla
    molekyla authored Dec 10, 2024
    Loading
    Loading status checks…

    Verified

    This commit was signed with the committer’s verified signature.
    phillebaba Philip Laine
    GPG key ID: F6D0B743CA3EFF33
    Verified
    Learn about vigilant mode
    Copy the full SHA
    cf8850b View commit details
2 changes: 1 addition & 1 deletion .github/workflows/check.yml
View file
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ on:
jobs:
check:

runs-on: ubuntu-latest
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v3
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ on:
jobs:
release:

runs-on: ubuntu-latest
runs-on: ubuntu-22.04
if: "!contains(github.event.head_commit.message, '[skip release]') && github.event.workflow_run.conclusion == 'success'"

steps:
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ on:
jobs:
test:

runs-on: ubuntu-latest
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v3
4 changes: 3 additions & 1 deletion plugin/src/main/scala/com/here/bom/internal/IvyPomLocator.scala
View file
Original file line number Diff line number Diff line change
@@ -58,9 +58,11 @@ object IvyPomLocator {
} else if (sbtIvyHome != null) {
sbtIvyHome = convertToAbsolutePath(sbtIvyHome)
adjustSystemProperty(logger, "sbt.ivy.home", sbtIvyHome)
adjustSystemProperty(logger, "ivy.home", sbtIvyHome)
} else if (ivyHome != null) {
ivyHome = convertToAbsolutePath(ivyHome)
adjustSystemProperty(logger, "sbt.ivy.home", sbtIvyHome)
adjustSystemProperty(logger, "sbt.ivy.home", ivyHome)
adjustSystemProperty(logger, "ivy.home", ivyHome)
}
}

10 changes: 10 additions & 0 deletions plugin/src/sbt-test/psv/custom_ivy_home_config/test
View file
Original file line number Diff line number Diff line change
@@ -7,4 +7,14 @@
> eval System.setProperty("ivy.home", "/tmp/custom-ivy-home")
# check that build succeeded for the same custom home locations
> reload
> package

#check build with only sbt.ivy.home defined
> eval System.setProperty("sbt.ivy.home", "/tmp/custom-ivy-home")
> reload
> package

#check build with only ivy.home defined
> eval System.setProperty("ivy.home", "/tmp/custom-ivy-home")
> reload
> package