Skip to content

Commit 4ea4582

Browse files
RakambdaRakambda
authored
Merge pull request #927 from RakambdaOrg/develop
2.3.4
2 parents d9d6a2a + 839eb86 commit 4ea4582

14 files changed

Lines changed: 129 additions & 86 deletions

File tree

‎.github/dependabot.yml‎

Lines changed: 76 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,36 @@ registries:
33
dockerhub:
44
type: docker-registry
55
url: https://registry.hub.docker.com
6-
username: ${{ secrets.DOCKER_USERNAME }}
7-
password: ${{ secrets.DOCKER_TOKEN }}
6+
username: ${{ secrets.DOCKER_HUB_USERNAME }}
7+
password: ${{ secrets.DOCKER_HUB_TOKEN }}
88
replaces-base: true
99

1010
updates:
11+
- package-ecosystem: "gradle"
12+
directory: "/"
13+
assignees:
14+
- "Rakambda"
15+
schedule:
16+
interval: "daily"
17+
time: "05:00"
18+
timezone: "Europe/Paris"
19+
pull-request-branch-name:
20+
separator: "-"
21+
groups:
22+
log4j:
23+
patterns:
24+
- "org.apache.logging.log4j:log4j-core"
25+
- "org.apache.logging.log4j:log4j-slf4j2-impl"
26+
google-apis:
27+
patterns:
28+
- "com.google.api-client:google-api-client"
29+
- "com.google.oauth-client:google-oauth-client-jetty"
30+
- "com.google.apis:google-api-services-gmail"
31+
- "com.google.apis:google-api-services-calendar"
32+
# Disable while paths can't be ignored as it'd update all 'auto-approve-sync-files.yml', Renovate will handle exclusion
33+
# - <<: *defaults
34+
# package-ecosystem: "github-actions"
35+
# directory: "/"
1136
- package-ecosystem: "docker"
1237
directory: "/"
1338
assignees:
@@ -20,3 +45,52 @@ updates:
2045
separator: "-"
2146
registries:
2247
- dockerhub
48+
- package-ecosystem: "maven"
49+
directory: "/"
50+
assignees:
51+
- "Rakambda"
52+
schedule:
53+
interval: "daily"
54+
time: "05:00"
55+
timezone: "Europe/Paris"
56+
pull-request-branch-name:
57+
separator: "-"
58+
- package-ecosystem: "npm"
59+
directory: "/"
60+
assignees:
61+
- "Rakambda"
62+
schedule:
63+
interval: "daily"
64+
time: "05:00"
65+
timezone: "Europe/Paris"
66+
pull-request-branch-name:
67+
separator: "-"
68+
- package-ecosystem: "nuget"
69+
directory: "/"
70+
assignees:
71+
- "Rakambda"
72+
schedule:
73+
interval: "daily"
74+
time: "05:00"
75+
timezone: "Europe/Paris"
76+
pull-request-branch-name:
77+
separator: "-"
78+
groups:
79+
restsharp:
80+
patterns:
81+
- "restsharp"
82+
- "restsharp.*"
83+
opencvsharp4:
84+
patterns:
85+
- "opencvsharp4"
86+
- "opencvsharp4.*"
87+
- package-ecosystem: "pip"
88+
directory: "/"
89+
assignees:
90+
- "Rakambda"
91+
schedule:
92+
interval: "daily"
93+
time: "05:00"
94+
timezone: "Europe/Paris"
95+
pull-request-branch-name:
96+
separator: "-"

‎.github/renovate.json‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,7 @@
1010
"type: \uD83D\uDCDA dependencies"
1111
],
1212
"enabledManagers" : [
13-
"dockerfile",
14-
"maven",
15-
"nuget",
16-
"pip_requirements",
1713
"github-actions",
18-
"gradle",
1914
"gradle-wrapper",
2015
"cargo"
2116
],

‎.github/workflows/analyse.yml‎

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎.github/workflows/build-test-deploy.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
distribution: 'temurin'
2828
java-version: ${{ vars.JAVA_VERSION }}
2929
- name: Generate and submit dependency graph
30-
uses: gradle/actions/dependency-submission@v4.1.0
30+
uses: gradle/actions/dependency-submission@v4.2.0
3131
continue-on-error: true
3232

