From c1ac8587f4408a17571f1549554228bfa6c18775 Mon Sep 17 00:00:00 2001 From: Matias Leyba Date: Fri, 13 Sep 2024 10:19:03 -0300 Subject: [PATCH 1/4] refactor: migrate gradle plugins to declarative approach (#1301) --- flutter_news_example/android/app/build.gradle | 16 ++++------ flutter_news_example/android/build.gradle | 15 --------- flutter_news_example/android/settings.gradle | 32 +++++++++++++------ 3 files changed, 28 insertions(+), 35 deletions(-) diff --git a/flutter_news_example/android/app/build.gradle b/flutter_news_example/android/app/build.gradle index 2dd4becae..43c223c78 100644 --- a/flutter_news_example/android/app/build.gradle +++ b/flutter_news_example/android/app/build.gradle @@ -1,3 +1,9 @@ +plugins { + id "com.android.application" + id "kotlin-android" + id "dev.flutter.flutter-gradle-plugin" +} + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { @@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) { } } -def flutterRoot = localProperties.getProperty('flutter.sdk') -if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") -} - def flutterVersionCode = localProperties.getProperty('flutter.versionCode') if (flutterVersionCode == null) { flutterVersionCode = '1' @@ -27,10 +28,6 @@ if (keystorePropertiesFile.exists()) { keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) } -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - android { compileSdkVersion 34 @@ -108,7 +105,6 @@ flutter { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation 'com.google.guava:guava:27.0.1-android' implementation 'com.google.firebase:firebase-analytics:17.4.4' implementation 'com.google.firebase:firebase-crashlytics:17.1.1' diff --git a/flutter_news_example/android/build.gradle b/flutter_news_example/android/build.gradle index 4b7bc2f6d..bc157bd1a 100644 --- a/flutter_news_example/android/build.gradle +++ b/flutter_news_example/android/build.gradle @@ -1,18 +1,3 @@ -buildscript { - ext.kotlin_version = '1.8.10' - repositories { - google() - mavenCentral() - } - - dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' - classpath 'com.google.gms:google-services:4.3.4' - classpath 'com.google.firebase:firebase-crashlytics-gradle:2.2.0' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } -} - allprojects { repositories { google() diff --git a/flutter_news_example/android/settings.gradle b/flutter_news_example/android/settings.gradle index 5a2f14fb1..b1ece2f32 100644 --- a/flutter_news_example/android/settings.gradle +++ b/flutter_news_example/android/settings.gradle @@ -1,15 +1,27 @@ -include ':app' +pluginManagement { + def flutterSdkPath = { + def properties = new Properties() + file("local.properties").withInputStream { properties.load(it) } + def flutterSdkPath = properties.getProperty("flutter.sdk") + assert flutterSdkPath != null, "flutter.sdk not set in local.properties" + return flutterSdkPath + }() -def flutterProjectRoot = rootProject.projectDir.parentFile.toPath() + includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") -def plugins = new Properties() -def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins') -if (pluginsFile.exists()) { - pluginsFile.withReader('UTF-8') { reader -> plugins.load(reader) } + repositories { + google() + mavenCentral() + gradlePluginPortal() + } } -plugins.each { name, path -> - def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile() - include ":$name" - project(":$name").projectDir = pluginDirectory +plugins { + id "dev.flutter.flutter-plugin-loader" version "1.0.0" + id "com.android.application" version "7.4.2" apply false + id "org.jetbrains.kotlin.android" version "1.8.10" apply false + id "com.google.gms.google-services" version "4.3.4" apply false + id "com.google.firebase.crashlytics" version "2.9.9" apply false } + +include ":app" \ No newline at end of file From e8fddcdb94ab0e4dcd743cb21c6dddf67fb42020 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Sep 2024 10:27:04 -0300 Subject: [PATCH 2/4] chore(deps): Bump peter-evans/create-pull-request from 7.0.1 to 7.0.2 (#1302) --- .github/workflows/generate_flutter_news_template.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/generate_flutter_news_template.yaml b/.github/workflows/generate_flutter_news_template.yaml index 9b52df8d8..de20155ff 100644 --- a/.github/workflows/generate_flutter_news_template.yaml +++ b/.github/workflows/generate_flutter_news_template.yaml @@ -49,7 +49,7 @@ jobs: run: git stash pop - name: Create Pull Request With Required Changes - uses: peter-evans/create-pull-request@v7.0.1 + uses: peter-evans/create-pull-request@v7.0.2 with: branch: chore/generate-flutter-news-template commit-message: "chore: generate flutter_news_template" From 6c2e6599f6d76ac32ed6d78c82b84044be60f853 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Sep 2024 14:09:06 -0300 Subject: [PATCH 3/4] chore(deps): Bump peter-evans/create-pull-request from 7.0.2 to 7.0.3 (#1303) --- .github/workflows/generate_flutter_news_template.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/generate_flutter_news_template.yaml b/.github/workflows/generate_flutter_news_template.yaml index de20155ff..d899d8735 100644 --- a/.github/workflows/generate_flutter_news_template.yaml +++ b/.github/workflows/generate_flutter_news_template.yaml @@ -49,7 +49,7 @@ jobs: run: git stash pop - name: Create Pull Request With Required Changes - uses: peter-evans/create-pull-request@v7.0.2 + uses: peter-evans/create-pull-request@v7.0.3 with: branch: chore/generate-flutter-news-template commit-message: "chore: generate flutter_news_template" From ce30fc10f5416ce0d3558fe4c3ceb7abb1f8e61a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 Sep 2024 15:44:19 -0300 Subject: [PATCH 4/4] chore(deps): Bump peter-evans/create-pull-request from 7.0.3 to 7.0.5 (#1306) --- .github/workflows/generate_flutter_news_template.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/generate_flutter_news_template.yaml b/.github/workflows/generate_flutter_news_template.yaml index d899d8735..1f2ac21a4 100644 --- a/.github/workflows/generate_flutter_news_template.yaml +++ b/.github/workflows/generate_flutter_news_template.yaml @@ -49,7 +49,7 @@ jobs: run: git stash pop - name: Create Pull Request With Required Changes - uses: peter-evans/create-pull-request@v7.0.3 + uses: peter-evans/create-pull-request@v7.0.5 with: branch: chore/generate-flutter-news-template commit-message: "chore: generate flutter_news_template"