feat(flutter): Upgrade bootstrapped Flutter version to 3.13.6

See [1] for a changelog. [1]: https://github.com/flutter/flutter/wiki/Hotfixes-to-the-Stable-Channel#flutter-313-changes Signed-off-by: Marcel Bochtler <[email protected]>
oss-review-toolkit · Oct 16, 2023 · f5cc5e8 · f5cc5e8
1 parent 2d18772
commit f5cc5e8
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 43 deletions.
diff --git a/...s/package-managers/pub/src/funTest/assets/projects/external/dart-http-expected-output.yml b/...s/package-managers/pub/src/funTest/assets/projects/external/dart-http-expected-output.yml
@@ -76,7 +76,7 @@ project:
           dependencies:
           - id: "Pub:collection:collection:1.18.0"
           - id: "Pub:meta:meta:1.11.0"
-    - id: "Pub:test:test:1.24.7"
+    - id: "Pub:test:test:1.24.8"
       dependencies:
       - id: "Pub:analyzer:analyzer:6.3.0"
         dependencies:
@@ -591,7 +591,7 @@ project:
             - id: "Pub:path:path:1.8.3"
             - id: "Pub:term_glyph:term_glyph:1.2.1"
         - id: "Pub:term_glyph:term_glyph:1.2.1"
-      - id: "Pub:test_core:test_core:0.5.7"
+      - id: "Pub:test_core:test_core:0.5.8"
         dependencies:
         - id: "Pub:analyzer:analyzer:6.3.0"
           dependencies:
@@ -1870,8 +1870,8 @@ packages:
     url: "https://github.com/dart-lang/term_glyph.git"
     revision: ""
     path: ""
-- id: "Pub:test:test:1.24.7"
-  purl: "pkg:pub/test/[email protected].7"
+- id: "Pub:test:test:1.24.8"
+  purl: "pkg:pub/test/[email protected].8"
   declared_licenses: []
   declared_licenses_processed: {}
   description: "A full featured library for writing and running Dart tests across\
@@ -1923,8 +1923,8 @@ packages:
     url: "https://github.com/dart-lang/test.git"
     revision: "master"
     path: "pkgs/test_api"
-- id: "Pub:test_core:test_core:0.5.7"
-  purl: "pkg:pub/test_core/[email protected].7"
+- id: "Pub:test_core:test_core:0.5.8"
+  purl: "pkg:pub/test_core/[email protected].8"
   declared_licenses: []
   declared_licenses_processed: {}
   description: "A basic library for writing tests and running them on the VM."

diff --git a/...funTest/assets/projects/synthetic/flutter-project-with-android-and-cocoapods/pubspec.lock b/...funTest/assets/projects/synthetic/flutter-project-with-android-and-cocoapods/pubspec.lock
@@ -37,10 +37,10 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
+      sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
       url: "https://pub.dev"
     source: hosted
-    version: "1.17.1"
+    version: "1.17.2"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -75,14 +75,6 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
-  js:
-    dependency: transitive
-    description:
-      name: js
-      sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.6.7"
   lints:
     dependency: transitive
     description:
@@ -95,18 +87,18 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
+      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.15"
+    version: "0.12.16"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
+      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.0"
+    version: "0.5.0"
   meta:
     dependency: transitive
     description:
@@ -132,10 +124,10 @@ packages:
     dependency: transitive
     description:
       name: source_span
-      sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
+      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.1"
+    version: "1.10.0"
   stack_trace:
     dependency: transitive
     description:
@@ -172,10 +164,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
+      sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.1"
+    version: "0.6.0"
   vector_math:
     dependency: transitive
     description:
@@ -184,5 +176,13 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.4"
+  web:
+    dependency: transitive
+    description:
+      name: web
+      sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.4-beta"
 sdks:
-  dart: ">=3.0.0-0 <4.0.0"
+  dart: ">=3.1.0-185.0.dev <4.0.0"
diff --git a/...Test/assets/projects/synthetic/pub-expected-output-with-flutter-android-and-cocoapods.yml b/...Test/assets/projects/synthetic/pub-expected-output-with-flutter-android-and-cocoapods.yml
@@ -23,9 +23,9 @@ projects:
     - id: "Gradle:android:app:"
       linkage: "PROJECT_STATIC"
       dependencies:
