STS-470: Update conan version to 1.48.0 #296
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
|
adamlb94
commented
May 12, 2022
Comment on lines
-44
to
+53
| SRC="https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_x64_linux_hotspot_16.0.1_9.tar.gz" | ||
| SRC="https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz" | ||
| fi | ||
|
|
||
| if "$darwin" = "true"; then | ||
| SRC="https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_x64_mac_hotspot_16.0.1_9.tar.gz" | ||
| SRC="https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_mac_hotspot_16.0.2_7.tar.gz" | ||
| export JAVA_HOME="$JAVA_HOME/Contents/Home" | ||
| fi | ||
|
|
||
| if "$windows" = "true"; then | ||
| SRC="https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_x64_windows_hotspot_16.0.1_9.zip" | ||
| SRC="https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_windows_hotspot_16.0.2_7.zip" |
There was a problem hiding this comment.
These changes seem to have been made automatically by a build script. The only manual change I made is in the build.gradle file
There was a problem hiding this comment.
It's probably fine, I'm just wondering why it did that / why it was necessary.
@dsypniewski what do you think?
There was a problem hiding this comment.
This seems fine to me. My best guess is that curiostack rebuilt their packages with newer minor versions of java when moving away from bintray.
dsypniewski
approved these changes
May 13, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
:stubs:cpp:downloadConanDepsgradle task fails with errorImportError: cannot import name 'soft_unicode' from 'markupsafe'