Revert "Identify and re-throw our dependency checking errors in flutter.groovy (#149609)" (#149918)

This reverts commit 9d1de7b674.

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).
This commit is contained in:
Gray Mackall 2024-06-07 13:07:06 -07:00 committed by GitHub
parent b5697a0c6d
commit 15307a9c57
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 35 deletions

View File

@ -98,6 +98,7 @@ class FlutterExtension {
return flutterVersionName return flutterVersionName
} }
} }
// This buildscript block supplies dependencies for this file's own import // This buildscript block supplies dependencies for this file's own import
@ -339,27 +340,10 @@ class FlutterPlugin implements Plugin<Project> {
"packages", "flutter_tools", "gradle", "src", "main", "kotlin", "packages", "flutter_tools", "gradle", "src", "main", "kotlin",
"dependency_version_checker.gradle.kts") "dependency_version_checker.gradle.kts")
project.apply from: dependencyCheckerPluginPath project.apply from: dependencyCheckerPluginPath
} catch (Exception e) { } catch (Exception ignored) {
// If the exception was thrown by us in the dependency version checker plugin then
// re-throw it.
Exception outer = e.getCause()
if (outer != null) {
Exception inner = outer.getCause()
if (inner != null) {
Exception unwrapped = inner.getCause()
if (unwrapped != null) {
if (unwrapped instanceof DependencyValidationException) {
throw e
}
}
}
}
// Otherwise, dependency version checking has failed. Log and continue
// the build.
project.logger.error("Warning: Flutter was unable to detect project Gradle, Java, " + project.logger.error("Warning: Flutter was unable to detect project Gradle, Java, " +
"AGP, and KGP versions. Skipping dependency version checking. Error was: " "AGP, and KGP versions. Skipping dependency version checking. Error was: "
+ e) + ignored)
} }
} }
@ -1830,15 +1814,3 @@ class FlutterTask extends BaseFlutterTask {
} }
} }
// Custom error for when the dependency_version_checker.kts script finds a dependency out of
// the defined support range.
class DependencyValidationException extends Exception {
public DependencyValidationException(String errorMessage) {
super(errorMessage);
}
public DependencyValidationException(String errorMessage, Throwable cause) {
super(errorMessage, cause);
}
}

View File

@ -235,7 +235,7 @@ class DependencyVersionChecker {
errorGradleVersion.toString(), errorGradleVersion.toString(),
getPotentialGradleFix(project.getRootDir().getPath()) getPotentialGradleFix(project.getRootDir().getPath())
) )
throw DependencyValidationException(errorMessage) throw GradleException(errorMessage)
} else if (version < warnGradleVersion) { } else if (version < warnGradleVersion) {
val warnMessage: String = val warnMessage: String =
getWarnMessage( getWarnMessage(
@ -260,7 +260,7 @@ class DependencyVersionChecker {
errorJavaVersion.toString(), errorJavaVersion.toString(),
POTENTIAL_JAVA_FIX POTENTIAL_JAVA_FIX
) )
throw DependencyValidationException(errorMessage) throw GradleException(errorMessage)
} else if (version < warnJavaVersion) { } else if (version < warnJavaVersion) {
val warnMessage: String = val warnMessage: String =
getWarnMessage( getWarnMessage(
@ -285,7 +285,7 @@ class DependencyVersionChecker {
errorAGPVersion.toString(), errorAGPVersion.toString(),
getPotentialAGPFix(project.getRootDir().getPath()) getPotentialAGPFix(project.getRootDir().getPath())
) )
throw DependencyValidationException(errorMessage) throw GradleException(errorMessage)
} else if (version < warnAGPVersion) { } else if (version < warnAGPVersion) {
val warnMessage: String = val warnMessage: String =
getWarnMessage( getWarnMessage(
@ -310,7 +310,7 @@ class DependencyVersionChecker {
errorKGPVersion.toString(), errorKGPVersion.toString(),
getPotentialKGPFix(project.getRootDir().getPath()) getPotentialKGPFix(project.getRootDir().getPath())
) )
throw DependencyValidationException(errorMessage) throw GradleException(errorMessage)
} else if (version < warnKGPVersion) { } else if (version < warnKGPVersion) {
val warnMessage: String = val warnMessage: String =
getWarnMessage( getWarnMessage(