Skip to content

Commit ad8b151

Browse files
authored
Merge branch 'main' into handle_deprecated_radio_examples
2 parents e3e5a4f + 5883017 commit ad8b151

File tree

177 files changed

+787
-389
lines changed

Some content is hidden

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

177 files changed

+787
-389
lines changed

.ci/flutter_master.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
65aca3661b8fa943f801c4b2811af9d1e8e33dbe
1+
5c0c9e9e9ad2eec7dc28b216fa55b8c5bf6d7ad9

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

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

packages/animations/example/android/settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ pluginManagement {
2020
// See https://github.com/flutter/flutter/blob/master/docs/ecosystem/Plugins-and-Packages-repository-structure.md#gradle-structure for more info.
2121
plugins {
2222
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
23-
id "com.android.application" version "8.9.1" apply false
23+
id "com.android.application" version "8.11.0" apply false
2424
id "org.jetbrains.kotlin.android" version "2.2.0" apply false
2525
id "com.google.cloud.artifactregistry.gradle-plugin" version "2.2.1"
2626
}

packages/camera/camera/example/android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ android {
4040
release {
4141
// TODO: Add your own signing config for the release build.
4242
// Signing with the debug keys for now, so `flutter run --release` works.
43-
signingConfig signingConfigs.debug
43+
signingConfig = signingConfigs.debug
4444
}
4545
profile {
4646
matchingFallbacks = ['debug', 'release']
@@ -52,7 +52,7 @@ android {
5252
}
5353

5454
flutter {
55-
source '../..'
55+
source = '../..'
5656
}
5757

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

packages/camera/camera/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

packages/camera/camera/example/android/settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ pluginManagement {
1919
// See https://github.com/flutter/flutter/blob/master/docs/ecosystem/Plugins-and-Packages-repository-structure.md#gradle-structure for more info.
2020
plugins {
2121
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
22-
id "com.android.application" version "8.9.1" apply false
22+
id "com.android.application" version "8.11.0" apply false
2323
id "org.jetbrains.kotlin.android" version "2.2.0" apply false
2424
id "com.google.cloud.artifactregistry.gradle-plugin" version "2.2.1"
2525

packages/camera/camera_android/android/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
group 'io.flutter.plugins.camera'
2-
version '1.0-SNAPSHOT'
1+
group = 'io.flutter.plugins.camera'
2+
version = '1.0-SNAPSHOT'
33
def args = ["-Xlint:deprecation","-Xlint:unchecked"]
44

55
buildscript {
@@ -28,7 +28,7 @@ apply plugin: 'com.android.library'
2828

2929
android {
3030
buildFeatures {
31-
buildConfig true
31+
buildConfig = true
3232
}
3333
namespace = "io.flutter.plugins.camera"
3434
compileSdk = flutter.compileSdkVersion
@@ -38,8 +38,8 @@ buildFeatures {
3838
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
3939
}
4040
lintOptions {
41-
checkAllWarnings true
42-
warningsAsErrors true
41+
checkAllWarnings = true
42+
warningsAsErrors = true
4343
disable 'AndroidGradlePluginVersion', 'InvalidPackage', 'GradleDependency', 'NewerVersionAvailable'
4444
}
4545
compileOptions {

packages/camera/camera_android/example/android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ android {
4040
release {
4141
// TODO: Add your own signing config for the release build.
4242
// Signing with the debug keys for now, so `flutter run --release` works.
43-
signingConfig signingConfigs.debug
43+
signingConfig = signingConfigs.debug
4444
}
4545
profile {
4646
matchingFallbacks = ['debug', 'release']
@@ -52,7 +52,7 @@ android {
5252
}
5353

5454
flutter {
55-
source '../..'
55+
source = '../..'
5656
}
5757

5858
dependencies {

0 commit comments

Comments
 (0)