Skip to content

Commit 1b24185

Browse files
authored
Merge branch 'main' into feat/add-ai-powered-search
2 parents 9272e76 + 5e0caf7 commit 1b24185

File tree

5 files changed

+22
-21
lines changed

5 files changed

+22
-21
lines changed

.code-samples.meilisearch.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -459,14 +459,14 @@ getting_started_add_documents: |-
459459
// <dependency>
460460
// <groupId>com.meilisearch.sdk</groupId>
461461
// <artifactId>meilisearch-java</artifactId>
462-
// <version>0.14.6</version>
462+
// <version>0.14.7</version>
463463
// <type>pom</type>
464464
// </dependency>
465465
466466
// For Gradle
467467
// Add the following line to the `dependencies` section of your `build.gradle`:
468468
//
469-
// implementation 'com.meilisearch.sdk:meilisearch-java:0.14.6'
469+
// implementation 'com.meilisearch.sdk:meilisearch-java:0.14.7'
470470
471471
// In your .java file:
472472
import com.meilisearch.sdk;

.github/dependabot.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ updates:
88
- 'skip-changelog'
99
- 'dependencies'
1010
rebase-strategy: disabled
11+
groups:
12+
github-actions:
13+
patterns:
14+
- "*"
1115

1216
- package-ecosystem: gradle
1317
directory: "/"
@@ -19,3 +23,11 @@ updates:
1923
- skip-changelog
2024
- dependencies
2125
rebase-strategy: disabled
26+
groups:
27+
gradle-plugins:
28+
patterns:
29+
- "io.github.gradle-nexus.publish-plugin*"
30+
- "com.diffplug.spotless*"
31+
gradle-dependencies:
32+
patterns:
33+
- "*"

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Add the following code to the `<dependencies>` section of your project:
5858
<dependency>
5959
<groupId>com.meilisearch.sdk</groupId>
6060
<artifactId>meilisearch-java</artifactId>
61-
<version>0.14.6</version>
61+
<version>0.14.7</version>
6262
<type>pom</type>
6363
</dependency>
6464
```
@@ -68,7 +68,7 @@ Add the following code to the `<dependencies>` section of your project:
6868
Add the following line to the `dependencies` section of your `build.gradle`:
6969

7070
```groovy
71-
implementation 'com.meilisearch.sdk:meilisearch-java:0.14.6'
71+
implementation 'com.meilisearch.sdk:meilisearch-java:0.14.7'
7272
```
7373

7474
:warning: `meilisearch-java` also requires `okhttp` as a peer dependency.

build.gradle

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ plugins {
1818

1919
group = 'com.meilisearch.sdk'
2020
archivesBaseName = 'meilisearch-java'
21-
version = '0.14.6'
21+
version = '0.14.7'
2222

2323
java {
2424
sourceCompatibility = JavaVersion.VERSION_1_8
@@ -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()
@@ -61,18 +50,18 @@ configurations {
6150

6251
dependencies {
6352
// This dependency is used internally, and not exposed to consumers on their own compile classpath.
64-
implementation 'com.google.code.gson:gson:2.12.1'
65-
implementation 'org.json:json:20250107'
53+
implementation 'com.google.code.gson:gson:2.13.1'
54+
implementation 'org.json:json:20250517'
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'))
7160
testImplementation('org.junit.jupiter:junit-jupiter:5.11.4')
7261
// https://mvnrepository.com/artifact/org.mockito/mockito-core
7362
testImplementation 'org.mockito:mockito-core:4.9.0'
7463
testImplementation 'org.hamcrest:hamcrest:3.0'
75-
testImplementation 'com.squareup.okio:okio:3.11.0'
64+
testImplementation 'com.squareup.okio:okio:3.12.0'
7665
testImplementation 'com.squareup.okhttp3:okhttp:4.12.0'
7766
testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.19.0'
7867

src/main/java/com/meilisearch/sdk/Version.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.meilisearch.sdk;
22

33
public class Version {
4-
static final String VERSION = "0.14.6";
4+
static final String VERSION = "0.14.7";
55

66
public static String getQualifiedVersion() {
77
return "Meilisearch Java (v" + VERSION + ")";

0 commit comments

Comments
 (0)