From 93bf3263c5e8303c4bc597aa1b76d93f591afdaf Mon Sep 17 00:00:00 2001 From: Andrew Brogdon Date: Thu, 3 Feb 2022 12:43:20 -0800 Subject: [PATCH] Lands beta changes. (#1006) --- .github/workflows/beta.yml | 17 ----------------- .../android_view/android_view/app/build.gradle | 2 +- .../android_view/android_view/build.gradle | 2 +- add_to_app/books/android_books/app/build.gradle | 2 +- add_to_app/books/android_books/build.gradle | 2 +- .../android_fullscreen/app/build.gradle | 2 +- .../fullscreen/android_fullscreen/build.gradle | 2 +- .../fullscreen/flutter_module/pubspec.lock | 13 ++++++++++--- .../multiple_flutters_module/pubspec.lock | 9 ++++++++- .../android_using_plugin/app/build.gradle | 2 +- .../plugin/android_using_plugin/build.gradle | 2 +- .../flutter_module_using_plugin/pubspec.lock | 9 ++++++++- .../app/build.gradle | 2 +- .../android_using_prebuilt_module/build.gradle | 2 +- .../prebuilt_module/flutter_module/pubspec.lock | 13 ++++++++++--- 15 files changed, 46 insertions(+), 35 deletions(-) diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml index a88cd28e6..b8404ad05 100644 --- a/.github/workflows/beta.yml +++ b/.github/workflows/beta.yml @@ -12,23 +12,6 @@ defaults: shell: bash jobs: - flutter-tests: - name: Test Flutter ${{ matrix.flutter_version }} on ${{ matrix.os }} - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - flutter_version: [dev, beta] - os: [ubuntu-latest, macos-latest, windows-latest] - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v1 - with: - java-version: '12.x' - - uses: subosito/flutter-action@4389e6cbc6cb8a4b18c628ff96ff90be0e926aa8 - with: - channel: ${{ matrix.flutter_version }} - - run: ./tool/flutter_ci_script_${{ matrix.flutter_version }}.sh # Run the stable test script on the beta channel. Since this branch will soon # be merged into master as our stable-targeting code, this is the key thing we # need to test. diff --git a/add_to_app/android_view/android_view/app/build.gradle b/add_to_app/android_view/android_view/app/build.gradle index 8c4d8bd8f..cf40f5d0c 100644 --- 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 { - compileSdkVersion 30 + compileSdkVersion 31 defaultConfig { applicationId "dev.flutter.example.androidView" diff --git a/add_to_app/android_view/android_view/build.gradle b/add_to_app/android_view/android_view/build.gradle index f0ff4953f..d6dad4307 100644 --- a/add_to_app/android_view/android_view/build.gradle +++ b/add_to_app/android_view/android_view/build.gradle @@ -1,6 +1,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = "1.4.21" + ext.kotlin_version = "1.6.0" repositories { google() jcenter() diff --git a/add_to_app/books/android_books/app/build.gradle b/add_to_app/books/android_books/app/build.gradle index a0b0de94a..46cfa3909 100644 --- a/add_to_app/books/android_books/app/build.gradle +++ b/add_to_app/books/android_books/app/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' android { - compileSdkVersion 29 + compileSdkVersion 31 buildToolsVersion "29.0.3" defaultConfig { diff --git a/add_to_app/books/android_books/build.gradle b/add_to_app/books/android_books/build.gradle index ef7bd2772..4fb1f3d65 100644 --- a/add_to_app/books/android_books/build.gradle +++ b/add_to_app/books/android_books/build.gradle @@ -1,6 +1,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = "1.3.72" + ext.kotlin_version = "1.6.0" repositories { google() jcenter() diff --git a/add_to_app/fullscreen/android_fullscreen/app/build.gradle b/add_to_app/fullscreen/android_fullscreen/app/build.gradle index f1d4e6303..955c811e7 100644 --- a/add_to_app/fullscreen/android_fullscreen/app/build.gradle +++ b/add_to_app/fullscreen/android_fullscreen/app/build.gradle @@ -5,7 +5,7 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' android { - compileSdkVersion 28 + compileSdkVersion 31 defaultConfig { applicationId "dev.flutter.example.androidfullscreen" minSdkVersion 19 diff --git a/add_to_app/fullscreen/android_fullscreen/build.gradle b/add_to_app/fullscreen/android_fullscreen/build.gradle index 8a9608782..e39431e21 100644 --- a/add_to_app/fullscreen/android_fullscreen/build.gradle +++ b/add_to_app/fullscreen/android_fullscreen/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.50' + ext.kotlin_version = '1.6.0' repositories { google() jcenter() diff --git a/add_to_app/fullscreen/flutter_module/pubspec.lock b/add_to_app/fullscreen/flutter_module/pubspec.lock index 1de187899..96315b2df 100644 --- a/add_to_app/fullscreen/flutter_module/pubspec.lock +++ b/add_to_app/fullscreen/flutter_module/pubspec.lock @@ -119,6 +119,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.12.11" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.3" meta: dependency: transitive description: @@ -146,7 +153,7 @@ packages: name: platform url: "https://pub.dartlang.org" source: hosted - version: "3.0.2" + version: "3.1.0" process: dependency: transitive description: @@ -214,7 +221,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.3" + version: "0.4.8" typed_data: dependency: transitive description: @@ -235,7 +242,7 @@ packages: name: vm_service url: "https://pub.dartlang.org" source: hosted - version: "7.3.0" + version: "7.5.0" webdriver: dependency: transitive description: diff --git a/add_to_app/multiple_flutters/multiple_flutters_module/pubspec.lock b/add_to_app/multiple_flutters/multiple_flutters_module/pubspec.lock index eb19650ff..64b97e4c5 100644 --- a/add_to_app/multiple_flutters/multiple_flutters_module/pubspec.lock +++ b/add_to_app/multiple_flutters/multiple_flutters_module/pubspec.lock @@ -100,6 +100,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.12.11" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.3" meta: dependency: transitive description: @@ -167,7 +174,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.3" + version: "0.4.8" typed_data: dependency: transitive description: diff --git a/add_to_app/plugin/android_using_plugin/app/build.gradle b/add_to_app/plugin/android_using_plugin/app/build.gradle index 98e2b93b7..1c3f16fad 100644 --- a/add_to_app/plugin/android_using_plugin/app/build.gradle +++ b/add_to_app/plugin/android_using_plugin/app/build.gradle @@ -5,7 +5,7 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' android { - compileSdkVersion 28 + compileSdkVersion 31 defaultConfig { applicationId "dev.flutter.example.androidusingplugin" minSdkVersion 19 diff --git a/add_to_app/plugin/android_using_plugin/build.gradle b/add_to_app/plugin/android_using_plugin/build.gradle index 8a9608782..e39431e21 100644 --- a/add_to_app/plugin/android_using_plugin/build.gradle +++ b/add_to_app/plugin/android_using_plugin/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.50' + ext.kotlin_version = '1.6.0' repositories { google() jcenter() diff --git a/add_to_app/plugin/flutter_module_using_plugin/pubspec.lock b/add_to_app/plugin/flutter_module_using_plugin/pubspec.lock index 6afba6e06..8007613af 100644 --- a/add_to_app/plugin/flutter_module_using_plugin/pubspec.lock +++ b/add_to_app/plugin/flutter_module_using_plugin/pubspec.lock @@ -93,6 +93,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.12.11" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.3" meta: dependency: transitive description: @@ -181,7 +188,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.3" + version: "0.4.8" typed_data: dependency: transitive description: diff --git a/add_to_app/prebuilt_module/android_using_prebuilt_module/app/build.gradle b/add_to_app/prebuilt_module/android_using_prebuilt_module/app/build.gradle index 775822943..d79b20af1 100644 --- a/add_to_app/prebuilt_module/android_using_prebuilt_module/app/build.gradle +++ b/add_to_app/prebuilt_module/android_using_prebuilt_module/app/build.gradle @@ -5,7 +5,7 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' android { - compileSdkVersion 28 + compileSdkVersion 31 defaultConfig { applicationId "dev.flutter.example.androidusingprebuiltmodule" minSdkVersion 19 diff --git a/add_to_app/prebuilt_module/android_using_prebuilt_module/build.gradle b/add_to_app/prebuilt_module/android_using_prebuilt_module/build.gradle index 8a9608782..e39431e21 100644 --- a/add_to_app/prebuilt_module/android_using_prebuilt_module/build.gradle +++ b/add_to_app/prebuilt_module/android_using_prebuilt_module/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.50' + ext.kotlin_version = '1.6.0' repositories { google() jcenter() diff --git a/add_to_app/prebuilt_module/flutter_module/pubspec.lock b/add_to_app/prebuilt_module/flutter_module/pubspec.lock index 1a3e67056..01f8f220f 100644 --- a/add_to_app/prebuilt_module/flutter_module/pubspec.lock +++ b/add_to_app/prebuilt_module/flutter_module/pubspec.lock @@ -119,6 +119,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.12.11" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.3" meta: dependency: transitive description: @@ -146,7 +153,7 @@ packages: name: platform url: "https://pub.dartlang.org" source: hosted - version: "3.0.2" + version: "3.1.0" process: dependency: transitive description: @@ -214,7 +221,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.3" + version: "0.4.8" typed_data: dependency: transitive description: @@ -235,7 +242,7 @@ packages: name: vm_service url: "https://pub.dartlang.org" source: hosted - version: "7.3.0" + version: "7.5.0" webdriver: dependency: transitive description: