Merge branch 'master' into renovate/org.assertj-assertj-core-3.x

gradle-nexus · Aug 18, 2024 · f985ca7 · f985ca7
2 parents fdf1279 + 99f82a2
commit f985ca7
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 24 deletions.
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -25,7 +25,7 @@ jobs:
         java-version: 11
         distribution: 'zulu'
 
-    - uses: gradle/actions/setup-gradle@v3
+    - uses: gradle/actions/setup-gradle@v4
 
     - name: Run sanity check
       run: ./gradlew --stacktrace test

diff --git a/.github/workflows/gradle-latest-versions.yml b/.github/workflows/gradle-latest-versions.yml
@@ -17,7 +17,7 @@ jobs:
           java-version: 11
           distribution: 'zulu'
 
-      - uses: gradle/actions/setup-gradle@v3
+      - uses: gradle/actions/setup-gradle@v4
 
       - name: Fetch latest available Gradle versions
         run: |

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
diff --git a/.github/workflows/java-versions.yml b/.github/workflows/java-versions.yml
@@ -27,7 +27,7 @@ jobs:
           java-version: ${{ matrix.jdk }}
           distribution: 'zulu'
 
-      - uses: gradle/actions/setup-gradle@v3
+      - uses: gradle/actions/setup-gradle@v4
 
       # Workaround https://github.com/ajoberstar/gradle-stutter/issues/22
       - name: Reduce number of Gradle regressions builds

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -26,7 +26,7 @@ jobs:
         java-version: 11
         distribution: 'zulu'
 
-    - uses: gradle/actions/setup-gradle@v3
+    - uses: gradle/actions/setup-gradle@v4
 
     - name: "Build and Test"
       run: ./gradlew --stacktrace build compatTestJava11
diff --git a/renovate.json b/renovate.json
@@ -5,17 +5,11 @@
   ],
   "configMigration": true,
   "packageRules": [
-    {
-      "matchPackagePrefixes": [
-        "publishing:maven"
-      ],
-      "enabled": false
-    },
     {
       "groupName": "Retrofit monorepo",
       "description": "Group together all dependencies of Retrofit.",
-      "matchPackagePrefixes": [
-        "com.squareup.retrofit2:"
+      "matchPackageNames": [
+        "com.squareup.retrofit2:*"
       ]
     }
   ]