corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1957058 - Upgrade spotless to 7.0.2. r=geckoview-reviewers,owlish

Browse Source 
Output directory is changed to spotless-clean or spotless-lints [*1].

* faa56fca88

Differential Revision: https://phabricator.services.mozilla.com/D243437
This commit is contained in:
Makoto Kato
2025-04-21 06:19:02 +00:00
parent acb55c58a8
commit 243e7da924
2 changed files with 32 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle/libs.versions.toml
View File

@@ -101,7 +101,7 @@ adjust = "5.3.0"
sentry = "8.8.0"
commons-exec = "1.3"
spotless = "6.25.0"
spotless = "7.0.2"
tomlj = "1.1.0"
[libraries]

61
tools/lint/android/lints.py
View File

@@ -107,36 +107,37 @@ def format(config, fix=None, **lintargs):
results = []
for path in lintargs["substs"]["GRADLE_ANDROID_FORMAT_LINT_FOLDERS"]:
folder = os.path.join(
topobjdir, "gradle", "build", path, "spotless", "spotlessJava"
)
for filename in glob.iglob(folder + "/**/*.java", recursive=True):
err = {
"rule": "spotless-java",
"path": os.path.join(
topsrcdir, path, mozpath.relpath(filename, folder)
),
"lineno": 0,
"column": 0,
"message": "Formatting error, please run ./mach lint -l android-format --fix",
"level": "error",
}
results.append(result.from_config(config, **err))
folder = os.path.join(
topobjdir, "gradle", "build", path, "spotless", "spotlessKotlin"
)
for filename in glob.iglob(folder + "/**/*.kt", recursive=True):
err = {
"rule": "spotless-kt",
"path": os.path.join(
topsrcdir, path, mozpath.relpath(filename, folder)
),
"lineno": 0,
"column": 0,
"message": "Formatting error, please run ./mach lint -l android-format --fix",
"level": "error",
}
results.append(result.from_config(config, **err))
for outdir in ("spotless-clean", "spotless-lints"):
folder = os.path.join(
topobjdir, "gradle", "build", path, outdir, "spotlessJava"
)
for filename in glob.iglob(folder + "/**/*.java", recursive=True):
err = {
"rule": "spotless-java",
"path": os.path.join(
topsrcdir, path, mozpath.relpath(filename, folder)
),
"lineno": 0,
"column": 0,
"message": "Formatting error, please run ./mach lint -l android-format --fix",
"level": "error",
}
results.append(result.from_config(config, **err))
folder = os.path.join(
topobjdir, "gradle", "build", path, outdir, "spotlessKotlin"
)
for filename in glob.iglob(folder + "/**/*.kt", recursive=True):
err = {
"rule": "spotless-kt",
"path": os.path.join(
topsrcdir, path, mozpath.relpath(filename, folder)
),
"lineno": 0,
"column": 0,
"message": "Formatting error, please run ./mach lint -l android-format --fix",
"level": "error",
}
results.append(result.from_config(config, **err))
if len(results) == 0 and ret != 0:
# spotless seems to hit unfixed error.