3333
build:
@@ -45,7 +45,7 @@ jobs:
4545
java-version: ${{ vars.JAVA_VERSION }}
4646

4747
- name: Setup Gradle
48-
uses: gradle/actions/setup-gradle@v4.1.0
48+
uses: gradle/actions/setup-gradle@v4.2.0
4949
- name: Build project
5050
run: |
5151
./gradlew \
@@ -86,7 +86,7 @@ jobs:
8686
distribution: 'temurin'
8787
java-version: ${{ vars.JAVA_VERSION }}
8888
- name: Setup Gradle
89-
uses: gradle/actions/setup-gradle@v4.1.0
89+
uses: gradle/actions/setup-gradle@v4.2.0
9090

9191
- name: Run tests
9292
run: |
@@ -105,7 +105,7 @@ jobs:
105105
with:
106106
report_paths: 'miner/build/test-results/test/*.xml'
107107
- name: Publish coverage on CodeCov
108-
uses: codecov/codecov-action@v4.6.0
108+
uses: codecov/codecov-action@v5.0.2
109109
if: always()
110110
with:
111111
token: ${{ secrets.CODECOV_TOKEN }}
@@ -150,7 +150,7 @@ jobs:
150150
distribution: 'temurin'
151151
java-version: ${{ vars.JAVA_VERSION }}
152152
- name: Setup Gradle
153-
uses: gradle/actions/setup-gradle@v4.1.0
153+
uses: gradle/actions/setup-gradle@v4.2.0
154154

155155
- name: Run tests
156156
run: |
@@ -169,7 +169,7 @@ jobs:
169169
with:
170170
report_paths: 'viewer/build/test-results/test/*.xml'
171171
- name: Publish coverage on CodeCov
172-
uses: codecov/codecov-action@v4.6.0
172+
uses: codecov/codecov-action@v5.0.2
173173
if: always()
174174
with:
175175
token: ${{ secrets.CODECOV_TOKEN }}
@@ -214,7 +214,7 @@ jobs:
214214
distribution: 'temurin'
215215
java-version: ${{ vars.JAVA_VERSION }}
216216
- name: Setup Gradle
217-
uses: gradle/actions/setup-gradle@v4.1.0
217+
uses: gradle/actions/setup-gradle@v4.2.0
218218

219219
- name: Calculate miner image name
220220
id: miner-image-name
@@ -244,7 +244,7 @@ jobs:
244244
distribution: 'temurin'
245245
java-version: ${{ vars.JAVA_VERSION }}
246246
- name: Setup Gradle
247-
uses: gradle/actions/setup-gradle@v4.1.0
247+
uses: gradle/actions/setup-gradle@v4.2.0
248248

249249
- name: Calculate viewer image name
250250
id: viewer-image-name

‎.github/workflows/manual-docker.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
distribution: 'temurin'
1818
java-version: ${{ vars.JAVA_VERSION }}
1919
- name: Setup Gradle
20-
uses: gradle/actions/setup-gradle@v4.1.0
20+
uses: gradle/actions/setup-gradle@v4.2.0
2121

2222
- name: Calculate miner image name
2323
id: miner-image-name
@@ -53,7 +53,7 @@ jobs:
5353
distribution: 'temurin'
5454
java-version: ${{ vars.JAVA_VERSION }}
5555
- name: Setup Gradle
56-
uses: gradle/actions/setup-gradle@v4.1.0
56+
uses: gradle/actions/setup-gradle@v4.2.0
5757

5858
- name: Calculate viewer image name
5959
id: viewer-image-name

‎.github/workflows/release.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
distribution: 'temurin'
2020
java-version: ${{ vars.JAVA_VERSION }}
2121
- name: Setup Gradle
22-
uses: gradle/actions/setup-gradle@v4.1.0
22+
uses: gradle/actions/setup-gradle@v4.2.0
2323

