Skip to content

Commit f985ca7

Browse files
authored
Merge branch 'master' into renovate/org.assertj-assertj-core-3.x
2 parents fdf1279 + 99f82a2 commit f985ca7

File tree

6 files changed

+6
-24
lines changed

6 files changed

+6
-24
lines changed

.github/workflows/e2e.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
java-version: 11
2626
distribution: 'zulu'
2727

28-
- uses: gradle/actions/setup-gradle@v3
28+
- uses: gradle/actions/setup-gradle@v4
2929

3030
- name: Run sanity check
3131
run: ./gradlew --stacktrace test

.github/workflows/gradle-latest-versions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
java-version: 11
1818
distribution: 'zulu'
1919

20-
- uses: gradle/actions/setup-gradle@v3
20+
- uses: gradle/actions/setup-gradle@v4
2121

2222
- name: Fetch latest available Gradle versions
2323
run: |

.github/workflows/gradle-wrapper-validation.yml

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

.github/workflows/java-versions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
java-version: ${{ matrix.jdk }}
2828
distribution: 'zulu'
2929

30-
- uses: gradle/actions/setup-gradle@v3
30+
- uses: gradle/actions/setup-gradle@v4
3131

3232
# Workaround https://github.com/ajoberstar/gradle-stutter/issues/22
3333
- name: Reduce number of Gradle regressions builds

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
java-version: 11
2727
distribution: 'zulu'
2828

29-
- uses: gradle/actions/setup-gradle@v3
29+
- uses: gradle/actions/setup-gradle@v4
3030

3131
- name: "Build and Test"
3232
run: ./gradlew --stacktrace build compatTestJava11

renovate.json

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,11 @@
55
],
66
"configMigration": true,
77
"packageRules": [
8-
{
9-
"matchPackagePrefixes": [
10-
"publishing:maven"
11-
],
12-
"enabled": false
13-
},
148
{
159
"groupName": "Retrofit monorepo",
1610
"description": "Group together all dependencies of Retrofit.",
17-
"matchPackagePrefixes": [
18-
"com.squareup.retrofit2:"
11+
"matchPackageNames": [
12+
"com.squareup.retrofit2:*"
1913
]
2014
}
2115
]

0 commit comments

Comments
 (0)