Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

STS-470: Update conan version to 1.48.0 #296

Merged
merged 1 commit into from
May 13, 2022
Merged

STS-470: Update conan version to 1.48.0 #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ plugins {
conda {
'miniconda-build' {
packages.addAll('cmake==3.14.0', 'pandoc')
pythonPackages.addAll('conan==1.37.2', 'grpcio-tools==1.38.0', 'pdoc==7.1.1', 'twine==3.4.1')
pythonPackages.addAll('conan==1.48.0', 'grpcio-tools==1.38.0', 'pdoc==7.1.1', 'twine==3.4.1')
}
}

Expand Down
6 changes: 3 additions & 3 deletions gradle/get-jdk.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,16 @@ export JAVA_HOME="$OPENJDK_DIR/jdk-16.0.1+9"
DEST="$OPENJDK_DIR/jdk-16.0.1+9.tar.gz.or.zip"

if "$linux" = "true"; then
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"
Comment on lines -44 to +53
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These changes seem to have been made automatically by a build script. The only manual change I made is in the build.gradle file

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's probably fine, I'm just wondering why it did that / why it was necessary.
@dsypniewski what do you think?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

fi

if [ ! -d "$JAVA_HOME" ]; then
Expand Down