-      - id: "Maven:io.flutter:arm64_v8a_release:1.0.0-45f6e009110df4f34ec2cf99f63cf73b71b7a420"
-      - id: "Maven:io.flutter:armeabi_v7a_release:1.0.0-45f6e009110df4f34ec2cf99f63cf73b71b7a420"
-      - id: "Maven:io.flutter:flutter_embedding_release:1.0.0-45f6e009110df4f34ec2cf99f63cf73b71b7a420"
+      - id: "Maven:io.flutter:arm64_v8a_release:1.0.0-a794cf2681c6c9fe7b260e0e84de96298dc9c18b"
+      - id: "Maven:io.flutter:armeabi_v7a_release:1.0.0-a794cf2681c6c9fe7b260e0e84de96298dc9c18b"
+      - id: "Maven:io.flutter:flutter_embedding_release:1.0.0-a794cf2681c6c9fe7b260e0e84de96298dc9c18b"
         dependencies:
         - id: "Maven:androidx.annotation:annotation:1.2.0"
         - id: "Maven:androidx.core:core:1.6.0"
@@ -291,7 +291,7 @@ projects:
                     dependencies:
                     - id: "Maven:org.jetbrains:annotations:13.0"
                     - id: "Maven:org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31"
-      - id: "Maven:io.flutter:x86_64_release:1.0.0-45f6e009110df4f34ec2cf99f63cf73b71b7a420"
+      - id: "Maven:io.flutter:x86_64_release:1.0.0-a794cf2681c6c9fe7b260e0e84de96298dc9c18b"
       - id: "Maven:org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.30"
         dependencies:
         - id: "Maven:org.jetbrains.kotlin:kotlin-stdlib:1.5.31"
@@ -1034,14 +1034,14 @@ packages:
     url: "https://android.googlesource.com/platform/frameworks/support"
     revision: ""
     path: ""
-- id: "Maven:io.flutter:arm64_v8a_release:1.0.0-45f6e009110df4f34ec2cf99f63cf73b71b7a420"
-  purl: "pkg:maven/io.flutter/[email protected]45f6e009110df4f34ec2cf99f63cf73b71b7a420"
+- id: "Maven:io.flutter:arm64_v8a_release:1.0.0-a794cf2681c6c9fe7b260e0e84de96298dc9c18b"
+  purl: "pkg:maven/io.flutter/[email protected]a794cf2681c6c9fe7b260e0e84de96298dc9c18b"
   declared_licenses: []
   declared_licenses_processed: {}
   description: ""
   homepage_url: ""
   binary_artifact:
-    url: "https://storage.googleapis.com/download.flutter.io/io/flutter/arm64_v8a_release/1.0.0-45f6e009110df4f34ec2cf99f63cf73b71b7a420/arm64_v8a_release-1.0.0-45f6e009110df4f34ec2cf99f63cf73b71b7a420.jar"
+    url: "https://storage.googleapis.com/download.flutter.io/io/flutter/arm64_v8a_release/1.0.0-a794cf2681c6c9fe7b260e0e84de96298dc9c18b/arm64_v8a_release-1.0.0-a794cf2681c6c9fe7b260e0e84de96298dc9c18b.jar"
     hash:
       value: ""
       algorithm: ""
@@ -1060,14 +1060,14 @@ packages:
     url: ""
     revision: ""
     path: ""
-- id: "Maven:io.flutter:armeabi_v7a_release:1.0.0-45f6e009110df4f34ec2cf99f63cf73b71b7a420"
-  purl: "pkg:maven/io.flutter/[email protected]45f6e009110df4f34ec2cf99f63cf73b71b7a420"
+- id: "Maven:io.flutter:armeabi_v7a_release:1.0.0-a794cf2681c6c9fe7b260e0e84de96298dc9c18b"
+  purl: "pkg:maven/io.flutter/[email protected]a794cf2681c6c9fe7b260e0e84de96298dc9c18b"
   declared_licenses: []
   declared_licenses_processed: {}
   description: ""
   homepage_url: ""
   binary_artifact:
-    url: "https://storage.googleapis.com/download.flutter.io/io/flutter/armeabi_v7a_release/1.0.0-45f6e009110df4f34ec2cf99f63cf73b71b7a420/armeabi_v7a_release-1.0.0-45f6e009110df4f34ec2cf99f63cf73b71b7a420.jar"
+    url: "https://storage.googleapis.com/download.flutter.io/io/flutter/armeabi_v7a_release/1.0.0-a794cf2681c6c9fe7b260e0e84de96298dc9c18b/armeabi_v7a_release-1.0.0-a794cf2681c6c9fe7b260e0e84de96298dc9c18b.jar"
     hash:
       value: ""
       algorithm: ""
