diff --git a/packages/flutter_tools/gradle/src/main/groovy/flutter.groovy b/packages/flutter_tools/gradle/src/main/groovy/flutter.groovy index e8645d7d4ce..8c759c6c603 100644 --- a/packages/flutter_tools/gradle/src/main/groovy/flutter.groovy +++ b/packages/flutter_tools/gradle/src/main/groovy/flutter.groovy @@ -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 { "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); - } -} diff --git a/packages/flutter_tools/gradle/src/main/kotlin/dependency_version_checker.gradle.kts b/packages/flutter_tools/gradle/src/main/kotlin/dependency_version_checker.gradle.kts index 7a38ed74d28..08650a6573e 100644 --- a/packages/flutter_tools/gradle/src/main/kotlin/dependency_version_checker.gradle.kts +++ b/packages/flutter_tools/gradle/src/main/kotlin/dependency_version_checker.gradle.kts @@ -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(