From fadb652e48698aac783472faa095b6c582bd0dd2 Mon Sep 17 00:00:00 2001 From: dave horner Date: Sun, 17 Nov 2024 02:38:14 -0500 Subject: [PATCH 1/2] update deps for flutter apps --- example/more_examples/flutter_app/.metadata | 39 +++++++++++- .../flutter_app/android/.gitignore | 4 +- .../flutter_app/android/app/build.gradle | 63 +++++++------------ .../android/app/src/debug/AndroidManifest.xml | 6 +- .../android/app/src/main/AndroidManifest.xml | 32 +++++----- .../com/example/flutter_app/MainActivity.kt | 3 +- .../app/src/main/res/values/styles.xml | 12 ++-- .../app/src/profile/AndroidManifest.xml | 6 +- .../flutter_app/android/build.gradle | 21 ++----- .../flutter_app/android/gradle.properties | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 3 +- .../flutter_app/android/settings.gradle | 30 ++++++--- .../flutter_presence_app/.metadata | 39 +++++++++++- .../flutter_presence_app/android/.gitignore | 4 +- .../android/app/build.gradle | 63 +++++++------------ .../android/app/src/debug/AndroidManifest.xml | 6 +- .../android/app/src/main/AndroidManifest.xml | 37 +++++------ .../com/example/flutter_app/MainActivity.kt | 6 -- .../app/src/main/res/values/styles.xml | 12 ++-- .../app/src/profile/AndroidManifest.xml | 6 +- .../flutter_presence_app/android/build.gradle | 21 ++----- .../android/gradle.properties | 3 +- .../gradle/wrapper/gradle-wrapper.properties | 3 +- .../android/settings.gradle | 30 ++++++--- 24 files changed, 237 insertions(+), 214 deletions(-) delete mode 100644 example/more_examples/flutter_presence_app/android/app/src/main/kotlin/com/example/flutter_app/MainActivity.kt diff --git a/example/more_examples/flutter_app/.metadata b/example/more_examples/flutter_app/.metadata index 24544cb..d044da8 100644 --- a/example/more_examples/flutter_app/.metadata +++ b/example/more_examples/flutter_app/.metadata @@ -4,7 +4,42 @@ # This file should be version controlled and should not be manually edited. version: - revision: 84f3d28555368a70270e9ac8390a9441df95e752 - channel: stable + revision: "dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668" + channel: "stable" project_type: app + +# Tracks metadata for the flutter migrate command +migration: + platforms: + - platform: root + create_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668 + base_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668 + - platform: android + create_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668 + base_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668 + - platform: ios + create_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668 + base_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668 + - platform: linux + create_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668 + base_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668 + - platform: macos + create_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668 + base_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668 + - platform: web + create_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668 + base_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668 + - platform: windows + create_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668 + base_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668 + + # User provided section + + # List of Local paths (relative to this file) that should be + # ignored by the migrate tool. + # + # Files that are not part of the templates will be ignored by default. + unmanaged_files: + - 'lib/main.dart' + - 'ios/Runner.xcodeproj/project.pbxproj' diff --git a/example/more_examples/flutter_app/android/.gitignore b/example/more_examples/flutter_app/android/.gitignore index 0a741cb..55afd91 100644 --- a/example/more_examples/flutter_app/android/.gitignore +++ b/example/more_examples/flutter_app/android/.gitignore @@ -7,5 +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/example/more_examples/flutter_app/android/app/build.gradle b/example/more_examples/flutter_app/android/app/build.gradle index 7fdfbbb..e966f38 100644 --- a/example/more_examples/flutter_app/android/app/build.gradle +++ b/example/more_examples/flutter_app/android/app/build.gradle @@ -1,63 +1,44 @@ -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' +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" } -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 29 + namespace = "com.example.flutter_app" + compileSdk = flutter.compileSdkVersion + ndkVersion = flutter.ndkVersion - sourceSets { - main.java.srcDirs += 'src/main/kotlin' + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 } - lintOptions { - disable 'InvalidPackage' + 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.flutter_app" - minSdkVersion 16 - targetSdkVersion 29 - versionCode flutterVersionCode.toInteger() - versionName flutterVersionName + applicationId = "com.example.flutter_app" + // 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.debug + signingConfig = signingConfigs.debug } } } flutter { - source '../..' -} - -dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + source = "../.." } diff --git a/example/more_examples/flutter_app/android/app/src/debug/AndroidManifest.xml b/example/more_examples/flutter_app/android/app/src/debug/AndroidManifest.xml index b484f56..399f698 100644 --- a/example/more_examples/flutter_app/android/app/src/debug/AndroidManifest.xml +++ b/example/more_examples/flutter_app/android/app/src/debug/AndroidManifest.xml @@ -1,6 +1,6 @@ - - diff --git a/example/more_examples/flutter_app/android/app/src/main/AndroidManifest.xml b/example/more_examples/flutter_app/android/app/src/main/AndroidManifest.xml index a488615..60ea814 100644 --- a/example/more_examples/flutter_app/android/app/src/main/AndroidManifest.xml +++ b/example/more_examples/flutter_app/android/app/src/main/AndroidManifest.xml @@ -1,17 +1,13 @@ - - + - - @@ -44,4 +31,15 @@ android:name="flutterEmbedding" android:value="2" /> + + + + + + + diff --git a/example/more_examples/flutter_app/android/app/src/main/kotlin/com/example/flutter_app/MainActivity.kt b/example/more_examples/flutter_app/android/app/src/main/kotlin/com/example/flutter_app/MainActivity.kt index 1ec9b09..e2951a2 100644 --- a/example/more_examples/flutter_app/android/app/src/main/kotlin/com/example/flutter_app/MainActivity.kt +++ b/example/more_examples/flutter_app/android/app/src/main/kotlin/com/example/flutter_app/MainActivity.kt @@ -2,5 +2,4 @@ package com.example.flutter_app import io.flutter.embedding.android.FlutterActivity -class MainActivity: FlutterActivity() { -} +class MainActivity: FlutterActivity() diff --git a/example/more_examples/flutter_app/android/app/src/main/res/values/styles.xml b/example/more_examples/flutter_app/android/app/src/main/res/values/styles.xml index 1f83a33..cb1ef88 100644 --- a/example/more_examples/flutter_app/android/app/src/main/res/values/styles.xml +++ b/example/more_examples/flutter_app/android/app/src/main/res/values/styles.xml @@ -1,18 +1,18 @@ - - - diff --git a/example/more_examples/flutter_app/android/app/src/profile/AndroidManifest.xml b/example/more_examples/flutter_app/android/app/src/profile/AndroidManifest.xml index b484f56..399f698 100644 --- a/example/more_examples/flutter_app/android/app/src/profile/AndroidManifest.xml +++ b/example/more_examples/flutter_app/android/app/src/profile/AndroidManifest.xml @@ -1,6 +1,6 @@ - - diff --git a/example/more_examples/flutter_app/android/build.gradle b/example/more_examples/flutter_app/android/build.gradle index 3100ad2..d2ffbff 100644 --- a/example/more_examples/flutter_app/android/build.gradle +++ b/example/more_examples/flutter_app/android/build.gradle @@ -1,31 +1,18 @@ -buildscript { - ext.kotlin_version = '1.3.50' - repositories { - google() - jcenter() - } - - dependencies { - classpath 'com.android.tools.build:gradle:3.5.0' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } -} - allprojects { repositories { google() - jcenter() + mavenCentral() } } -rootProject.buildDir = '../build' +rootProject.buildDir = "../build" subprojects { project.buildDir = "${rootProject.buildDir}/${project.name}" } subprojects { - project.evaluationDependsOn(':app') + project.evaluationDependsOn(":app") } -task clean(type: Delete) { +tasks.register("clean", Delete) { delete rootProject.buildDir } diff --git a/example/more_examples/flutter_app/android/gradle.properties b/example/more_examples/flutter_app/android/gradle.properties index 94adc3a..2597170 100644 --- a/example/more_examples/flutter_app/android/gradle.properties +++ b/example/more_examples/flutter_app/android/gradle.properties @@ -1,3 +1,3 @@ -org.gradle.jvmargs=-Xmx1536M +org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true android.enableJetifier=true diff --git a/example/more_examples/flutter_app/android/gradle/wrapper/gradle-wrapper.properties b/example/more_examples/flutter_app/android/gradle/wrapper/gradle-wrapper.properties index 296b146..7bb2df6 100644 --- a/example/more_examples/flutter_app/android/gradle/wrapper/gradle-wrapper.properties +++ b/example/more_examples/flutter_app/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Fri Jun 23 08:50:38 CEST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip diff --git a/example/more_examples/flutter_app/android/settings.gradle b/example/more_examples/flutter_app/android/settings.gradle index 44e62bc..b9e43bd 100644 --- a/example/more_examples/flutter_app/android/settings.gradle +++ b/example/more_examples/flutter_app/android/settings.gradle @@ -1,11 +1,25 @@ -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 localPropertiesFile = new File(rootProject.projectDir, "local.properties") -def properties = new Properties() + includeBuild("$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 "8.1.0" apply false + id "org.jetbrains.kotlin.android" version "1.8.22" apply false +} + +include ":app" diff --git a/example/more_examples/flutter_presence_app/.metadata b/example/more_examples/flutter_presence_app/.metadata index 24544cb..d044da8 100644 --- a/example/more_examples/flutter_presence_app/.metadata +++ b/example/more_examples/flutter_presence_app/.metadata @@ -4,7 +4,42 @@ # This file should be version controlled and should not be manually edited. version: - revision: 84f3d28555368a70270e9ac8390a9441df95e752 - channel: stable + revision: "dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668" + channel: "stable" project_type: app + +# Tracks metadata for the flutter migrate command +migration: + platforms: + - platform: root + create_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668 + base_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668 + - platform: android + create_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668 + base_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668 + - platform: ios + create_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668 + base_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668 + - platform: linux + create_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668 + base_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668 + - platform: macos + create_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668 + base_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668 + - platform: web + create_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668 + base_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668 + - platform: windows + create_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668 + base_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668 + + # User provided section + + # List of Local paths (relative to this file) that should be + # ignored by the migrate tool. + # + # Files that are not part of the templates will be ignored by default. + unmanaged_files: + - 'lib/main.dart' + - 'ios/Runner.xcodeproj/project.pbxproj' diff --git a/example/more_examples/flutter_presence_app/android/.gitignore b/example/more_examples/flutter_presence_app/android/.gitignore index 0a741cb..55afd91 100644 --- a/example/more_examples/flutter_presence_app/android/.gitignore +++ b/example/more_examples/flutter_presence_app/android/.gitignore @@ -7,5 +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/example/more_examples/flutter_presence_app/android/app/build.gradle b/example/more_examples/flutter_presence_app/android/app/build.gradle index 7fdfbbb..cc4b3ed 100644 --- a/example/more_examples/flutter_presence_app/android/app/build.gradle +++ b/example/more_examples/flutter_presence_app/android/app/build.gradle @@ -1,63 +1,44 @@ -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' +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" } -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 29 + namespace = "com.example.flutter_presence_app" + compileSdk = flutter.compileSdkVersion + ndkVersion = flutter.ndkVersion - sourceSets { - main.java.srcDirs += 'src/main/kotlin' + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 } - lintOptions { - disable 'InvalidPackage' + 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.flutter_app" - minSdkVersion 16 - targetSdkVersion 29 - versionCode flutterVersionCode.toInteger() - versionName flutterVersionName + applicationId = "com.example.flutter_presence_app" + // 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.debug + signingConfig = signingConfigs.debug } } } flutter { - source '../..' -} - -dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + source = "../.." } diff --git a/example/more_examples/flutter_presence_app/android/app/src/debug/AndroidManifest.xml b/example/more_examples/flutter_presence_app/android/app/src/debug/AndroidManifest.xml index b484f56..399f698 100644 --- a/example/more_examples/flutter_presence_app/android/app/src/debug/AndroidManifest.xml +++ b/example/more_examples/flutter_presence_app/android/app/src/debug/AndroidManifest.xml @@ -1,6 +1,6 @@ - - diff --git a/example/more_examples/flutter_presence_app/android/app/src/main/AndroidManifest.xml b/example/more_examples/flutter_presence_app/android/app/src/main/AndroidManifest.xml index 17f8fba..1ae7509 100644 --- a/example/more_examples/flutter_presence_app/android/app/src/main/AndroidManifest.xml +++ b/example/more_examples/flutter_presence_app/android/app/src/main/AndroidManifest.xml @@ -1,18 +1,13 @@ - - + + android:label="flutter_presence_app" + android:name="${applicationName}" + android:icon="@mipmap/ic_launcher"> - - @@ -45,4 +31,15 @@ android:name="flutterEmbedding" android:value="2" /> + + + + + + + diff --git a/example/more_examples/flutter_presence_app/android/app/src/main/kotlin/com/example/flutter_app/MainActivity.kt b/example/more_examples/flutter_presence_app/android/app/src/main/kotlin/com/example/flutter_app/MainActivity.kt deleted file mode 100644 index 1ec9b09..0000000 --- a/example/more_examples/flutter_presence_app/android/app/src/main/kotlin/com/example/flutter_app/MainActivity.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.example.flutter_app - -import io.flutter.embedding.android.FlutterActivity - -class MainActivity: FlutterActivity() { -} diff --git a/example/more_examples/flutter_presence_app/android/app/src/main/res/values/styles.xml b/example/more_examples/flutter_presence_app/android/app/src/main/res/values/styles.xml index 1f83a33..cb1ef88 100644 --- a/example/more_examples/flutter_presence_app/android/app/src/main/res/values/styles.xml +++ b/example/more_examples/flutter_presence_app/android/app/src/main/res/values/styles.xml @@ -1,18 +1,18 @@ - - - diff --git a/example/more_examples/flutter_presence_app/android/app/src/profile/AndroidManifest.xml b/example/more_examples/flutter_presence_app/android/app/src/profile/AndroidManifest.xml index b484f56..399f698 100644 --- a/example/more_examples/flutter_presence_app/android/app/src/profile/AndroidManifest.xml +++ b/example/more_examples/flutter_presence_app/android/app/src/profile/AndroidManifest.xml @@ -1,6 +1,6 @@ - - diff --git a/example/more_examples/flutter_presence_app/android/build.gradle b/example/more_examples/flutter_presence_app/android/build.gradle index 3100ad2..d2ffbff 100644 --- a/example/more_examples/flutter_presence_app/android/build.gradle +++ b/example/more_examples/flutter_presence_app/android/build.gradle @@ -1,31 +1,18 @@ -buildscript { - ext.kotlin_version = '1.3.50' - repositories { - google() - jcenter() - } - - dependencies { - classpath 'com.android.tools.build:gradle:3.5.0' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } -} - allprojects { repositories { google() - jcenter() + mavenCentral() } } -rootProject.buildDir = '../build' +rootProject.buildDir = "../build" subprojects { project.buildDir = "${rootProject.buildDir}/${project.name}" } subprojects { - project.evaluationDependsOn(':app') + project.evaluationDependsOn(":app") } -task clean(type: Delete) { +tasks.register("clean", Delete) { delete rootProject.buildDir } diff --git a/example/more_examples/flutter_presence_app/android/gradle.properties b/example/more_examples/flutter_presence_app/android/gradle.properties index a673820..2597170 100644 --- a/example/more_examples/flutter_presence_app/android/gradle.properties +++ b/example/more_examples/flutter_presence_app/android/gradle.properties @@ -1,4 +1,3 @@ -org.gradle.jvmargs=-Xmx1536M +org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true android.enableJetifier=true -android.enableR8=true diff --git a/example/more_examples/flutter_presence_app/android/gradle/wrapper/gradle-wrapper.properties b/example/more_examples/flutter_presence_app/android/gradle/wrapper/gradle-wrapper.properties index 296b146..7bb2df6 100644 --- a/example/more_examples/flutter_presence_app/android/gradle/wrapper/gradle-wrapper.properties +++ b/example/more_examples/flutter_presence_app/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Fri Jun 23 08:50:38 CEST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip diff --git a/example/more_examples/flutter_presence_app/android/settings.gradle b/example/more_examples/flutter_presence_app/android/settings.gradle index 44e62bc..b9e43bd 100644 --- a/example/more_examples/flutter_presence_app/android/settings.gradle +++ b/example/more_examples/flutter_presence_app/android/settings.gradle @@ -1,11 +1,25 @@ -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 localPropertiesFile = new File(rootProject.projectDir, "local.properties") -def properties = new Properties() + includeBuild("$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 "8.1.0" apply false + id "org.jetbrains.kotlin.android" version "1.8.22" apply false +} + +include ":app" From c18bd70e0fea0a9afbe723bd06a06ef0b0f10ad8 Mon Sep 17 00:00:00 2001 From: dave horner Date: Sun, 17 Nov 2024 02:57:59 -0500 Subject: [PATCH 2/2] git add android to pickup the new files --- .../res/drawable-v21/launch_background.xml | 12 ++++++++++++ .../app/src/main/res/values-night/styles.xml | 18 ++++++++++++++++++ .../flutter_presence_app/MainActivity.kt | 5 +++++ .../res/drawable-v21/launch_background.xml | 12 ++++++++++++ .../app/src/main/res/values-night/styles.xml | 18 ++++++++++++++++++ 5 files changed, 65 insertions(+) create mode 100644 example/more_examples/flutter_app/android/app/src/main/res/drawable-v21/launch_background.xml create mode 100644 example/more_examples/flutter_app/android/app/src/main/res/values-night/styles.xml create mode 100644 example/more_examples/flutter_presence_app/android/app/src/main/kotlin/com/example/flutter_presence_app/MainActivity.kt create mode 100644 example/more_examples/flutter_presence_app/android/app/src/main/res/drawable-v21/launch_background.xml create mode 100644 example/more_examples/flutter_presence_app/android/app/src/main/res/values-night/styles.xml diff --git a/example/more_examples/flutter_app/android/app/src/main/res/drawable-v21/launch_background.xml b/example/more_examples/flutter_app/android/app/src/main/res/drawable-v21/launch_background.xml new file mode 100644 index 0000000..f74085f --- /dev/null +++ b/example/more_examples/flutter_app/android/app/src/main/res/drawable-v21/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/example/more_examples/flutter_app/android/app/src/main/res/values-night/styles.xml b/example/more_examples/flutter_app/android/app/src/main/res/values-night/styles.xml new file mode 100644 index 0000000..06952be --- /dev/null +++ b/example/more_examples/flutter_app/android/app/src/main/res/values-night/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/example/more_examples/flutter_presence_app/android/app/src/main/kotlin/com/example/flutter_presence_app/MainActivity.kt b/example/more_examples/flutter_presence_app/android/app/src/main/kotlin/com/example/flutter_presence_app/MainActivity.kt new file mode 100644 index 0000000..6cf24b9 --- /dev/null +++ b/example/more_examples/flutter_presence_app/android/app/src/main/kotlin/com/example/flutter_presence_app/MainActivity.kt @@ -0,0 +1,5 @@ +package com.example.flutter_presence_app + +import io.flutter.embedding.android.FlutterActivity + +class MainActivity: FlutterActivity() diff --git a/example/more_examples/flutter_presence_app/android/app/src/main/res/drawable-v21/launch_background.xml b/example/more_examples/flutter_presence_app/android/app/src/main/res/drawable-v21/launch_background.xml new file mode 100644 index 0000000..f74085f --- /dev/null +++ b/example/more_examples/flutter_presence_app/android/app/src/main/res/drawable-v21/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/example/more_examples/flutter_presence_app/android/app/src/main/res/values-night/styles.xml b/example/more_examples/flutter_presence_app/android/app/src/main/res/values-night/styles.xml new file mode 100644 index 0000000..06952be --- /dev/null +++ b/example/more_examples/flutter_presence_app/android/app/src/main/res/values-night/styles.xml @@ -0,0 +1,18 @@ + + + + + + +