From 6e2e7eebc8de2042205df5d5abd6023360ad5662 Mon Sep 17 00:00:00 2001 From: Feodor Fitsner Date: Wed, 19 Jun 2024 14:39:58 -0700 Subject: [PATCH 01/13] Flet 0.23.0 --- {{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 21754b7..86a171f 100644 --- a/{{cookiecutter.out_dir}}/pubspec.yaml +++ b/{{cookiecutter.out_dir}}/pubspec.yaml @@ -12,7 +12,7 @@ dependencies: sdk: flutter serious_python: ^0.7.0 - flet: ^0.23.1 + flet: ^0.23.0 path: ^1.8.3 url_strategy: ^0.2.0 From 516518871e2735ed453f9e7c8bffe6bf0bae9004 Mon Sep 17 00:00:00 2001 From: Feodor Fitsner Date: Wed, 19 Jun 2024 14:46:32 -0700 Subject: [PATCH 02/13] Kotlin 1.8.21 --- {{cookiecutter.out_dir}}/android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.out_dir}}/android/build.gradle b/{{cookiecutter.out_dir}}/android/build.gradle index 5b47068..e1d855d 100644 --- a/{{cookiecutter.out_dir}}/android/build.gradle +++ b/{{cookiecutter.out_dir}}/android/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '1.7.22' + ext.kotlin_version = '1.8.21' repositories { google() mavenCentral() From e7a3ede0ee0ad02b949c869bcc46242507d04649 Mon Sep 17 00:00:00 2001 From: Feodor Fitsner Date: Wed, 19 Jun 2024 14:54:51 -0700 Subject: [PATCH 03/13] gradle:8.4.1 --- {{cookiecutter.out_dir}}/android/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/{{cookiecutter.out_dir}}/android/build.gradle b/{{cookiecutter.out_dir}}/android/build.gradle index e1d855d..acf2903 100644 --- a/{{cookiecutter.out_dir}}/android/build.gradle +++ b/{{cookiecutter.out_dir}}/android/build.gradle @@ -6,6 +6,7 @@ buildscript { } dependencies { + classpath 'com.android.tools.build:gradle:8.4.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } From 2eb1727362edaee2d90f8f9b251105032c999769 Mon Sep 17 00:00:00 2001 From: Feodor Fitsner Date: Wed, 19 Jun 2024 15:45:08 -0700 Subject: [PATCH 04/13] Rollback Kotlin version --- {{cookiecutter.out_dir}}/android/build.gradle | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/{{cookiecutter.out_dir}}/android/build.gradle b/{{cookiecutter.out_dir}}/android/build.gradle index acf2903..5b47068 100644 --- a/{{cookiecutter.out_dir}}/android/build.gradle +++ b/{{cookiecutter.out_dir}}/android/build.gradle @@ -1,12 +1,11 @@ buildscript { - ext.kotlin_version = '1.8.21' + ext.kotlin_version = '1.7.22' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.4.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } From 6da7a3ae8ff14407476180fb6cd2b78b52214726 Mon Sep 17 00:00:00 2001 From: Feodor Fitsner Date: Wed, 19 Jun 2024 15:47:48 -0700 Subject: [PATCH 05/13] record: ^5.1.1 --- {{cookiecutter.out_dir}}/pubspec.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/{{cookiecutter.out_dir}}/pubspec.yaml b/{{cookiecutter.out_dir}}/pubspec.yaml index 86a171f..2c8469a 100644 --- a/{{cookiecutter.out_dir}}/pubspec.yaml +++ b/{{cookiecutter.out_dir}}/pubspec.yaml @@ -21,6 +21,7 @@ dependencies: dependency_overrides: wakelock_plus: ^1.2.5 package_info_plus: ^8.0.0 + record: ^5.1.1 dev_dependencies: flutter_test: From e7ecd3baffde4aa1394dd257b25c9031c969e35c Mon Sep 17 00:00:00 2001 From: Feodor Fitsner Date: Wed, 19 Jun 2024 15:50:46 -0700 Subject: [PATCH 06/13] Bump gradle 8.3.1 --- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- {{cookiecutter.out_dir}}/android/settings.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.out_dir}}/android/gradle/wrapper/gradle-wrapper.properties b/{{cookiecutter.out_dir}}/android/gradle/wrapper/gradle-wrapper.properties index a0419d7..a10c821 100644 --- a/{{cookiecutter.out_dir}}/android/gradle/wrapper/gradle-wrapper.properties +++ b/{{cookiecutter.out_dir}}/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip \ No newline at end of file +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip \ No newline at end of file diff --git a/{{cookiecutter.out_dir}}/android/settings.gradle b/{{cookiecutter.out_dir}}/android/settings.gradle index 45d92d2..209c9c4 100644 --- a/{{cookiecutter.out_dir}}/android/settings.gradle +++ b/{{cookiecutter.out_dir}}/android/settings.gradle @@ -23,7 +23,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "7.3.0" apply false + id "com.android.application" version "8.3.1" apply false } include ":app" \ No newline at end of file From 5b39497d201f5c52d596c13f7b9411fb4bd613dd Mon Sep 17 00:00:00 2001 From: Feodor Fitsner Date: Wed, 19 Jun 2024 16:00:16 -0700 Subject: [PATCH 07/13] Use serious_python from github --- {{cookiecutter.out_dir}}/pubspec.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/{{cookiecutter.out_dir}}/pubspec.yaml b/{{cookiecutter.out_dir}}/pubspec.yaml index 2c8469a..dd72b5b 100644 --- a/{{cookiecutter.out_dir}}/pubspec.yaml +++ b/{{cookiecutter.out_dir}}/pubspec.yaml @@ -11,7 +11,10 @@ dependencies: flutter: sdk: flutter - serious_python: ^0.7.0 + serious_python: + git: + url: https://github.com/flet-dev/serious-python.git + ref: 0.7-fix flet: ^0.23.0 path: ^1.8.3 From 6377f131b88c26b061c14d8456a93648381c0fa2 Mon Sep 17 00:00:00 2001 From: Feodor Fitsner Date: Wed, 19 Jun 2024 16:01:39 -0700 Subject: [PATCH 08/13] Fix path --- {{cookiecutter.out_dir}}/pubspec.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/{{cookiecutter.out_dir}}/pubspec.yaml b/{{cookiecutter.out_dir}}/pubspec.yaml index dd72b5b..464890a 100644 --- a/{{cookiecutter.out_dir}}/pubspec.yaml +++ b/{{cookiecutter.out_dir}}/pubspec.yaml @@ -14,6 +14,7 @@ dependencies: serious_python: git: url: https://github.com/flet-dev/serious-python.git + path: src ref: 0.7-fix flet: ^0.23.0 From f42393a5ae58aa67aa186c8a9f1b8748c6d00788 Mon Sep 17 00:00:00 2001 From: Feodor Fitsner Date: Wed, 19 Jun 2024 16:03:08 -0700 Subject: [PATCH 09/13] override serious_python_android only --- {{cookiecutter.out_dir}}/pubspec.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/{{cookiecutter.out_dir}}/pubspec.yaml b/{{cookiecutter.out_dir}}/pubspec.yaml index 464890a..951da85 100644 --- a/{{cookiecutter.out_dir}}/pubspec.yaml +++ b/{{cookiecutter.out_dir}}/pubspec.yaml @@ -11,11 +11,7 @@ dependencies: flutter: sdk: flutter - serious_python: - git: - url: https://github.com/flet-dev/serious-python.git - path: src - ref: 0.7-fix + serious_python: ^0.7.0 flet: ^0.23.0 path: ^1.8.3 @@ -26,6 +22,11 @@ dependency_overrides: wakelock_plus: ^1.2.5 package_info_plus: ^8.0.0 record: ^5.1.1 + serious_python_android: + git: + url: https://github.com/flet-dev/serious-python.git + path: src/serious_python_android + ref: 0.7-fix dev_dependencies: flutter_test: From 9c399dfaaeb2909521b051cc595cae34ba6318e4 Mon Sep 17 00:00:00 2001 From: Feodor Fitsner Date: Wed, 19 Jun 2024 16:04:30 -0700 Subject: [PATCH 10/13] Override serious_python_platform_interface --- {{cookiecutter.out_dir}}/pubspec.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/{{cookiecutter.out_dir}}/pubspec.yaml b/{{cookiecutter.out_dir}}/pubspec.yaml index 951da85..2ab89a3 100644 --- a/{{cookiecutter.out_dir}}/pubspec.yaml +++ b/{{cookiecutter.out_dir}}/pubspec.yaml @@ -27,6 +27,11 @@ dependency_overrides: url: https://github.com/flet-dev/serious-python.git path: src/serious_python_android ref: 0.7-fix + serious_python_platform_interface: + git: + url: https://github.com/flet-dev/serious-python.git + path: src/serious_python_platform_interface + ref: 0.7-fix dev_dependencies: flutter_test: From 0ca26dd6b5423b470cbcf4a8295bdbccbf90ed1b Mon Sep 17 00:00:00 2001 From: Feodor Fitsner Date: Wed, 19 Jun 2024 16:27:40 -0700 Subject: [PATCH 11/13] ndkVersion "26.3.11579264" --- {{cookiecutter.out_dir}}/android/app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.out_dir}}/android/app/build.gradle b/{{cookiecutter.out_dir}}/android/app/build.gradle index 59a566d..5ff7e13 100644 --- a/{{cookiecutter.out_dir}}/android/app/build.gradle +++ b/{{cookiecutter.out_dir}}/android/app/build.gradle @@ -25,7 +25,7 @@ if (flutterVersionName == null) { android { namespace "{{ cookiecutter.org_name }}.{{ cookiecutter.project_name }}" compileSdkVersion flutter.compileSdkVersion - ndkVersion flutter.ndkVersion + ndkVersion "26.3.11579264" compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 From a58c6ffa929032b2181b26b5d953d2ab26562bc9 Mon Sep 17 00:00:00 2001 From: Feodor Fitsner Date: Wed, 19 Jun 2024 16:38:03 -0700 Subject: [PATCH 12/13] ndkVersion "25.1.8937393" --- {{cookiecutter.out_dir}}/android/app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.out_dir}}/android/app/build.gradle b/{{cookiecutter.out_dir}}/android/app/build.gradle index 5ff7e13..4a4391f 100644 --- a/{{cookiecutter.out_dir}}/android/app/build.gradle +++ b/{{cookiecutter.out_dir}}/android/app/build.gradle @@ -25,7 +25,7 @@ if (flutterVersionName == null) { android { namespace "{{ cookiecutter.org_name }}.{{ cookiecutter.project_name }}" compileSdkVersion flutter.compileSdkVersion - ndkVersion "26.3.11579264" + ndkVersion "25.1.8937393" compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 From 24d1a7056e1a69b5d2ad77d2712759556aee76a1 Mon Sep 17 00:00:00 2001 From: Feodor Fitsner Date: Wed, 19 Jun 2024 16:54:24 -0700 Subject: [PATCH 13/13] flet: ^0.23.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 2ab89a3..3375198 100644 --- a/{{cookiecutter.out_dir}}/pubspec.yaml +++ b/{{cookiecutter.out_dir}}/pubspec.yaml @@ -12,7 +12,7 @@ dependencies: sdk: flutter serious_python: ^0.7.0 - flet: ^0.23.0 + flet: ^0.23.1 path: ^1.8.3 url_strategy: ^0.2.0