Skip to content

Commit 15307a9

Browse files
authored
Revert "Identify and re-throw our dependency checking errors in flutter.groovy (#149609)" (#149918)
This reverts commit 9d1de7b. Reverts due to log spam and crashing of the dependency version checker (which doesn't block the build but still isn't the desired outcome).
1 parent b5697a0 commit 15307a9

File tree

2 files changed

+7
-35
lines changed

2 files changed

+7
-35
lines changed

packages/flutter_tools/gradle/src/main/groovy/flutter.groovy

Lines changed: 3 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ class FlutterExtension {
9898

9999
return flutterVersionName
100100
}
101+
101102
}
102103

103104
// This buildscript block supplies dependencies for this file's own import
@@ -339,27 +340,10 @@ class FlutterPlugin implements Plugin<Project> {
339340
"packages", "flutter_tools", "gradle", "src", "main", "kotlin",
340341
"dependency_version_checker.gradle.kts")
341342
project.apply from: dependencyCheckerPluginPath
342-
} catch (Exception e) {
343-
// If the exception was thrown by us in the dependency version checker plugin then
344-
// re-throw it.
345-
Exception outer = e.getCause()
346-
if (outer != null) {
347-
Exception inner = outer.getCause()
348-
if (inner != null) {
349-
Exception unwrapped = inner.getCause()
350-
if (unwrapped != null) {
351-
if (unwrapped instanceof DependencyValidationException) {
352-
throw e
353-
}
354-
}
355-
}
356-
}
357-
358-
// Otherwise, dependency version checking has failed. Log and continue
359-
// the build.
343+
} catch (Exception ignored) {
360344
project.logger.error("Warning: Flutter was unable to detect project Gradle, Java, " +
361345
"AGP, and KGP versions. Skipping dependency version checking. Error was: "
362-
+ e)
346+
+ ignored)
363347
}
364348
}
365349

@@ -1830,15 +1814,3 @@ class FlutterTask extends BaseFlutterTask {
18301814
}
18311815

18321816
}
1833-
1834-
// Custom error for when the dependency_version_checker.kts script finds a dependency out of
1835-
// the defined support range.
1836-
class DependencyValidationException extends Exception {
1837-
public DependencyValidationException(String errorMessage) {
1838-
super(errorMessage);
1839-
}
1840-
1841-
public DependencyValidationException(String errorMessage, Throwable cause) {
1842-
super(errorMessage, cause);
1843-
}
1844-
}

packages/flutter_tools/gradle/src/main/kotlin/dependency_version_checker.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ class DependencyVersionChecker {
235235
errorGradleVersion.toString(),
236236
getPotentialGradleFix(project.getRootDir().getPath())
237237
)
238-
throw DependencyValidationException(errorMessage)
238+
throw GradleException(errorMessage)
239239
} else if (version < warnGradleVersion) {
240240
val warnMessage: String =
241241
getWarnMessage(
@@ -260,7 +260,7 @@ class DependencyVersionChecker {
260260
errorJavaVersion.toString(),
261261
POTENTIAL_JAVA_FIX
262262
)
263-
throw DependencyValidationException(errorMessage)
263+
throw GradleException(errorMessage)
264264
} else if (version < warnJavaVersion) {
265265
val warnMessage: String =
266266
getWarnMessage(
@@ -285,7 +285,7 @@ class DependencyVersionChecker {
285285
errorAGPVersion.toString(),
286286
getPotentialAGPFix(project.getRootDir().getPath())
287287
)
288-
throw DependencyValidationException(errorMessage)
288+
throw GradleException(errorMessage)
289289
} else if (version < warnAGPVersion) {
290290
val warnMessage: String =
291291
getWarnMessage(
@@ -310,7 +310,7 @@ class DependencyVersionChecker {
310310
errorKGPVersion.toString(),
311311
getPotentialKGPFix(project.getRootDir().getPath())
312312
)
313-
throw DependencyValidationException(errorMessage)
313+
throw GradleException(errorMessage)
314314
} else if (version < warnKGPVersion) {
315315
val warnMessage: String =
316316
getWarnMessage(

0 commit comments

Comments
 (0)