Merge branch 'main' of https://github.com/flutter/samples

6 months ago · bbd5d8db6d
parent 64e74056dc f443fa6036
commit bbd5d8db6d
12 changed files with 40 additions and 36 deletions
--- a/.github/workflows/scorecards-analysis.yml
+++ b/.github/workflows/scorecards-analysis.yml
@ -27,7 +27,7 @@ jobs:
          persist-credentials: false

      - name: "Run analysis"
-        uses: ossf/scorecard-action@dc50aa9510b46c811795eb24b2f1ba02a914e534
+        uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46
        with:
          results_file: results.sarif
          results_format: sarif
@ -50,6 +50,6 @@ jobs:

      # Upload the results to GitHub's code scanning dashboard.
      - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@4fa2a7953630fd2f3fb380f21be14ede0169dd4f
+        uses: github/codeql-action/upload-sarif@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a
        with:
          sarif_file: results.sarif
--- a/add_to_app/android_view/android_view/app/build.gradle
+++ b/add_to_app/android_view/android_view/app/build.gradle
@ -4,7 +4,7 @@ plugins {
 }

 android {
-    compileSdk 34
+    compileSdk 35

    lint {
        baseline = file("lint-baseline.xml")
@ -13,7 +13,7 @@ android {
    defaultConfig {
        applicationId "dev.flutter.example.androidView"
        minSdkVersion 21
-        targetSdkVersion 34
+        targetSdk 35
        versionCode 1
        versionName "1.0"

@ -41,18 +41,18 @@ android {

 dependencies {
    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.10.0'
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'com.google.android.material:material:1.2.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
-    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.2.0'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.3.2'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.3.2'
-    implementation "androidx.recyclerview:recyclerview:1.1.0"
+    implementation 'androidx.core:core-ktx:1.13.1'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'com.google.android.material:material:1.12.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.vectordrawable:vectordrawable:1.2.0'
+    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.8.4'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.4'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.7.7'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.7.7'
+    implementation "androidx.recyclerview:recyclerview:1.3.2"
    implementation project(path: ':flutter')
    testImplementation 'junit:junit:4.+'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
 }
--- a/add_to_app/android_view/android_view/build.gradle
+++ b/add_to_app/android_view/android_view/build.gradle
@ -1,12 +1,12 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = '1.8.0'
+    ext.kotlin_version = '1.8.22'
    repositories {
        google()
        mavenCentral()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:8.3.2'
+        classpath 'com.android.tools.build:gradle:8.5.1'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

        // NOTE: Do not place your application dependencies here; they belong
@ -21,6 +21,6 @@ allprojects {
    }
 }

-task clean(type: Delete) {
+tasks.register('clean', Delete) {
    delete rootProject.buildDir
 }
--- a/add_to_app/android_view/android_view/gradle/wrapper/gradle-wrapper.properties
+++ b/add_to_app/android_view/android_view/gradle/wrapper/gradle-wrapper.properties
@ -1,5 +1,6 @@
+#Fri Jul 26 11:31:21 EDT 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/add_to_app/multiple_flutters/multiple_flutters_android/app/build.gradle
+++ b/add_to_app/multiple_flutters/multiple_flutters_android/app/build.gradle
@ -8,12 +8,12 @@ android {
        self {
        }
    }
-    compileSdkVersion 33
+    compileSdk 35

    defaultConfig {
        applicationId "dev.flutter.multipleflutters"
        minSdkVersion 24
-        targetSdkVersion 33
+        targetSdk 35
        versionCode 1
        versionName "1.0"

@ -40,12 +40,12 @@ android {
 dependencies {

    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.2.0'
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'com.google.android.material:material:1.1.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.core:core-ktx:1.13.1'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'com.google.android.material:material:1.12.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
    testImplementation 'junit:junit:4.+'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
    implementation project(':flutter')
 }
--- a/add_to_app/multiple_flutters/multiple_flutters_android/app/src/main/res/layout/activity_main.xml
+++ b/add_to_app/multiple_flutters/multiple_flutters_android/app/src/main/res/layout/activity_main.xml
@ -11,7 +11,7 @@
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_marginStart="1dp"
-        android:layout_marginRight="260dp"
+        android:layout_marginEnd="260dp"
        android:text="Hello World!"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintRight_toRightOf="parent"
--- a/add_to_app/multiple_flutters/multiple_flutters_android/app/src/main/res/values-night/themes.xml
+++ b/add_to_app/multiple_flutters/multiple_flutters_android/app/src/main/res/values-night/themes.xml
@ -10,7 +10,7 @@
        <item name="colorSecondaryVariant">@color/teal_200</item>
        <item name="colorOnSecondary">@color/black</item>
        <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
+        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
        <!-- Customize your theme here. -->
    </style>
 </resources>
--- a/add_to_app/multiple_flutters/multiple_flutters_android/app/src/main/res/values/themes.xml
+++ b/add_to_app/multiple_flutters/multiple_flutters_android/app/src/main/res/values/themes.xml
@ -10,7 +10,7 @@
        <item name="colorSecondaryVariant">@color/teal_700</item>
        <item name="colorOnSecondary">@color/black</item>
        <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
+        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
        <!-- Customize your theme here. -->
    </style>
 </resources>
--- a/add_to_app/multiple_flutters/multiple_flutters_android/build.gradle
+++ b/add_to_app/multiple_flutters/multiple_flutters_android/build.gradle
@ -6,7 +6,7 @@ buildscript {
        mavenCentral()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.3.2'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

        // NOTE: Do not place your application dependencies here; they belong
@ -21,6 +21,6 @@ allprojects {
    }
 }

-task clean(type: Delete) {
+tasks.register('clean', Delete) {
    delete rootProject.buildDir
 }
--- a/add_to_app/multiple_flutters/multiple_flutters_android/gradle.properties
+++ b/add_to_app/multiple_flutters/multiple_flutters_android/gradle.properties
@ -18,4 +18,7 @@ android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
-kotlin.code.style=official
+kotlin.code.style=official
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
--- a/add_to_app/multiple_flutters/multiple_flutters_android/gradle/wrapper/gradle-wrapper.properties
+++ b/add_to_app/multiple_flutters/multiple_flutters_android/gradle/wrapper/gradle-wrapper.properties
@ -1,6 +1,6 @@
 #Mon Dec 11 09:57:20 AEDT 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/web_embedding/ng-flutter/package.json
+++ b/web_embedding/ng-flutter/package.json
@ -30,7 +30,7 @@
    "@angular/cli": "~18.1.0",
    "@angular/compiler-cli": "^18.0.1",
    "@types/jasmine": "~5.1.0",
-    "jasmine-core": "~5.1.1",
+    "jasmine-core": "~5.2.0",
    "karma": "~6.4.2",
    "karma-chrome-launcher": "~3.2.0",
    "karma-coverage": "~2.2.0",