From b801a3342d518f9e1100536e1fbfef9d84b310e3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 29 May 2024 07:47:12 +0000 Subject: [PATCH 01/10] Add renovate.json --- renovate.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 renovate.json diff --git a/renovate.json b/renovate.json new file mode 100644 index 000000000000..5db72dd6a94f --- /dev/null +++ b/renovate.json @@ -0,0 +1,6 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "extends": [ + "config:recommended" + ] +} From 89a6d1339bef1300975b316acf3bc341f7ab0e51 Mon Sep 17 00:00:00 2001 From: Wojtek Zieba Date: Wed, 29 May 2024 09:53:19 +0200 Subject: [PATCH 02/10] Add Renovate configuration for a8c dependencies only - separateMajorMinor to not create seperate PRs for a single dependency - versioning=semver-coerced to not create PRs for intermediate created for each PR/commit. We only care about released versions --- renovate.json | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/renovate.json b/renovate.json index 5db72dd6a94f..5cbd45e07c62 100644 --- a/renovate.json +++ b/renovate.json @@ -2,5 +2,31 @@ "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": [ "config:recommended" + ], + "packageRules": [ + { + "enabled": false, + "packagePatterns": [ + "*" + ] + }, + { + "enabled": true, + "matchDepPatterns": [ + "automattic" + ], + "separateMajorMinor": false + }, + { + "enabled": true, + "enabledManagers": [ + "gradle" + ], + "matchDepPatterns": [ + "automattic" + ], + "separateMajorMinor": false, + "versioning": "semver-coerced" + } ] } From ddab08a922a39ce129efd7415aa58aabde6b4678 Mon Sep 17 00:00:00 2001 From: Wojtek Zieba Date: Wed, 29 May 2024 10:10:01 +0200 Subject: [PATCH 03/10] Add wpreleasetoolkit to renovate whitelist configuration --- renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index 5cbd45e07c62..977c9e6392ff 100644 --- a/renovate.json +++ b/renovate.json @@ -13,7 +13,7 @@ { "enabled": true, "matchDepPatterns": [ - "automattic" + "automattic|wpmreleasetoolkit" ], "separateMajorMinor": false }, From c8c3aada869a4dcffeb154fbd791b1a479173642 Mon Sep 17 00:00:00 2001 From: Wojtek Zieba Date: Thu, 30 May 2024 11:35:28 +0200 Subject: [PATCH 04/10] Configure renovate to prepare PRs for all wordpress Gradle dependencies --- renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index 977c9e6392ff..ff50c7cd497c 100644 --- a/renovate.json +++ b/renovate.json @@ -23,7 +23,7 @@ "gradle" ], "matchDepPatterns": [ - "automattic" + "automattic|wordpress" ], "separateMajorMinor": false, "versioning": "semver-coerced" From c5a0f96f9c1ebf4cba0c83fa76a7880d3787e4c4 Mon Sep 17 00:00:00 2001 From: Wojtek Zieba Date: Thu, 30 May 2024 11:49:55 +0200 Subject: [PATCH 05/10] Whitelist `gravatar` dependencies as well --- renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index ff50c7cd497c..7f073e3a3ff2 100644 --- a/renovate.json +++ b/renovate.json @@ -23,7 +23,7 @@ "gradle" ], "matchDepPatterns": [ - "automattic|wordpress" + "automattic|wordpress|gravatar" ], "separateMajorMinor": false, "versioning": "semver-coerced" From bb64d966861dce8c2a66c7e535126c4da9c85164 Mon Sep 17 00:00:00 2001 From: Wojtek Zieba Date: Thu, 30 May 2024 12:00:20 +0200 Subject: [PATCH 06/10] Ignore case in regex for matching dependencies So, e.g. `Automattic/dangermattic` will match now --- renovate.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/renovate.json b/renovate.json index 7f073e3a3ff2..7598c418af4b 100644 --- a/renovate.json +++ b/renovate.json @@ -13,7 +13,7 @@ { "enabled": true, "matchDepPatterns": [ - "automattic|wpmreleasetoolkit" + "/automattic|wpmreleasetoolkit/i" ], "separateMajorMinor": false }, @@ -23,7 +23,7 @@ "gradle" ], "matchDepPatterns": [ - "automattic|wordpress|gravatar" + "/automattic|wordpress|gravatar/i" ], "separateMajorMinor": false, "versioning": "semver-coerced" From b0a3cce38743a92a07d1ed288dcdd28f36c3db13 Mon Sep 17 00:00:00 2001 From: Wojtek Zieba Date: Thu, 30 May 2024 12:08:04 +0200 Subject: [PATCH 07/10] Fix invalid regex --- renovate.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/renovate.json b/renovate.json index 7598c418af4b..4e9780c9563f 100644 --- a/renovate.json +++ b/renovate.json @@ -13,7 +13,7 @@ { "enabled": true, "matchDepPatterns": [ - "/automattic|wpmreleasetoolkit/i" + "automattic|wpmreleasetoolkit/i" ], "separateMajorMinor": false }, @@ -23,7 +23,7 @@ "gradle" ], "matchDepPatterns": [ - "/automattic|wordpress|gravatar/i" + "automattic|wordpress|gravatar/i" ], "separateMajorMinor": false, "versioning": "semver-coerced" From 28cc7fa3489fb71f9a3fc99325522bf557264213 Mon Sep 17 00:00:00 2001 From: Wojtek Zieba Date: Thu, 30 May 2024 12:42:36 +0200 Subject: [PATCH 08/10] Add `dangermattic` to the whitelist. --- renovate.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/renovate.json b/renovate.json index 4e9780c9563f..1a19f259875d 100644 --- a/renovate.json +++ b/renovate.json @@ -13,7 +13,7 @@ { "enabled": true, "matchDepPatterns": [ - "automattic|wpmreleasetoolkit/i" + "automattic|wpmreleasetoolkit|dangermattic" ], "separateMajorMinor": false }, @@ -23,7 +23,7 @@ "gradle" ], "matchDepPatterns": [ - "automattic|wordpress|gravatar/i" + "automattic|wordpress|gravatar" ], "separateMajorMinor": false, "versioning": "semver-coerced" From 6d992db32b8720a358aabd2eec2f7e46a012a740 Mon Sep 17 00:00:00 2001 From: Wojtek Zieba Date: Thu, 30 May 2024 13:43:59 +0200 Subject: [PATCH 09/10] Specify version of dependencies in addition to version.strictly configuration This setting should not change how dependencies are resolved (strictly constraint is still applied). This change is for Renovate to correctly resolve versions of dependencies --- WordPress/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index ffb8fa889646..dac9c075fd0f 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -364,7 +364,7 @@ dependencies { implementation (project(path:':libs:editor')) { exclude group: 'org.wordpress', module: 'utils' } - implementation("$gradle.ext.fluxCBinaryPath") { + implementation("$gradle.ext.fluxCBinaryPath:$wordPressFluxCVersion") { version { strictly wordPressFluxCVersion } @@ -372,7 +372,7 @@ dependencies { exclude group: 'org.wordpress', module: 'utils' exclude group: 'com.android.support', module: 'support-annotations' } - implementation ("$gradle.ext.wputilsBinaryPath") { + implementation ("$gradle.ext.wputilsBinaryPath$wordPressUtilsVersion") { version { strictly wordPressUtilsVersion } @@ -383,7 +383,7 @@ dependencies { } implementation "$gradle.ext.aboutAutomatticBinaryPath:$automatticAboutVersion" - implementation("$gradle.ext.tracksBinaryPath") { + implementation("$gradle.ext.tracksBinaryPath:$automatticTracksVersion") { version { strictly automatticTracksVersion } From f7ef046b22d11fc5ef78b61ab8071a9b15cac16a Mon Sep 17 00:00:00 2001 From: Wojtek Zieba Date: Thu, 30 May 2024 13:47:59 +0200 Subject: [PATCH 10/10] add missing coma --- WordPress/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index dac9c075fd0f..0ad75722b44b 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -372,7 +372,7 @@ dependencies { exclude group: 'org.wordpress', module: 'utils' exclude group: 'com.android.support', module: 'support-annotations' } - implementation ("$gradle.ext.wputilsBinaryPath$wordPressUtilsVersion") { + implementation ("$gradle.ext.wputilsBinaryPath:$wordPressUtilsVersion") { version { strictly wordPressUtilsVersion }