From 0d3e2cc09e10d3435a7f6be807b17b77e0dfe86b Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Wed, 25 Feb 2026 16:12:16 -0500 Subject: [PATCH 01/15] flutter_svg: recreate --- .../packages/flutter_svg/example/.metadata | 12 ++-- .../flutter_svg/example/android/.gitignore | 5 +- .../example/android/app/build.gradle | 62 ------------------- .../example/android/app/build.gradle.kts | 44 +++++++++++++ .../android/app/src/debug/AndroidManifest.xml | 3 +- .../android/app/src/main/AndroidManifest.xml | 19 +++++- .../flutter_svg_example/MainActivity.kt | 5 ++ .../plugins/fluttersvgexample/MainActivity.kt | 5 -- .../app/src/main/res/values-night/styles.xml | 4 +- .../app/src/main/res/values/styles.xml | 4 +- .../app/src/profile/AndroidManifest.xml | 3 +- .../flutter_svg/example/android/build.gradle | 25 -------- .../example/android/build.gradle.kts | 24 +++++++ .../example/android/gradle.properties | 3 +- .../gradle/wrapper/gradle-wrapper.properties | 4 +- .../example/android/settings.gradle | 27 -------- .../example/android/settings.gradle.kts | 26 ++++++++ 17 files changed, 135 insertions(+), 140 deletions(-) delete mode 100644 third_party/packages/flutter_svg/example/android/app/build.gradle create mode 100644 third_party/packages/flutter_svg/example/android/app/build.gradle.kts create mode 100644 third_party/packages/flutter_svg/example/android/app/src/main/kotlin/io/flutter/plugins/flutter_svg_example/MainActivity.kt delete mode 100644 third_party/packages/flutter_svg/example/android/app/src/main/kotlin/io/flutter/plugins/fluttersvgexample/MainActivity.kt delete mode 100644 third_party/packages/flutter_svg/example/android/build.gradle create mode 100644 third_party/packages/flutter_svg/example/android/build.gradle.kts delete mode 100644 third_party/packages/flutter_svg/example/android/settings.gradle create mode 100644 third_party/packages/flutter_svg/example/android/settings.gradle.kts diff --git a/third_party/packages/flutter_svg/example/.metadata b/third_party/packages/flutter_svg/example/.metadata index 5998223843fe..9fb00192b70a 100644 --- a/third_party/packages/flutter_svg/example/.metadata +++ b/third_party/packages/flutter_svg/example/.metadata @@ -4,7 +4,7 @@ # This file should be version controlled and should not be manually edited. version: - revision: "67323de285b00232883f53b84095eb72be97d35c" + revision: "582a0e7c5581dc0ca5f7bfd8662bb8db6f59d536" channel: "stable" project_type: app @@ -13,11 +13,11 @@ project_type: app migration: platforms: - platform: root - create_revision: 67323de285b00232883f53b84095eb72be97d35c - base_revision: 67323de285b00232883f53b84095eb72be97d35c - - platform: ios - create_revision: 67323de285b00232883f53b84095eb72be97d35c - base_revision: 67323de285b00232883f53b84095eb72be97d35c + create_revision: 582a0e7c5581dc0ca5f7bfd8662bb8db6f59d536 + base_revision: 582a0e7c5581dc0ca5f7bfd8662bb8db6f59d536 + - platform: android + create_revision: 582a0e7c5581dc0ca5f7bfd8662bb8db6f59d536 + base_revision: 582a0e7c5581dc0ca5f7bfd8662bb8db6f59d536 # User provided section diff --git a/third_party/packages/flutter_svg/example/android/.gitignore b/third_party/packages/flutter_svg/example/android/.gitignore index 0a741cb43d66..be3943c96d8e 100644 --- a/third_party/packages/flutter_svg/example/android/.gitignore +++ b/third_party/packages/flutter_svg/example/android/.gitignore @@ -5,7 +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/third_party/packages/flutter_svg/example/android/app/build.gradle b/third_party/packages/flutter_svg/example/android/app/build.gradle deleted file mode 100644 index 87f76b468c9a..000000000000 --- a/third_party/packages/flutter_svg/example/android/app/build.gradle +++ /dev/null @@ -1,62 +0,0 @@ -plugins { - id "com.android.application" - id "org.jetbrains.kotlin.android" - 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 = "io.flutter.plugins.fluttersvgexample" - compileSdk = flutter.compileSdkVersion - - compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 - } - - kotlinOptions { - jvmTarget = '11' - } - - 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 "io.flutter.plugins.fluttersvgexample" - 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 = '../..' -} diff --git a/third_party/packages/flutter_svg/example/android/app/build.gradle.kts b/third_party/packages/flutter_svg/example/android/app/build.gradle.kts new file mode 100644 index 000000000000..b2419dbc16d1 --- /dev/null +++ b/third_party/packages/flutter_svg/example/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 = "io.flutter.plugins.flutter_svg_example" + compileSdk = flutter.compileSdkVersion + ndkVersion = flutter.ndkVersion + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + + kotlinOptions { + jvmTarget = JavaVersion.VERSION_17.toString() + } + + defaultConfig { + // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). + applicationId = "io.flutter.plugins.flutter_svg_example" + // 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/third_party/packages/flutter_svg/example/android/app/src/debug/AndroidManifest.xml b/third_party/packages/flutter_svg/example/android/app/src/debug/AndroidManifest.xml index f880684a6a9c..399f6981d5d3 100644 --- a/third_party/packages/flutter_svg/example/android/app/src/debug/AndroidManifest.xml +++ b/third_party/packages/flutter_svg/example/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,6 @@ - diff --git a/third_party/packages/flutter_svg/example/android/app/src/main/AndroidManifest.xml b/third_party/packages/flutter_svg/example/android/app/src/main/AndroidManifest.xml index da83c1e12897..f6635571f419 100644 --- a/third_party/packages/flutter_svg/example/android/app/src/main/AndroidManifest.xml +++ b/third_party/packages/flutter_svg/example/android/app/src/main/AndroidManifest.xml @@ -1,12 +1,14 @@ - @@ -29,4 +31,15 @@ android:name="flutterEmbedding" android:value="2" /> + + + + + + + diff --git a/third_party/packages/flutter_svg/example/android/app/src/main/kotlin/io/flutter/plugins/flutter_svg_example/MainActivity.kt b/third_party/packages/flutter_svg/example/android/app/src/main/kotlin/io/flutter/plugins/flutter_svg_example/MainActivity.kt new file mode 100644 index 000000000000..03b7e04c2fd2 --- /dev/null +++ b/third_party/packages/flutter_svg/example/android/app/src/main/kotlin/io/flutter/plugins/flutter_svg_example/MainActivity.kt @@ -0,0 +1,5 @@ +package io.flutter.plugins.flutter_svg_example + +import io.flutter.embedding.android.FlutterActivity + +class MainActivity : FlutterActivity() diff --git a/third_party/packages/flutter_svg/example/android/app/src/main/kotlin/io/flutter/plugins/fluttersvgexample/MainActivity.kt b/third_party/packages/flutter_svg/example/android/app/src/main/kotlin/io/flutter/plugins/fluttersvgexample/MainActivity.kt deleted file mode 100644 index ed8683298b61..000000000000 --- a/third_party/packages/flutter_svg/example/android/app/src/main/kotlin/io/flutter/plugins/fluttersvgexample/MainActivity.kt +++ /dev/null @@ -1,5 +0,0 @@ -package io.flutter.plugins.fluttersvgexample - -import io.flutter.embedding.android.FlutterActivity - -class MainActivity : FlutterActivity() {} diff --git a/third_party/packages/flutter_svg/example/android/app/src/main/res/values-night/styles.xml b/third_party/packages/flutter_svg/example/android/app/src/main/res/values-night/styles.xml index 449a9f930826..06952be745f9 100644 --- a/third_party/packages/flutter_svg/example/android/app/src/main/res/values-night/styles.xml +++ b/third_party/packages/flutter_svg/example/android/app/src/main/res/values-night/styles.xml @@ -3,14 +3,14 @@