mirror of
https://github.com/flutter/flutter.git
synced 2025-06-03 00:51:18 +00:00
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:
parent
b5697a0c6d
commit
15307a9c57
@ -98,6 +98,7 @@ class FlutterExtension {
|
||||
|
||||
return flutterVersionName
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// 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",
|
||||
"dependency_version_checker.gradle.kts")
|
||||
project.apply from: dependencyCheckerPluginPath
|
||||
} catch (Exception e) {
|
||||
// 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.
|
||||
} catch (Exception ignored) {
|
||||
project.logger.error("Warning: Flutter was unable to detect project Gradle, Java, " +
|
||||
"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);
|
||||
}
|
||||
}
|
||||
|
@ -235,7 +235,7 @@ class DependencyVersionChecker {
|
||||
errorGradleVersion.toString(),
|
||||
getPotentialGradleFix(project.getRootDir().getPath())
|
||||
)
|
||||
throw DependencyValidationException(errorMessage)
|
||||
throw GradleException(errorMessage)
|
||||
} else if (version < warnGradleVersion) {
|
||||
val warnMessage: String =
|
||||
getWarnMessage(
|
||||
@ -260,7 +260,7 @@ class DependencyVersionChecker {
|
||||
errorJavaVersion.toString(),
|
||||
POTENTIAL_JAVA_FIX
|
||||
)
|
||||
throw DependencyValidationException(errorMessage)
|
||||
throw GradleException(errorMessage)
|
||||
} else if (version < warnJavaVersion) {
|
||||
val warnMessage: String =
|
||||
getWarnMessage(
|
||||
@ -285,7 +285,7 @@ class DependencyVersionChecker {
|
||||
errorAGPVersion.toString(),
|
||||
getPotentialAGPFix(project.getRootDir().getPath())
|
||||
)
|
||||
throw DependencyValidationException(errorMessage)
|
||||
throw GradleException(errorMessage)
|
||||
} else if (version < warnAGPVersion) {
|
||||
val warnMessage: String =
|
||||
getWarnMessage(
|
||||
@ -310,7 +310,7 @@ class DependencyVersionChecker {
|
||||
errorKGPVersion.toString(),
|
||||
getPotentialKGPFix(project.getRootDir().getPath())
|
||||
)
|
||||
throw DependencyValidationException(errorMessage)
|
||||
throw GradleException(errorMessage)
|
||||
} else if (version < warnKGPVersion) {
|
||||
val warnMessage: String =
|
||||
getWarnMessage(
|
||||
|
Loading…
Reference in New Issue
Block a user