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

fix: make google-http-client.properties file shading friendly #1046

Merged
merged 1 commit into from
Oct 13, 2020
Merged

fix: make google-http-client.properties file shading friendly #1046

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
3 changes: 2 additions & 1 deletion google-http-client/src/main/java/com/google/api/client/http/HttpRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1224,7 +1224,8 @@ private static String getVersion() {
// this value should be read and cached for later use
String version = "unknown-version";
try (InputStream inputStream =
HttpRequest.class.getResourceAsStream("/google-http-client.properties")) {
HttpRequest.class.getResourceAsStream(
"/com/google/api/client/http/google-http-client.properties")) {
if (inputStream != null) {
final Properties properties = new Properties();
properties.load(inputStream);
Expand Down
0 ...n/resources/google-http-client.properties → ...client/http/google-http-client.properties
View file
Open in desktop
File renamed without changes.