Skip to content

Commit dde014e

Browse files
stuartmorgan-gstuartmorgan-g
authored
Merge branch 'main' into emoji
2 parents ed3bbd5 + 48ebbe1 commit dde014e

File tree

698 files changed

+13942
-8325
lines changed

Some content is hidden

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

698 files changed

+13942
-8325
lines changed

‎.ci.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ platform_properties:
2828
device_type: none
2929
dependencies: >-
3030
[
31-
{"dependency": "android_sdk", "version": "version:36v1"},
31+
{"dependency": "android_sdk", "version": "version:36v3"},
3232
{"dependency": "open_jdk", "version": "version:17"},
3333
{"dependency": "curl", "version": "version:7.64.0"},
3434
{"dependency": "avd_cipd_version", "version": "build_id:8719362231152674241"}

‎.ci/flutter_master.version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
b1a28bc065b0acc50bc2284be87a9a708bd7aa85
1+
2d3416713fe83bf1c31290bafc05919cd6cbd99d

‎.ci/flutter_stable.version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
d693b4b9dbac2acd4477aea4555ca6dcbea44ba2
1+
9f455d2486bcb28cad87b062475f42edc959f636

‎.ci/legacy_project/README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,5 @@ and then deleting everything but `android/` from it:
5555
from version 1.9.0 to 2.1.0. 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.
58+
- Update `app/build.gradle` to enable library desugaring to support
59+
`interactive_media_ads` plugin.

‎.ci/legacy_project/all_packages/android/app/build.gradle‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ android {
2626
namespace = "com.example.all_packages"
2727
compileSdkVersion flutter.compileSdkVersion
2828

29+
compileOptions {
30+
coreLibraryDesugaringEnabled true
31+
}
32+
2933
defaultConfig {
3034
applicationId "com.example.all_packages"
3135
minSdkVersion flutter.minSdkVersion
@@ -44,3 +48,7 @@ android {
4448
flutter {
4549
source '../..'
4650
}
51+
52+
dependencies {
53+
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.5'
54+
}

‎AGENTS.md‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,15 @@ The primary tool for this repository is `flutter_plugin_tools.dart`.
4040

4141
### Initial Setup
4242

43-
First, initialize the tooling:
43+
First, define an environment variable for the repository root directory and initialize the tooling:
4444
```bash
45-
cd $REPO_ROOT/script/tool # $REPO_ROOT is the repository root
46-
dart pub get
45+
# Define an environment variable for the repository root.
46+
export REPO_ROOT=$(pwd)
47+
48+
# Verify that the environment variable is working correctly.
49+
echo "Repository root directory: $REPO_ROOT"
50+
51+
dart pub get -C $REPO_ROOT/script/tool
4752
```
4853

4954
### Identifying Target Packages

‎CODEOWNERS‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
packages/animations/** @hannah-hyj
88
packages/camera/** @bparrishMines
9-
packages/cross_file/** @stuartmorgan
10-
packages/extension_google_sign_in_as_googleapis_auth/** @stuartmorgan
9+
packages/cross_file/** @stuartmorgan-g
10+
packages/extension_google_sign_in_as_googleapis_auth/** @stuartmorgan-g
1111
packages/file_selector/** @stuartmorgan-g
1212
packages/flutter_lints/** @chunhtai
1313
packages/flutter_template_images/** @stuartmorgan-g

‎packages/animations/CHANGELOG.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
## NEXT
1+
## 2.1.0
22

33
* Updates minimum supported SDK version to Flutter 3.29/Dart 3.7.
4+
* Make `OpenContainerState` public.
45

56
## 2.0.11
67

‎packages/animations/example/android/app/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ android {
1111
ndkVersion = flutter.ndkVersion
1212

1313
compileOptions {
14-
sourceCompatibility = JavaVersion.VERSION_11
15-
targetCompatibility = JavaVersion.VERSION_11
14+
sourceCompatibility = JavaVersion.VERSION_17
15+
targetCompatibility = JavaVersion.VERSION_17
1616
}
1717

1818
kotlinOptions {
19-
jvmTarget = '11'
19+
jvmTarget = JavaVersion.VERSION_17.toString()
2020
}
2121

2222
sourceSets {

‎packages/animations/example/android/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
66

0 commit comments

Comments
 (0)