From 8d3aef96fe780177741f6f03a4db12fa498c5b75 Mon Sep 17 00:00:00 2001 From: Alejandro Santiago Date: Thu, 29 Feb 2024 09:03:12 +0000 Subject: [PATCH] fix(very_good_wear_app): deprecated imperative apply of Flutter's Gradle plugins (#79) --- .../android/app/build.gradle | 17 +++++----- .../android/build.gradle | 13 -------- .../android/settings.gradle | 31 ++++++++++++++----- 3 files changed, 30 insertions(+), 31 deletions(-) diff --git a/very_good_wear_app/__brick__/{{project_name.snakeCase()}}/android/app/build.gradle b/very_good_wear_app/__brick__/{{project_name.snakeCase()}}/android/app/build.gradle index 573bfe1..2b3b3ce 100644 --- a/very_good_wear_app/__brick__/{{project_name.snakeCase()}}/android/app/build.gradle +++ b/very_good_wear_app/__brick__/{{project_name.snakeCase()}}/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 { namespace "{{application_id}}" compileSdkVersion flutter.compileSdkVersion @@ -111,6 +108,6 @@ flutter { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10" implementation 'androidx.wear:wear:1.3.0' } diff --git a/very_good_wear_app/__brick__/{{project_name.snakeCase()}}/android/build.gradle b/very_good_wear_app/__brick__/{{project_name.snakeCase()}}/android/build.gradle index f7eb7f6..bc157bd 100644 --- a/very_good_wear_app/__brick__/{{project_name.snakeCase()}}/android/build.gradle +++ b/very_good_wear_app/__brick__/{{project_name.snakeCase()}}/android/build.gradle @@ -1,16 +1,3 @@ -buildscript { - ext.kotlin_version = '1.7.10' - repositories { - google() - mavenCentral() - } - - dependencies { - classpath 'com.android.tools.build:gradle:7.3.0' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } -} - allprojects { repositories { google() diff --git a/very_good_wear_app/__brick__/{{project_name.snakeCase()}}/android/settings.gradle b/very_good_wear_app/__brick__/{{project_name.snakeCase()}}/android/settings.gradle index 44e62bc..1d6d19b 100644 --- a/very_good_wear_app/__brick__/{{project_name.snakeCase()}}/android/settings.gradle +++ b/very_good_wear_app/__brick__/{{project_name.snakeCase()}}/android/settings.gradle @@ -1,11 +1,26 @@ -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 + } + settings.ext.flutterSdkPath = flutterSdkPath() -def localPropertiesFile = new File(rootProject.projectDir, "local.properties") -def properties = new Properties() + includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle") -assert localPropertiesFile.exists() -localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} -def flutterSdkPath = properties.getProperty("flutter.sdk") -assert flutterSdkPath != null, "flutter.sdk not set in local.properties" -apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" +plugins { + id "dev.flutter.flutter-plugin-loader" version "1.0.0" + id "com.android.application" version "7.3.0" apply false + id "org.jetbrains.kotlin.android" version "1.7.10" apply false +} + +include ":app"