2424
- name: Push latest on Docker Hub
2525
run: |
@@ -42,7 +42,7 @@ jobs:
4242
distribution: 'temurin'
4343
java-version: ${{ vars.JAVA_VERSION }}
4444
- name: Setup Gradle
45-
uses: gradle/actions/setup-gradle@v4.1.0
45+
uses: gradle/actions/setup-gradle@v4.2.0
4646

4747
- name: Push latest on Docker Hub
4848
run: |
@@ -66,14 +66,14 @@ jobs:
6666
distribution: 'temurin'
6767
java-version: ${{ vars.JAVA_VERSION }}
6868
- name: Setup Gradle
69-
uses: gradle/actions/setup-gradle@v4.1.0
69+
uses: gradle/actions/setup-gradle@v4.2.0
7070

7171
- name: Build project
7272
run: |
7373
./gradlew \
7474
assemble
7575
- name: Release
76-
uses: softprops/action-gh-release@v2.0.8
76+
uses: softprops/action-gh-release@v2.1.0
7777
with:
7878
fail_on_unmatched_files: false
7979
generate_release_notes: true

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version=2.3.3
1+
version=2.3.4

‎gradle/libs.versions.toml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
[versions]
22
slf4j-version = "2.0.16"
33
log4j2-version = "2.24.1"
4-
unirest-version = "4.4.4"
4+
unirest-version = "4.4.5"
55
picocli-version = "4.7.6"
6-
jackson-version = "2.18.0"
7-
jsonschema-generator-version = "4.36.0"
6+
jackson-version = "2.18.1"
7+
jsonschema-generator-version = "4.37.0"
88
httpclient-version = "4.5.14"
99
lang3-version = "3.17.0"
1010
commons-text-version = "1.12.0"
11-
jetbrains-annotations-version = "25.0.0"
11+
jetbrains-annotations-version = "26.0.1"
1212
websocket-version = "1.5.7"
13-
junitVersion = "5.11.1"
13+
junitVersion = "5.11.3"
1414
assertj-core-version = "3.26.3"
1515
assertj-db-version = "2.0.2"
16-
mockito-version = "5.14.1"
16+
mockito-version = "5.14.2"
1717
awaitility-version = "4.2.2"
18-
json-unit-version = "3.4.1"
18+
json-unit-version = "4.0.0"
1919
kitteh-irc-version = "9.0.0"
20-
hikari-cp-version = "6.0.0"
21-
mariadb-version = "3.4.1"
22-
sqlite-version = "3.46.1.3"
23-
mysql-version = "9.0.0"
20+
hikari-cp-version = "6.2.0"
21+
mariadb-version = "3.5.0"
22+
sqlite-version = "3.47.0.0"
23+
mysql-version = "9.1.0"
2424
rerunner-jupiter-version = "2.1.6"
25-
flyway-version = "10.18.2"
25+
flyway-version = "10.21.0"
2626
selenide-version = "7.5.1"
27-
lombok-version = "1.18.34"
27+
lombok-version = "1.18.36"
2828
jacocoVersion = "0.8.12"
2929

3030
shadow-version = "8.1.1"
3131
names-version = "0.51.0"
32-
jib-version = "3.4.3"
32+
jib-version = "3.4.4"
3333
git-properties-version = "2.4.2"
34-
springboot-version = "3.3.4"
34+
springboot-version = "3.3.5"
3535
springboot-dependencies-version = "1.1.6"
3636
test-logger-version = "4.0.0"
3737
git-version-plugin-version = "3.1.0"

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎miner/src/main/java/fr/rakambda/channelpointsminer/miner/api/gql/gql/data/types/DropCampaignSummary.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,8 @@
1919
public class DropCampaignSummary extends GQLType{
2020
@JsonProperty("includesSubRequirement")
2121
private boolean includesSubRequirement;
22+
@JsonProperty("isPermanentlyDismissible")
23+
private boolean permanentlyDismissible;
24+
@JsonProperty("isSitewide")
25+
private boolean sitewide;
2226
}

0 commit comments

Comments
 (0)