diff --git a/.github/workflows/integration_test.yml b/.github/workflows/integration_test.yml index b4e5ef402..c212915a2 100644 --- a/.github/workflows/integration_test.yml +++ b/.github/workflows/integration_test.yml @@ -42,7 +42,7 @@ jobs: - uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f # v2.1.7 with: credentials_json: ${{ secrets.FIREBASE_TEST_LAB_CREDENTIALS_JSON }} - - uses: google-github-actions/setup-gcloud@f0990588f1e5b5af6827153b93673613abdc6ec7 # v2.1.1 + - uses: google-github-actions/setup-gcloud@6189d56e4096ee891640bb02ac264be376592d6a # v2.1.2 - name: Firebase Test Lab run: | set -e @@ -92,7 +92,7 @@ jobs: - uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f # v2.1.7 with: credentials_json: ${{ secrets.FIREBASE_TEST_LAB_CREDENTIALS_JSON }} - - uses: google-github-actions/setup-gcloud@f0990588f1e5b5af6827153b93673613abdc6ec7 # v2.1.1 + - uses: google-github-actions/setup-gcloud@6189d56e4096ee891640bb02ac264be376592d6a # v2.1.2 - name: Firebase Test Lab run: | set -e diff --git a/demo_app/android/app/build.gradle b/demo_app/android/app/build.gradle index 2a6fd0a3c..a4a41fd06 100644 --- a/demo_app/android/app/build.gradle +++ b/demo_app/android/app/build.gradle @@ -11,7 +11,7 @@ android { // TODO: remove hard-coded value when `flutter.ndkVersion` is sufficient // open $(dirname $(dirname $(which flutter)))/packages/flutter_tools - ndkVersion = "26.1.10909125" + ndkVersion = "27.0.12077973" compileOptions { sourceCompatibility = JavaVersion.VERSION_1_8 @@ -66,5 +66,5 @@ flutter { dependencies { // https://patrol.leancode.co/getting-started - androidTestUtil "androidx.test:orchestrator:1.5.0" + androidTestUtil "androidx.test:orchestrator:1.5.1" } diff --git a/demo_app/android/gradle/wrapper/gradle-wrapper.properties b/demo_app/android/gradle/wrapper/gradle-wrapper.properties index 6cb8454ca..2496707b2 100644 --- a/demo_app/android/gradle/wrapper/gradle-wrapper.properties +++ b/demo_app/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-all.zip diff --git a/demo_app/android/settings.gradle b/demo_app/android/settings.gradle index 8dcd837d6..42a51c659 100644 --- a/demo_app/android/settings.gradle +++ b/demo_app/android/settings.gradle @@ -18,8 +18,8 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "8.5.2" apply false - id "org.jetbrains.kotlin.android" version "2.0.20" apply false + id "com.android.application" version "8.7.2" apply false + id "org.jetbrains.kotlin.android" version "2.0.21" apply false } include ":app" diff --git a/demo_app/integration_test/auto_resize_test.dart b/demo_app/integration_test/auto_resize_test.dart index 454b060e2..b4b3b4833 100644 --- a/demo_app/integration_test/auto_resize_test.dart +++ b/demo_app/integration_test/auto_resize_test.dart @@ -11,7 +11,7 @@ void main() { patrolTest('VideoPlayer', ($) async { final test = _AspectRatioTest( child: VideoPlayer( - 'https://interactive-examples.mdn.mozilla.net/media/cc0-videos/flower.mp4', + 'https://files.daohoangson.com/public/fwfh/flower.mp4', aspectRatio: 1, loadingBuilder: (_, __, ___) => const Center(child: CircularProgressIndicator()), diff --git a/demo_app/ios/Podfile.lock b/demo_app/ios/Podfile.lock index f2204c806..f85128ae6 100644 --- a/demo_app/ios/Podfile.lock +++ b/demo_app/ios/Podfile.lock @@ -26,6 +26,7 @@ PODS: - Flutter - webview_flutter_wkwebview (0.0.1): - Flutter + - FlutterMacOS DEPENDENCIES: - audio_session (from `.symlinks/plugins/audio_session/ios`) @@ -38,7 +39,7 @@ DEPENDENCIES: - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/darwin`) - wakelock_plus (from `.symlinks/plugins/wakelock_plus/ios`) - - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/ios`) + - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/darwin`) SPEC REPOS: trunk: @@ -66,21 +67,21 @@ EXTERNAL SOURCES: wakelock_plus: :path: ".symlinks/plugins/wakelock_plus/ios" webview_flutter_wkwebview: - :path: ".symlinks/plugins/webview_flutter_wkwebview/ios" + :path: ".symlinks/plugins/webview_flutter_wkwebview/darwin" SPEC CHECKSUMS: audio_session: 088d2483ebd1dc43f51d253d4a1c517d9a2e7207 CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 just_audio: baa7252489dbcf47a4c7cc9ca663e9661c99aafa - package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85 + package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1c path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46 patrol: 0564cee315ff6c86fb802b3647db05cc2d3d0624 sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3 wakelock_plus: 78ec7c5b202cab7761af8e2b2b3d0671be6c4ae1 - webview_flutter_wkwebview: 2a23822e9039b7b1bc52e5add778e5d89ad488d1 + webview_flutter_wkwebview: 0982481e3d9c78fd5c6f62a002fcd24fc791f1e4 PODFILE CHECKSUM: 4047b237a92efec4e335c96f6d2daf630bacba96 diff --git a/demo_app/lib/screens/hello_world.dart b/demo_app/lib/screens/hello_world.dart index 15c0ca47d..9c62bcef4 100644 --- a/demo_app/lib/screens/hello_world.dart +++ b/demo_app/lib/screens/hello_world.dart @@ -131,7 +131,7 @@ const kHtml = '''

