From 25df74497cdb0738d568cdda6f75e9b0787b24a3 Mon Sep 17 00:00:00 2001 From: Brian Quinlan Date: Tue, 2 Jan 2024 13:05:56 -0800 Subject: [PATCH] Update prepare_for_embedded.dart --- .../tool/prepare_for_embedded.dart | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/pkgs/cronet_http/tool/prepare_for_embedded.dart b/pkgs/cronet_http/tool/prepare_for_embedded.dart index 449d7f1041..edbedb66b5 100644 --- a/pkgs/cronet_http/tool/prepare_for_embedded.dart +++ b/pkgs/cronet_http/tool/prepare_for_embedded.dart @@ -39,6 +39,12 @@ const _packageDescription = 'An Android Flutter plugin that ' 'provides access to the Cronet HTTP client. ' 'Identical to package:cronet_http except that it embeds Cronet ' 'rather than relying on Google Play Services.'; +final implementationRegExp = RegExp( + '^\\s*implementation [\'"]' + '$_gmsDependencyName' + ':\\d+.\\d+.\\d+[\'"]', + multiLine: true, +); void main(List args) async { if (Directory.current.path.endsWith('tool')) { @@ -48,6 +54,7 @@ void main(List args) async { } updateCronetDependency(_cronetEmbeddedVersion); + update2(); updatePubSpec(); updateReadme(); updateLibraryName(); @@ -58,12 +65,6 @@ void main(List args) async { void updateCronetDependency(String latestVersion) { final fBuildGradle = File('${_packageDirectory.path}/android/build.gradle'); final gradleContent = fBuildGradle.readAsStringSync(); - final implementationRegExp = RegExp( - '^\\s*implementation [\'"]' - '$_gmsDependencyName' - ':\\d+.\\d+.\\d+[\'"]', - multiLine: true, - ); final newImplementation = '$_embeddedDependencyName:$latestVersion'; print('Patching $newImplementation'); final newGradleContent = gradleContent.replaceAll( @@ -73,6 +74,17 @@ void updateCronetDependency(String latestVersion) { fBuildGradle.writeAsStringSync(newGradleContent); } +void update2() { + final fBuildGradle = + File('${_packageDirectory.path}/example/android/app/build.gradle'); + final gradleContent = fBuildGradle.readAsStringSync(); + final newGradleContent = gradleContent.replaceAll( + implementationRegExp, + '', + ); + fBuildGradle.writeAsStringSync(newGradleContent); +} + /// Update pubspec.yaml and example/pubspec.yaml. void updatePubSpec() { print('Updating pubspec.yaml');