Skip to content

Commit 5f56246

Browse files
Merge #863
863: Fix `OKHTTP` dependency inconsistency r=brunoocasali a=larskristianhaga # Pull Request Following up on PR #856, that tried to fix the issue with dependency resolving to alpha version of the OKHTTP dependency. Example repo that showcases that `meilisearch-java:0.14.6` still resolves to OKHTTP `5.0.0-alpha.16`. https://github.com/larskristianhaga/Meilisearch-OKHTTP-dependency-crash-demo ## What does this PR do? - Pinning OKHTTP version to `4.12.0`, which is the same used as test scope. - Removed dependency selection rejection that did not work. ## PR checklist Please check if your PR fulfills the following requirements: - [X] Does this PR fix an existing issue, or have you listed the changes applied in the PR description (and why they are needed)? - [X] Have you read the contributing guidelines? - [X] Have you made sure that the title is accurate and descriptive of the changes? Thank you so much for contributing to Meilisearch! <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit - **Chores** - Updated the okhttp dependency to a fixed version (4.12.0). - Removed restrictions that previously blocked pre-release dependency versions. <!-- end of auto-generated comment: release notes by coderabbit.ai --> Co-authored-by: Lars Kristian Haga <[email protected]>
2 parents b5a0705 + 7859b79 commit 5f56246

File tree

1 file changed

+1
-12
lines changed

1 file changed

+1
-12
lines changed

build.gradle

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,6 @@ jacocoTestCoverageVerification {
3939
}
4040
}
4141
}
42-
configurations.all {
43-
resolutionStrategy {
44-
componentSelection {
45-
all { ComponentSelection selection ->
46-
if (selection.candidate.version =~ /(?i).*[.-](alpha|beta|rc|m)[.\d-]*/) {
47-
selection.reject("Pre-release versions are not allowed")
48-
}
49-
}
50-
}
51-
}
52-
}
5342

5443
repositories {
5544
mavenCentral()
@@ -64,7 +53,7 @@ dependencies {
6453
implementation 'com.google.code.gson:gson:2.12.1'
6554
implementation 'org.json:json:20250107'
6655
// https://mvnrepository.com/artifact/org.apache.httpcomponents.client5/httpclient5
67-
api 'com.squareup.okhttp3:okhttp:[4.10.0,5.0.0)'
56+
api 'com.squareup.okhttp3:okhttp:4.12.0'
6857

6958
// Use JUnit test framework
7059
testImplementation(platform('org.junit:junit-bom:5.11.4'))

0 commit comments

Comments
 (0)