@@ -1086,19 +1086,19 @@ packages:
     url: ""
     revision: ""
     path: ""
-- id: "Maven:io.flutter:flutter_embedding_release:1.0.0-45f6e009110df4f34ec2cf99f63cf73b71b7a420"
-  purl: "pkg:maven/io.flutter/[email protected]45f6e009110df4f34ec2cf99f63cf73b71b7a420"
+- id: "Maven:io.flutter:flutter_embedding_release:1.0.0-a794cf2681c6c9fe7b260e0e84de96298dc9c18b"
+  purl: "pkg:maven/io.flutter/[email protected]a794cf2681c6c9fe7b260e0e84de96298dc9c18b"
   declared_licenses: []
   declared_licenses_processed: {}
   description: ""
   homepage_url: ""
   binary_artifact:
-    url: "https://storage.googleapis.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-45f6e009110df4f34ec2cf99f63cf73b71b7a420/flutter_embedding_release-1.0.0-45f6e009110df4f34ec2cf99f63cf73b71b7a420.jar"
+    url: "https://storage.googleapis.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-a794cf2681c6c9fe7b260e0e84de96298dc9c18b/flutter_embedding_release-1.0.0-a794cf2681c6c9fe7b260e0e84de96298dc9c18b.jar"
     hash:
       value: ""
       algorithm: ""
   source_artifact:
-    url: "https://storage.googleapis.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-45f6e009110df4f34ec2cf99f63cf73b71b7a420/flutter_embedding_release-1.0.0-45f6e009110df4f34ec2cf99f63cf73b71b7a420-sources.jar"
+    url: "https://storage.googleapis.com/download.flutter.io/io/flutter/flutter_embedding_release/1.0.0-a794cf2681c6c9fe7b260e0e84de96298dc9c18b/flutter_embedding_release-1.0.0-a794cf2681c6c9fe7b260e0e84de96298dc9c18b-sources.jar"
     hash:
       value: ""
       algorithm: ""
@@ -1112,14 +1112,14 @@ packages:
     url: ""
     revision: ""
     path: ""
-- id: "Maven:io.flutter:x86_64_release:1.0.0-45f6e009110df4f34ec2cf99f63cf73b71b7a420"
-  purl: "pkg:maven/io.flutter/[email protected]45f6e009110df4f34ec2cf99f63cf73b71b7a420"
+- id: "Maven:io.flutter:x86_64_release:1.0.0-a794cf2681c6c9fe7b260e0e84de96298dc9c18b"
+  purl: "pkg:maven/io.flutter/[email protected]a794cf2681c6c9fe7b260e0e84de96298dc9c18b"
   declared_licenses: []
   declared_licenses_processed: {}
   description: ""
   homepage_url: ""
   binary_artifact:
-    url: "https://storage.googleapis.com/download.flutter.io/io/flutter/x86_64_release/1.0.0-45f6e009110df4f34ec2cf99f63cf73b71b7a420/x86_64_release-1.0.0-45f6e009110df4f34ec2cf99f63cf73b71b7a420.jar"
+    url: "https://storage.googleapis.com/download.flutter.io/io/flutter/x86_64_release/1.0.0-a794cf2681c6c9fe7b260e0e84de96298dc9c18b/x86_64_release-1.0.0-a794cf2681c6c9fe7b260e0e84de96298dc9c18b.jar"
     hash:
       value: ""
       algorithm: ""

diff --git a/plugins/package-managers/pub/src/main/kotlin/Pub.kt b/plugins/package-managers/pub/src/main/kotlin/Pub.kt
@@ -79,7 +79,7 @@ private const val PUB_LOCK_FILE = "pubspec.lock"
 private val flutterCommand = if (Os.isWindows) "flutter.bat" else "flutter"
 private val dartCommand = if (Os.isWindows) "dart.bat" else "dart"
 
-private val flutterVersion = Os.env["FLUTTER_VERSION"] ?: "3.10.5-stable"
+private val flutterVersion = Os.env["FLUTTER_VERSION"] ?: "3.13.6-stable"
 private val flutterInstallDir = ortToolsDirectory.resolve("flutter-$flutterVersion")
 
 val flutterHome by lazy {