From 621e97b05e825348a74175c74e4b3426a8c05176 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 26 May 2022 20:16:22 +0000 Subject: [PATCH 01/13] [webview]: Bump gradle Bumps gradle from 3.3.0 to 7.2.1. --- updated-dependencies: - dependency-name: com.android.tools.build:gradle dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../webview_flutter_android/example/android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/webview_flutter/webview_flutter_android/example/android/build.gradle b/packages/webview_flutter/webview_flutter_android/example/android/build.gradle index e101ac08df55..0bd9da0d0e4c 100644 --- a/packages/webview_flutter/webview_flutter_android/example/android/build.gradle +++ b/packages/webview_flutter/webview_flutter_android/example/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.3.0' + classpath 'com.android.tools.build:gradle:7.2.1' } } From d65dcc0f26dc361b6d4a45a98c94e28c7904524f Mon Sep 17 00:00:00 2001 From: Maurice Parrish <10687576+bparrishMines@users.noreply.github.com> Date: Thu, 26 May 2022 14:03:25 -0700 Subject: [PATCH 02/13] properties version --- .../example/android/gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/webview_flutter/webview_flutter_android/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/webview_flutter/webview_flutter_android/example/android/gradle/wrapper/gradle-wrapper.properties index 2819f022f1fd..b776d4b5b27f 100644 --- a/packages/webview_flutter/webview_flutter_android/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/webview_flutter/webview_flutter_android/example/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip From 50a5288034289d39766a224114d2137cc75e8c87 Mon Sep 17 00:00:00 2001 From: Maurice Parrish <10687576+bparrishMines@users.noreply.github.com> Date: Fri, 3 Jun 2022 12:43:54 -0700 Subject: [PATCH 03/13] change version to 7.1.2 --- .../webview_flutter_android/example/android/build.gradle | 2 +- .../example/android/gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/webview_flutter/webview_flutter_android/example/android/build.gradle b/packages/webview_flutter/webview_flutter_android/example/android/build.gradle index 0bd9da0d0e4c..e29a4431f2ae 100644 --- a/packages/webview_flutter/webview_flutter_android/example/android/build.gradle +++ b/packages/webview_flutter/webview_flutter_android/example/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.2.1' + classpath 'com.android.tools.build:gradle:7.1.2' } } diff --git a/packages/webview_flutter/webview_flutter_android/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/webview_flutter/webview_flutter_android/example/android/gradle/wrapper/gradle-wrapper.properties index b776d4b5b27f..cc5527d781a7 100644 --- a/packages/webview_flutter/webview_flutter_android/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/webview_flutter/webview_flutter_android/example/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip From 3dc7ed08986df220f78423df622e8364e8b0b377 Mon Sep 17 00:00:00 2001 From: Maurice Parrish <10687576+bparrishMines@users.noreply.github.com> Date: Wed, 15 Jun 2022 09:36:44 -0700 Subject: [PATCH 04/13] update androidx version and removes r8 --- .../webview_flutter_android/example/android/app/build.gradle | 2 +- .../webview_flutter_android/example/android/gradle.properties | 1 - .../webview_flutter_android/example/pubspec.yaml | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/webview_flutter/webview_flutter_android/example/android/app/build.gradle b/packages/webview_flutter/webview_flutter_android/example/android/app/build.gradle index fdd8193eb2b6..19c77efa342a 100644 --- a/packages/webview_flutter/webview_flutter_android/example/android/app/build.gradle +++ b/packages/webview_flutter/webview_flutter_android/example/android/app/build.gradle @@ -58,5 +58,5 @@ dependencies { testImplementation 'junit:junit:4.12' androidTestImplementation 'androidx.test:runner:1.2.0' androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' - api 'androidx.test:core:1.2.0' + api 'androidx.test:core:1.4.0' } diff --git a/packages/webview_flutter/webview_flutter_android/example/android/gradle.properties b/packages/webview_flutter/webview_flutter_android/example/android/gradle.properties index a6738207fd15..94adc3a3f97a 100644 --- a/packages/webview_flutter/webview_flutter_android/example/android/gradle.properties +++ b/packages/webview_flutter/webview_flutter_android/example/android/gradle.properties @@ -1,4 +1,3 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true android.enableJetifier=true -android.enableR8=true diff --git a/packages/webview_flutter/webview_flutter_android/example/pubspec.yaml b/packages/webview_flutter/webview_flutter_android/example/pubspec.yaml index 85990bd02139..b457ca6b860a 100644 --- a/packages/webview_flutter/webview_flutter_android/example/pubspec.yaml +++ b/packages/webview_flutter/webview_flutter_android/example/pubspec.yaml @@ -20,7 +20,7 @@ dependencies: path: ../ dev_dependencies: - espresso: ^0.1.0+2 + espresso: ^0.2.0 flutter_driver: sdk: flutter flutter_test: From 5b318bf9e0c8d215ce03a6e14e72b8fd9a0278b4 Mon Sep 17 00:00:00 2001 From: Maurice Parrish <10687576+bparrishMines@users.noreply.github.com> Date: Wed, 15 Jun 2022 09:48:13 -0700 Subject: [PATCH 05/13] Rerun publishable From 8ed3e46f3ae57b7c8050b754acf7fe605f57739c Mon Sep 17 00:00:00 2001 From: Maurice Parrish <10687576+bparrishMines@users.noreply.github.com> Date: Wed, 15 Jun 2022 10:03:33 -0700 Subject: [PATCH 06/13] Rerun publishable From 34afe221a478fe4a15a51cd38d3892858231b0a4 Mon Sep 17 00:00:00 2001 From: Maurice Parrish <10687576+bparrishMines@users.noreply.github.com> Date: Wed, 15 Jun 2022 10:09:13 -0700 Subject: [PATCH 07/13] 8th time is the charm From 53f19b769d3e7255e2396cd171615e87c0aaddad Mon Sep 17 00:00:00 2001 From: Maurice Parrish <10687576+bparrishMines@users.noreply.github.com> Date: Wed, 15 Jun 2022 10:45:40 -0700 Subject: [PATCH 08/13] try reverting pubspec change --- .../webview_flutter_android/example/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/webview_flutter/webview_flutter_android/example/pubspec.yaml b/packages/webview_flutter/webview_flutter_android/example/pubspec.yaml index b457ca6b860a..85990bd02139 100644 --- a/packages/webview_flutter/webview_flutter_android/example/pubspec.yaml +++ b/packages/webview_flutter/webview_flutter_android/example/pubspec.yaml @@ -20,7 +20,7 @@ dependencies: path: ../ dev_dependencies: - espresso: ^0.2.0 + espresso: ^0.1.0+2 flutter_driver: sdk: flutter flutter_test: From c92473ed35494337f6402ca457c6533dff12d425 Mon Sep 17 00:00:00 2001 From: Maurice Parrish <10687576+bparrishMines@users.noreply.github.com> Date: Wed, 15 Jun 2022 11:02:40 -0700 Subject: [PATCH 09/13] print change file --- script/tool/lib/src/version_check_command.dart | 1 + 1 file changed, 1 insertion(+) diff --git a/script/tool/lib/src/version_check_command.dart b/script/tool/lib/src/version_check_command.dart index 62abdb2a432b..9ce531cf886e 100644 --- a/script/tool/lib/src/version_check_command.dart +++ b/script/tool/lib/src/version_check_command.dart @@ -517,6 +517,7 @@ ${indentation}The first version listed in CHANGELOG.md is $fromChangeLog. printError('${indentation}No such file: $path'); throw ToolExit(_exitMissingChangeDescriptionFile); } + print(file.readAsStringSync()); return file.readAsStringSync(); } From 700b172fb9586f373f42ab41d1ad930e249b1a92 Mon Sep 17 00:00:00 2001 From: Maurice Parrish <10687576+bparrishMines@users.noreply.github.com> Date: Wed, 15 Jun 2022 11:12:07 -0700 Subject: [PATCH 10/13] preprinter --- script/tool/lib/src/version_check_command.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/script/tool/lib/src/version_check_command.dart b/script/tool/lib/src/version_check_command.dart index 9ce531cf886e..d4a7d023e2c6 100644 --- a/script/tool/lib/src/version_check_command.dart +++ b/script/tool/lib/src/version_check_command.dart @@ -513,11 +513,12 @@ ${indentation}The first version listed in CHANGELOG.md is $fromChangeLog. return ''; } final File file = packagesDir.fileSystem.file(path); + print('PREPRINT'); + print(file.readAsStringSync()); if (!file.existsSync()) { printError('${indentation}No such file: $path'); throw ToolExit(_exitMissingChangeDescriptionFile); } - print(file.readAsStringSync()); return file.readAsStringSync(); } From bf587d4579a7f9175f8271fbce6f8dcc04afd867 Mon Sep 17 00:00:00 2001 From: Maurice Parrish <10687576+bparrishMines@users.noreply.github.com> Date: Wed, 15 Jun 2022 11:27:30 -0700 Subject: [PATCH 11/13] remove prints --- script/tool/lib/src/version_check_command.dart | 2 -- 1 file changed, 2 deletions(-) diff --git a/script/tool/lib/src/version_check_command.dart b/script/tool/lib/src/version_check_command.dart index d4a7d023e2c6..62abdb2a432b 100644 --- a/script/tool/lib/src/version_check_command.dart +++ b/script/tool/lib/src/version_check_command.dart @@ -513,8 +513,6 @@ ${indentation}The first version listed in CHANGELOG.md is $fromChangeLog. return ''; } final File file = packagesDir.fileSystem.file(path); - print('PREPRINT'); - print(file.readAsStringSync()); if (!file.existsSync()) { printError('${indentation}No such file: $path'); throw ToolExit(_exitMissingChangeDescriptionFile); From 9d5a717581f43a8236c1d831da17e437dc1070a7 Mon Sep 17 00:00:00 2001 From: Maurice Parrish <10687576+bparrishMines@users.noreply.github.com> Date: Wed, 15 Jun 2022 11:29:12 -0700 Subject: [PATCH 12/13] No CHANGELOG change: From 7052f3256d7c17155599beea4a343a1ce510e796 Mon Sep 17 00:00:00 2001 From: Maurice Parrish <10687576+bparrishMines@users.noreply.github.com> Date: Fri, 17 Jun 2022 06:26:34 -0700 Subject: [PATCH 13/13] No CHANGELOG change: --- .../webview_flutter_android/example/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/webview_flutter/webview_flutter_android/example/pubspec.yaml b/packages/webview_flutter/webview_flutter_android/example/pubspec.yaml index 85990bd02139..b457ca6b860a 100644 --- a/packages/webview_flutter/webview_flutter_android/example/pubspec.yaml +++ b/packages/webview_flutter/webview_flutter_android/example/pubspec.yaml @@ -20,7 +20,7 @@ dependencies: path: ../ dev_dependencies: - espresso: ^0.1.0+2 + espresso: ^0.2.0 flutter_driver: sdk: flutter flutter_test: