From 5e1d40c94c335eb3f76692bca3729910960d637b Mon Sep 17 00:00:00 2001 From: Feodor Fitsner Date: Fri, 16 Feb 2024 12:16:41 -0800 Subject: [PATCH 1/3] Remove minSdkVersion 21 --- {{cookiecutter.out_dir}}/android/app/build.gradle | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/{{cookiecutter.out_dir}}/android/app/build.gradle b/{{cookiecutter.out_dir}}/android/app/build.gradle index 6a707bf..3248c35 100644 --- a/{{cookiecutter.out_dir}}/android/app/build.gradle +++ b/{{cookiecutter.out_dir}}/android/app/build.gradle @@ -41,17 +41,12 @@ android { } defaultConfig { - // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "{{ cookiecutter.org_name }}.{{ cookiecutter.project_name }}" - // 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. minSdkVersion flutter.minSdkVersion targetSdkVersion flutter.targetSdkVersion versionCode flutterVersionCode.toInteger() versionName flutterVersionName - minSdkVersion 21 - ndk { abiFilters 'arm64-v8a', 'armeabi-v7a' } @@ -59,8 +54,6 @@ android { 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 } } @@ -70,4 +63,4 @@ flutter { source '../..' } -dependencies {} +dependencies {} \ No newline at end of file From d48614191d507802702968cfecc053ffb7f177d3 Mon Sep 17 00:00:00 2001 From: Feodor Fitsner Date: Fri, 16 Feb 2024 12:19:14 -0800 Subject: [PATCH 2/3] Fix settings.gradle --- {{cookiecutter.out_dir}}/android/build.gradle | 3 +-- {{cookiecutter.out_dir}}/android/settings.gradle | 13 +++++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/{{cookiecutter.out_dir}}/android/build.gradle b/{{cookiecutter.out_dir}}/android/build.gradle index ce647a4..2dcf86f 100644 --- a/{{cookiecutter.out_dir}}/android/build.gradle +++ b/{{cookiecutter.out_dir}}/android/build.gradle @@ -6,7 +6,6 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -28,4 +27,4 @@ subprojects { tasks.register("clean", Delete) { delete rootProject.buildDir -} +} \ No newline at end of file diff --git a/{{cookiecutter.out_dir}}/android/settings.gradle b/{{cookiecutter.out_dir}}/android/settings.gradle index 55c4ca8..45d92d2 100644 --- a/{{cookiecutter.out_dir}}/android/settings.gradle +++ b/{{cookiecutter.out_dir}}/android/settings.gradle @@ -10,11 +10,20 @@ pluginManagement { includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle") + repositories { + google() + mavenCentral() + gradlePluginPortal() + } + plugins { id "dev.flutter.flutter-gradle-plugin" version "1.0.0" apply false } } -include ":app" +plugins { + id "dev.flutter.flutter-plugin-loader" version "1.0.0" + id "com.android.application" version "7.3.0" apply false +} -apply from: "${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle/app_plugin_loader.gradle" +include ":app" \ No newline at end of file From d96ce5a5711198951e211c4b3a3bea27d0504bff Mon Sep 17 00:00:00 2001 From: Feodor Fitsner Date: Fri, 16 Feb 2024 17:38:57 -0800 Subject: [PATCH 3/3] Use Flet 0.20.1 --- {{cookiecutter.out_dir}}/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.out_dir}}/pubspec.yaml b/{{cookiecutter.out_dir}}/pubspec.yaml index 6e8deab..8a23035 100644 --- a/{{cookiecutter.out_dir}}/pubspec.yaml +++ b/{{cookiecutter.out_dir}}/pubspec.yaml @@ -18,7 +18,7 @@ dependencies: # path: src/serious_python # ref: 'd059aef' - flet: ^0.20.0 + flet: ^0.20.1 # flet: # git: # url: https://github.com/flet-dev/flet.git