From cc0d672f978c982664315358a3a3d9438056886f Mon Sep 17 00:00:00 2001 From: Gabriel Moro Date: Sun, 27 Jul 2025 13:21:26 -0300 Subject: [PATCH 01/27] Update Android Gradle configuration and dependencies - Replaced Groovy Gradle files with Kotlin DSL (.kts) equivalents. - Updated Gradle wrapper to version 8.12. - Updated Android Gradle Plugin and Kotlin versions. - Modified `AndroidManifest.xml` files: - Removed `package` attribute from root manifest. - Added `taskAffinity=""` to `MainActivity`. - Added `` for `ACTION_PROCESS_TEXT`. - Updated `.gitignore` to include `.cxx/`. - Increased Gradle JVM arguments in `gradle.properties`. - Updated various dependency versions in `pubspec.lock`. - Added empty test files for iOS and macOS. --- flutter/sample/android/.gitignore | 3 +- flutter/sample/android/app/build.gradle | 71 ----------- flutter/sample/android/app/build.gradle.kts | 44 +++++++ .../android/app/src/debug/AndroidManifest.xml | 3 +- .../android/app/src/main/AndroidManifest.xml | 17 ++- .../example/flutter_dynamics/MainActivity.kt | 3 +- .../app/src/profile/AndroidManifest.xml | 3 +- flutter/sample/android/build.gradle | 31 ----- flutter/sample/android/build.gradle.kts | 21 ++++ flutter/sample/android/gradle.properties | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- flutter/sample/android/settings.gradle | 11 -- flutter/sample/android/settings.gradle.kts | 25 ++++ .../sample/ios/RunnerTests/RunnerTests.swift | 12 ++ .../macos/RunnerTests/RunnerTests.swift | 12 ++ flutter/sample/pubspec.lock | 112 +++++++++++------- 16 files changed, 203 insertions(+), 169 deletions(-) delete mode 100644 flutter/sample/android/app/build.gradle create mode 100644 flutter/sample/android/app/build.gradle.kts delete mode 100644 flutter/sample/android/build.gradle create mode 100644 flutter/sample/android/build.gradle.kts delete mode 100644 flutter/sample/android/settings.gradle create mode 100644 flutter/sample/android/settings.gradle.kts create mode 100644 flutter/sample/ios/RunnerTests/RunnerTests.swift create mode 100644 flutter/sample/macos/RunnerTests/RunnerTests.swift diff --git a/flutter/sample/android/.gitignore b/flutter/sample/android/.gitignore index 6f56801..be3943c 100644 --- a/flutter/sample/android/.gitignore +++ b/flutter/sample/android/.gitignore @@ -5,9 +5,10 @@ gradle-wrapper.jar /gradlew.bat /local.properties GeneratedPluginRegistrant.java +.cxx/ # 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/flutter/sample/android/app/build.gradle b/flutter/sample/android/app/build.gradle deleted file mode 100644 index 90ac520..0000000 --- a/flutter/sample/android/app/build.gradle +++ /dev/null @@ -1,71 +0,0 @@ -def localProperties = new Properties() -def localPropertiesFile = rootProject.file('local.properties') -if (localPropertiesFile.exists()) { - localPropertiesFile.withReader('UTF-8') { reader -> - localProperties.load(reader) - } -} - -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' -} - -def flutterVersionName = localProperties.getProperty('flutter.versionName') -if (flutterVersionName == null) { - flutterVersionName = '1.0' -} - -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - -android { - compileSdkVersion flutter.compileSdkVersion - ndkVersion flutter.ndkVersion - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - - kotlinOptions { - jvmTarget = '1.8' - } - - sourceSets { - main.java.srcDirs += 'src/main/kotlin' - } - - defaultConfig { - // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "com.example.flutter_dynamics" - // You can update the following values to match your application needs. - // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration. - minSdkVersion flutter.minSdkVersion - targetSdkVersion flutter.targetSdkVersion - versionCode flutterVersionCode.toInteger() - versionName flutterVersionName - } - - buildTypes { - release { - // TODO: Add your own signing config for the release build. - // Signing with the debug keys for now, so `flutter run --release` works. - signingConfig signingConfigs.debug - } - } -} - -flutter { - source '../..' -} - -dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" -} diff --git a/flutter/sample/android/app/build.gradle.kts b/flutter/sample/android/app/build.gradle.kts new file mode 100644 index 0000000..c1af72d --- /dev/null +++ b/flutter/sample/android/app/build.gradle.kts @@ -0,0 +1,44 @@ +plugins { + id("com.android.application") + id("kotlin-android") + // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. + id("dev.flutter.flutter-gradle-plugin") +} + +android { + namespace = "com.example.flutter_dynamics" + compileSdk = flutter.compileSdkVersion + ndkVersion = flutter.ndkVersion + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 + } + + kotlinOptions { + jvmTarget = JavaVersion.VERSION_11.toString() + } + + defaultConfig { + // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). + applicationId = "com.example.flutter_dynamics" + // You can update the following values to match your application needs. + // For more information, see: https://flutter.dev/to/review-gradle-config. + minSdk = flutter.minSdkVersion + targetSdk = flutter.targetSdkVersion + versionCode = flutter.versionCode + versionName = flutter.versionName + } + + buildTypes { + release { + // TODO: Add your own signing config for the release build. + // Signing with the debug keys for now, so `flutter run --release` works. + signingConfig = signingConfigs.getByName("debug") + } + } +} + +flutter { + source = "../.." +} diff --git a/flutter/sample/android/app/src/debug/AndroidManifest.xml b/flutter/sample/android/app/src/debug/AndroidManifest.xml index 5eb6c9a..399f698 100644 --- a/flutter/sample/android/app/src/debug/AndroidManifest.xml +++ b/flutter/sample/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,4 @@ - + + + + + + + diff --git a/flutter/sample/android/app/src/main/kotlin/com/example/flutter_dynamics/MainActivity.kt b/flutter/sample/android/app/src/main/kotlin/com/example/flutter_dynamics/MainActivity.kt index 38314dd..5c65060 100644 --- a/flutter/sample/android/app/src/main/kotlin/com/example/flutter_dynamics/MainActivity.kt +++ b/flutter/sample/android/app/src/main/kotlin/com/example/flutter_dynamics/MainActivity.kt @@ -2,5 +2,4 @@ package com.example.flutter_dynamics import io.flutter.embedding.android.FlutterActivity -class MainActivity: FlutterActivity() { -} +class MainActivity : FlutterActivity() diff --git a/flutter/sample/android/app/src/profile/AndroidManifest.xml b/flutter/sample/android/app/src/profile/AndroidManifest.xml index 5eb6c9a..399f698 100644 --- a/flutter/sample/android/app/src/profile/AndroidManifest.xml +++ b/flutter/sample/android/app/src/profile/AndroidManifest.xml @@ -1,5 +1,4 @@ - +