<VIDEO>

Source: developer.mozilla.org
diff --git a/demo_app/lib/screens/video.dart b/demo_app/lib/screens/video.dart index 6ef2e8e8d..d82601943 100644 --- a/demo_app/lib/screens/video.dart +++ b/demo_app/lib/screens/video.dart @@ -65,7 +65,7 @@ class _State extends State { _html, key: Key(_html), baseUrl: Uri.parse( - 'https://interactive-examples.mdn.mozilla.net/pages/tabbed/video.html', + 'https://files.daohoangson.com/public/fwfh/', ), ), ), @@ -97,7 +97,7 @@ class _State extends State { _html = """
Source: developer.mozilla.org
diff --git a/demo_app/macos/Podfile.lock b/demo_app/macos/Podfile.lock index afbbb0821..3cac26ac6 100644 --- a/demo_app/macos/Podfile.lock +++ b/demo_app/macos/Podfile.lock @@ -24,6 +24,9 @@ PODS: - FlutterMacOS - wakelock_plus (0.0.1): - FlutterMacOS + - webview_flutter_wkwebview (0.0.1): + - Flutter + - FlutterMacOS DEPENDENCIES: - audio_session (from `Flutter/ephemeral/.symlinks/plugins/audio_session/macos`) @@ -36,6 +39,7 @@ DEPENDENCIES: - url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`) - video_player_avfoundation (from `Flutter/ephemeral/.symlinks/plugins/video_player_avfoundation/darwin`) - wakelock_plus (from `Flutter/ephemeral/.symlinks/plugins/wakelock_plus/macos`) + - webview_flutter_wkwebview (from `Flutter/ephemeral/.symlinks/plugins/webview_flutter_wkwebview/darwin`) SPEC REPOS: trunk: @@ -62,19 +66,22 @@ EXTERNAL SOURCES: :path: Flutter/ephemeral/.symlinks/plugins/video_player_avfoundation/darwin wakelock_plus: :path: Flutter/ephemeral/.symlinks/plugins/wakelock_plus/macos + webview_flutter_wkwebview: + :path: Flutter/ephemeral/.symlinks/plugins/webview_flutter_wkwebview/darwin SPEC CHECKSUMS: audio_session: dea1f41890dbf1718f04a56f1d6150fd50039b72 CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24 just_audio: 9b67ca7b97c61cfc9784ea23cd8cc55eb226d489 - package_info_plus: 02d7a575e80f194102bef286361c6c326e4c29ce + package_info_plus: fa739dd842b393193c5ca93c26798dff6e3d0e0c path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46 patrol: 0564cee315ff6c86fb802b3647db05cc2d3d0624 sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec url_launcher_macos: 5f437abeda8c85500ceb03f5c1938a8c5a705399 video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3 wakelock_plus: 4783562c9a43d209c458cb9b30692134af456269 + webview_flutter_wkwebview: 0982481e3d9c78fd5c6f62a002fcd24fc791f1e4 PODFILE CHECKSUM: 236401fc2c932af29a9fcf0e97baeeb2d750d367 diff --git a/demo_app/pubspec.lock b/demo_app/pubspec.lock index 320dbfff2..75ea24f0e 100644 --- a/demo_app/pubspec.lock +++ b/demo_app/pubspec.lock @@ -657,10 +657,10 @@ packages: dependency: "direct dev" description: name: patrol - sha256: "4e1d239412b81124d28381a953951ccd8fff2841afd8420a052a458bf5534510" + sha256: "7f030b709f42fa53cec593e8ad906f23b6730cdbe205ee59ad53eb2af2ee9d94" url: "https://pub.dev" source: hosted - version: "3.10.0" + version: "3.12.0" patrol_finders: dependency: transitive description: diff --git a/demo_app/pubspec.yaml b/demo_app/pubspec.yaml index 72d9d4237..b048e21f4 100644 --- a/demo_app/pubspec.yaml +++ b/demo_app/pubspec.yaml @@ -4,7 +4,8 @@ version: 0.0.1 publish_to: "none" environment: - sdk: ">=3.0.0 <4.0.0" + flutter: ">=3.24.0" + sdk: ">=3.5.0 <4.0.0" dependencies: carousel_slider: ^5.0.0 @@ -48,7 +49,7 @@ dev_dependencies: golden_toolkit: ^0.15.0 lint: any measurer: ^2.1.1 - patrol: ^3.7.2 + patrol: ^3.12.0 test: any flutter: diff --git a/demo_app/test/goldens.json b/demo_app/test/goldens.json index 30b03fac5..be8290fd6 100644 --- a/demo_app/test/goldens.json +++ b/demo_app/test/goldens.json @@ -98,7 +98,7 @@ "U": "This is an underline text.", "UL": "
    \n
  • One
    • \n
  • \n Two\n
      \n
    • 2.1
      • \n
    • \n 2.2\n
        \n
      • 2.2.1
        • \n
      • 2.2.2
        • \n
      • 2.2.3
        • \n
      \n
      • \n
    • 2.3
      • \n
    \n
    • \n
  • Three
    • \n
", "VAR": "x = 1", - "VIDEO": "", + "VIDEO": "", "attribute/align/center": "
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut non elementum quam. Suspendisse odio diam, maximus pellentesque nunc a, pulvinar facilisis erat. Vivamus a viverra sem. Vivamus vehicula nibh mi, quis ornare orci laoreet vitae. Maecenas sagittis rutrum nisl nec dignissim. Suspendisse cursus est ut ultrices volutpat. Cras vel vestibulum arcu. Curabitur eget molestie nunc. Quisque fringilla quam vitae rhoncus lacinia. Vivamus id laoreet metus. Etiam sed mollis tellus. Vivamus facilisis faucibus libero eu interdum. Pellentesque laoreet magna porta viverra faucibus.
", "attribute/align/left": "
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut non elementum quam. Suspendisse odio diam, maximus pellentesque nunc a, pulvinar facilisis erat. Vivamus a viverra sem. Vivamus vehicula nibh mi, quis ornare orci laoreet vitae. Maecenas sagittis rutrum nisl nec dignissim. Suspendisse cursus est ut ultrices volutpat. Cras vel vestibulum arcu. Curabitur eget molestie nunc. Quisque fringilla quam vitae rhoncus lacinia. Vivamus id laoreet metus. Etiam sed mollis tellus. Vivamus facilisis faucibus libero eu interdum. Pellentesque laoreet magna porta viverra faucibus.
", "attribute/align/right": "
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut non elementum quam. Suspendisse odio diam, maximus pellentesque nunc a, pulvinar facilisis erat. Vivamus a viverra sem. Vivamus vehicula nibh mi, quis ornare orci laoreet vitae. Maecenas sagittis rutrum nisl nec dignissim. Suspendisse cursus est ut ultrices volutpat. Cras vel vestibulum arcu. Curabitur eget molestie nunc. Quisque fringilla quam vitae rhoncus lacinia. Vivamus id laoreet metus. Etiam sed mollis tellus. Vivamus facilisis faucibus libero eu interdum. Pellentesque laoreet magna porta viverra faucibus.
", @@ -230,4 +230,4 @@ "tag/OL/type_upper-roman": "
  1. One
  2. Two
  3. Three
      4. ", "tag/TABLE/colspan": "\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n
      Source: w3schools
      MonthSavings
      January$100
      February$80
      Sum: $180
      ", "tag/TABLE/rowspan": "\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n
      Source: w3schools
      MonthSavingsSavings for holiday!
      January$100$50
      February$80
      " -} \ No newline at end of file +} diff --git a/demo_app/test/goldens/VIDEO.png b/demo_app/test/goldens/VIDEO.png index ce5d5cefe..f88cf4d0b 100644 Binary files a/demo_app/test/goldens/VIDEO.png and b/demo_app/test/goldens/VIDEO.png differ diff --git a/packages/fwfh_chewie/example/main.dart b/packages/fwfh_chewie/example/main.dart index 649ec0624..c0f1df7d7 100644 --- a/packages/fwfh_chewie/example/main.dart +++ b/packages/fwfh_chewie/example/main.dart @@ -19,7 +19,7 @@ class MyApp extends StatelessWidget { child: HtmlWidget( ''' ''', factoryBuilder: () => MyWidgetFactory(),