From 47ba15bd970d0a43b0c8172cc56c121a27c20367 Mon Sep 17 00:00:00 2001
From: Feodor Fitsner <feodor@appveyor.com>
Date: Wed, 26 Feb 2025 17:23:45 -0800
Subject: [PATCH] Chec in gradle script

---
 {{cookiecutter.out_dir}}/.vars                    |  7 +------
 {{cookiecutter.out_dir}}/android/app/build.gradle | 14 +++++++++-----
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/{{cookiecutter.out_dir}}/.vars b/{{cookiecutter.out_dir}}/.vars
index cc19da8..f281c74 100644
--- a/{{cookiecutter.out_dir}}/.vars
+++ b/{{cookiecutter.out_dir}}/.vars
@@ -1,8 +1,3 @@
 {% for key, value in cookiecutter.items() -%}
 {{ key }}: {{ value }}
-{% endfor %}
-
-{% import "_macros.jinja2" as macros %}
-
-{% set min_sdk_version = macros.get_value(cookiecutter.pyproject, "tool.flet.android.min_sdk_version1") | trim %}
-min_sdk_version: {{ min_sdk_version if min_sdk_version else "flutter.minSdkVersion" }}
\ No newline at end of file
+{% endfor %}
\ No newline at end of file
diff --git a/{{cookiecutter.out_dir}}/android/app/build.gradle b/{{cookiecutter.out_dir}}/android/app/build.gradle
index 42abc2b..960e55a 100644
--- a/{{cookiecutter.out_dir}}/android/app/build.gradle
+++ b/{{cookiecutter.out_dir}}/android/app/build.gradle
@@ -1,3 +1,4 @@
+{% import "../../_macros.jinja2" as macros %}
 plugins {
     id "com.android.application"
     id "kotlin-android"
@@ -49,16 +50,19 @@ android {
         main.java.srcDirs += 'src/main/kotlin'
     }
 
-    defaultConfig {
+    {% set min_sdk_version = macros.get_value(cookiecutter.pyproject, "tool.flet.android.min_sdk_version") | trim %}
+    {% set target_sdk_version = macros.get_value(cookiecutter.pyproject, "tool.flet.android.target_sdk_version") | trim %}
+
+    defaultConfig {        
         applicationId "{{ cookiecutter.org_name_2 }}.{{ cookiecutter.package_name }}"
-        minSdkVersion flutter.minSdkVersion
-        targetSdkVersion flutter.targetSdkVersion
+        minSdkVersion {{ min_sdk_version if min_sdk_version else "flutter.minSdkVersion" }}
+        targetSdkVersion {{ target_sdk_version if target_sdk_version else "flutter.targetSdkVersion" }}
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
 
         println("Gradle build config:")
-        println("  minSdkVersion: $flutter.minSdkVersion")
-        println("  targetSdkVersion: $flutter.targetSdkVersion")
+        println("  minSdkVersion: {{ min_sdk_version if min_sdk_version else "$flutter.minSdkVersion" }}")
+        println("  targetSdkVersion: {{ target_sdk_version if target_sdk_version else "$flutter.targetSdkVersion" }}")
         println("  versionCode: $flutter.versionCode")
         println("  versionName: $flutter.versionName")