From f78f88b6282eff6acc0e6ebdd28fa384c01f4760 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Bra=C5=BCewicz?= Date: Wed, 8 Jan 2025 13:53:27 +0100 Subject: [PATCH] chore: AGP 8 compatibility (#820) * AGP 8 compatibility * bumped flutter_callkit_incoming version * changelog fix * changelog added * bumped flutter version in distribution CI --- .github/workflows/app-distribute.yml | 2 +- dogfooding/android/app/build.gradle | 15 +++++---- .../android/app/src/debug/AndroidManifest.xml | 3 +- .../android/app/src/main/AndroidManifest.xml | 3 +- .../app/src/profile/AndroidManifest.xml | 3 +- dogfooding/android/build.gradle | 16 ---------- dogfooding/android/settings.gradle | 31 ++++++++++++++----- dogfooding/pubspec.yaml | 10 +++--- packages/stream_video/CHANGELOG.md | 6 ++++ .../open_api/open_api_extensions.dart | 2 +- packages/stream_video/pubspec.yaml | 2 +- packages/stream_video_flutter/CHANGELOG.md | 9 +++++- .../stream_video_flutter/android/build.gradle | 20 ++---------- .../android/settings.gradle | 26 ++++++++++++++++ .../android/src/main/AndroidManifest.xml | 3 +- .../example/android/app/build.gradle | 8 +++++ .../android/app/src/debug/AndroidManifest.xml | 3 +- .../android/app/src/main/AndroidManifest.xml | 3 +- .../app/src/profile/AndroidManifest.xml | 3 +- .../lib/src/call_screen/lobby_view.dart | 2 +- .../CHANGELOG.md | 7 +++++ .../android/build.gradle | 17 ++-------- .../android/settings.gradle | 26 ++++++++++++++++ .../android/src/main/AndroidManifest.xml | 3 +- .../pubspec.yaml | 2 +- 25 files changed, 135 insertions(+), 90 deletions(-) diff --git a/.github/workflows/app-distribute.yml b/.github/workflows/app-distribute.yml index 44efd7228..fa9aedf57 100644 --- a/.github/workflows/app-distribute.yml +++ b/.github/workflows/app-distribute.yml @@ -8,7 +8,7 @@ on: workflow_dispatch: env: - FLUTTER_VERSION: "3.24.3" + FLUTTER_VERSION: "3.27.1" FLUTTER_CHANNEL: stable ENV_PROPERTIES: ${{ secrets.ENV_PROPERTIES }} MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }} diff --git a/dogfooding/android/app/build.gradle b/dogfooding/android/app/build.gradle index cd6da07a1..d81bd050d 100644 --- a/dogfooding/android/app/build.gradle +++ b/dogfooding/android/app/build.gradle @@ -1,3 +1,10 @@ +plugins { + id "com.android.application" + id "kotlin-android" + id "com.google.gms.google-services" + id "dev.flutter.flutter-gradle-plugin" +} + def keystoreProperties = new Properties() def keystorePropertiesFile = rootProject.file('key.properties') if (keystorePropertiesFile.exists()) { @@ -27,13 +34,6 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } -apply plugin: 'com.android.application' -// START: FlutterFire Configuration -apply plugin: 'com.google.gms.google-services' -// END: FlutterFire Configuration -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - android { if (project.android.hasProperty("namespace")) { namespace = "io.getstream.video.flutter.dogfooding" @@ -100,6 +100,5 @@ flutter { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation 'com.android.support:multidex:1.0.3' } diff --git a/dogfooding/android/app/src/debug/AndroidManifest.xml b/dogfooding/android/app/src/debug/AndroidManifest.xml index de181ed38..4d9591027 100644 --- a/dogfooding/android/app/src/debug/AndroidManifest.xml +++ b/dogfooding/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,4 @@ - +