From ab280ac35db85f433e76e9d5e53d8c39969ba1e3 Mon Sep 17 00:00:00 2001 From: oussama berhili Date: Thu, 9 Jan 2025 12:48:34 +0100 Subject: [PATCH] Update project metadata and dependencies for Android and macOS platforms --- cached_network_image/example/.metadata | 24 ++++++++++++++-- .../example/android/.gitignore | 2 +- .../example/android/app/build.gradle | 28 +++++-------------- .../example/android/gradle.properties | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../example/android/settings.gradle | 4 +-- .../Flutter/GeneratedPluginRegistrant.swift | 2 +- 7 files changed, 34 insertions(+), 30 deletions(-) diff --git a/cached_network_image/example/.metadata b/cached_network_image/example/.metadata index 3717e32f..b02a7e4b 100644 --- a/cached_network_image/example/.metadata +++ b/cached_network_image/example/.metadata @@ -4,7 +4,7 @@ # This file should be version controlled and should not be manually edited. version: - revision: "b0850beeb25f6d5b10426284f506557f66181b36" + revision: "17025dd88227cd9532c33fa78f5250d548d87e9a" channel: "stable" project_type: app @@ -13,8 +13,26 @@ project_type: app migration: platforms: - platform: root - create_revision: b0850beeb25f6d5b10426284f506557f66181b36 - base_revision: b0850beeb25f6d5b10426284f506557f66181b36 + create_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a + base_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a + - platform: android + create_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a + base_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a + - platform: ios + create_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a + base_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a + - platform: linux + create_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a + base_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a + - platform: macos + create_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a + base_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a + - platform: web + create_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a + base_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a + - platform: windows + create_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a + base_revision: 17025dd88227cd9532c33fa78f5250d548d87e9a # User provided section diff --git a/cached_network_image/example/android/.gitignore b/cached_network_image/example/android/.gitignore index 6f568019..55afd919 100644 --- a/cached_network_image/example/android/.gitignore +++ b/cached_network_image/example/android/.gitignore @@ -7,7 +7,7 @@ gradle-wrapper.jar GeneratedPluginRegistrant.java # Remember to never publicly share your keystore. -# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app +# See https://flutter.dev/to/reference-keystore key.properties **/*.keystore **/*.jks diff --git a/cached_network_image/example/android/app/build.gradle b/cached_network_image/example/android/app/build.gradle index 2a2d082b..b5511a9a 100644 --- a/cached_network_image/example/android/app/build.gradle +++ b/cached_network_image/example/android/app/build.gradle @@ -5,24 +5,6 @@ plugins { id "dev.flutter.flutter-gradle-plugin" } -def localProperties = new Properties() -def localPropertiesFile = rootProject.file("local.properties") -if (localPropertiesFile.exists()) { - localPropertiesFile.withReader("UTF-8") { reader -> - localProperties.load(reader) - } -} - -def flutterVersionCode = localProperties.getProperty("flutter.versionCode") -if (flutterVersionCode == null) { - flutterVersionCode = "1" -} - -def flutterVersionName = localProperties.getProperty("flutter.versionName") -if (flutterVersionName == null) { - flutterVersionName = "1.0" -} - android { namespace = "com.example.example" compileSdk = flutter.compileSdkVersion @@ -33,15 +15,19 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } + kotlinOptions { + jvmTarget = JavaVersion.VERSION_1_8 + } + defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId = "com.example.example" // You can update the following values to match your application needs. - // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. + // For more information, see: https://flutter.dev/to/review-gradle-config. minSdk = flutter.minSdkVersion targetSdk = flutter.targetSdkVersion - versionCode = flutterVersionCode.toInteger() - versionName = flutterVersionName + versionCode = flutter.versionCode + versionName = flutter.versionName } buildTypes { diff --git a/cached_network_image/example/android/gradle.properties b/cached_network_image/example/android/gradle.properties index 3b5b324f..25971708 100644 --- a/cached_network_image/example/android/gradle.properties +++ b/cached_network_image/example/android/gradle.properties @@ -1,3 +1,3 @@ -org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError +org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true android.enableJetifier=true diff --git a/cached_network_image/example/android/gradle/wrapper/gradle-wrapper.properties b/cached_network_image/example/android/gradle/wrapper/gradle-wrapper.properties index e1ca574e..7bb2df6b 100644 --- a/cached_network_image/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/cached_network_image/example/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip diff --git a/cached_network_image/example/android/settings.gradle b/cached_network_image/example/android/settings.gradle index 536165d3..b9e43bd3 100644 --- a/cached_network_image/example/android/settings.gradle +++ b/cached_network_image/example/android/settings.gradle @@ -18,8 +18,8 @@ pluginManagement { 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 + id "com.android.application" version "8.1.0" apply false + id "org.jetbrains.kotlin.android" version "1.8.22" apply false } include ":app" diff --git a/cached_network_image/example/macos/Flutter/GeneratedPluginRegistrant.swift b/cached_network_image/example/macos/Flutter/GeneratedPluginRegistrant.swift index d24127f3..368554e0 100644 --- a/cached_network_image/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/cached_network_image/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -6,7 +6,7 @@ import FlutterMacOS import Foundation import path_provider_foundation -import sqflite +import sqflite_darwin import url_launcher_macos func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {