Skip to content

Commit fe92118

Browse files
authored
Merge branch 'main' into offer-codes
2 parents 27b7ec8 + 2ec2236 commit fe92118

518 files changed

Lines changed: 24563 additions & 27011 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.ci.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
# * https://github.com/flutter/cocoon/blob/main/CI_YAML.md
88
enabled_branches:
99
- main
10+
- release-go_router-\d+\.\d+\.\d+
1011

1112
platform_properties:
1213
linux:

.ci/flutter_master.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
c1b14e92dcfb8ad8a3f9b68a61d358373156f93f
1+
707dbc0420a34d327476bc12fac5aa2e22978a2e

.ci/flutter_stable.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
db50e20168db8fee486b9abf32fc912de3bc5b6a
1+
00b0c91f06209d9e4a41f71b7a512d6eb3b9c694

.ci/legacy_project/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ and then deleting everything but `android/` from it:
5252
imperative apply (this includes moving where the Android Gradle
5353
Plugin (AGP) version is set from `build.gradle` to `settings.gradle`).
5454
- Modifies `settings.gradle` to upgrade the Kotlin Gradle Plugin (KGP)
55-
from version 1.9.0 to 2.1.0. If a user runs into an error with the AGP version,
55+
from version 1.9.0 to 2.2.20. If a user runs into an error with the AGP version,
5656
the warning is clear on how to upgrade the version to one that we support.
5757
- Modifies `gradle.properties` to not set android.enableJetifier=true.
5858
- Update `app/build.gradle` to enable library desugaring to support

.ci/legacy_project/all_packages/android/settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ pluginManagement {
2020
plugins {
2121
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
2222
id "com.android.application" version "8.9.1" apply false
23-
id "org.jetbrains.kotlin.android" version "2.1.0" apply false
23+
id "org.jetbrains.kotlin.android" version "2.2.20" apply false
2424
}
2525

2626
include ":app"
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/bin/bash
2+
# Copyright 2013 The Flutter Authors
3+
# Use of this source code is governed by a BSD-style license that can be
4+
# found in the LICENSE file.
5+
set -e
6+
7+
cd script/flutter_goldens
8+
flutter analyze --fatal-infos
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/bin/bash
2+
# Copyright 2013 The Flutter Authors
3+
# Use of this source code is governed by a BSD-style license that can be
4+
# found in the LICENSE file.
5+
set -e
6+
7+
cd script/flutter_goldens
8+
dart format --set-exit-if-changed .
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/bin/bash
2+
# Copyright 2013 The Flutter Authors
3+
# Use of this source code is governed by a BSD-style license that can be
4+
# found in the LICENSE file.
5+
set -e
6+
7+
cd script/flutter_goldens
8+
flutter test

.ci/scripts/prepare_tool.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,6 @@ git branch main origin/main
1010

1111
cd script/tool
1212
dart pub get
13+
14+
cd ../flutter_goldens
15+
flutter pub get

.ci/targets/analyze.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ tasks:
44
infra_step: true # Note infra steps failing prevents "always" from running.
55
- name: analyze repo tools
66
script: .ci/scripts/analyze_repo_tools.sh
7+
- name: analyze flutter_goldens
8+
script: .ci/scripts/analyze_flutter_goldens.sh
79
- name: download Dart deps
810
script: .ci/scripts/tool_runner.sh
911
args: ["fetch-deps"]

0 commit comments

Comments
 (0)