11 changed files with 72 additions and 102 deletions
--- a/cookiecutter.json
+++ b/cookiecutter.json
@ -7,7 +7,6 @@
    "org_name": "com.flet",
    "company_name": "Your Company",
    "copyright": "Copyright (c) 2023 Your Company",
-    "flutter": null,
    "sep": "/",
    "kotlin_dir": "{{ cookiecutter.org_name.replace('.', cookiecutter.sep) }}{{ cookiecutter.sep }}{{ cookiecutter.project_name }}{{ cookiecutter.sep }}",
    "hide_loading_animation": true,
--- a/{{cookiecutter.out_dir}}/android/app/build.gradle
+++ b/{{cookiecutter.out_dir}}/android/app/build.gradle
@ -41,8 +41,11 @@ 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 }}"
-        minSdkVersion 21
+        // 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
@ -54,6 +57,8 @@ 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
        }
    }
@ -63,4 +68,4 @@ flutter {
    source '../..'
 }

-dependencies {}
+dependencies {}
--- a/{{cookiecutter.out_dir}}/android/app/src/debug/AndroidManifest.xml
+++ b/{{cookiecutter.out_dir}}/android/app/src/debug/AndroidManifest.xml
@ -3,6 +3,5 @@
         the Flutter tool needs it to communicate with the running application
         to allow setting breakpoints, to provide hot reload, etc.
    -->
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
-</manifest>
+    <uses-permission android:name="android.permission.INTERNET"/>
+</manifest>
--- a/{{cookiecutter.out_dir}}/android/app/src/main/AndroidManifest.xml
+++ b/{{cookiecutter.out_dir}}/android/app/src/main/AndroidManifest.xml
@ -1,8 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.INTERNET"/>
    <application
-        android:label="{{ cookiecutter.product_name }}"
+        android:label="{{ cookiecutter.project_name }}"
        android:name="${applicationName}"
        android:icon="@mipmap/ic_launcher">
        <activity
@ -18,12 +17,12 @@
                 while the Flutter UI initializes. After that, this theme continues
                 to determine the Window background behind the Flutter UI. -->
            <meta-data
-                android:name="io.flutter.embedding.android.NormalTheme"
-                android:resource="@style/NormalTheme"
-            />
+              android:name="io.flutter.embedding.android.NormalTheme"
+              android:resource="@style/NormalTheme"
+              />
            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
            </intent-filter>
        </activity>
        <!-- Don't delete the meta-data below.
@ -32,4 +31,4 @@
            android:name="flutterEmbedding"
            android:value="2" />
    </application>
-</manifest>
+</manifest>
--- a/{{cookiecutter.out_dir}}/android/app/src/profile/AndroidManifest.xml
+++ b/{{cookiecutter.out_dir}}/android/app/src/profile/AndroidManifest.xml
@ -3,6 +3,5 @@
         the Flutter tool needs it to communicate with the running application
         to allow setting breakpoints, to provide hot reload, etc.
    -->
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
-</manifest>
+    <uses-permission android:name="android.permission.INTERNET"/>
+</manifest>
--- 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:7.4.2'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
    }
 }
@ -27,4 +28,4 @@ subprojects {

 tasks.register("clean", Delete) {
    delete rootProject.buildDir
-}
+}
--- a/{{cookiecutter.out_dir}}/android/settings.gradle
+++ b/{{cookiecutter.out_dir}}/android/settings.gradle
@ -10,20 +10,11 @@ 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
    }
 }

-plugins {
-    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.3.0" apply false
-}
+include ":app"

-include ":app"
+apply from: "${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle/app_plugin_loader.gradle"
--- a/{{cookiecutter.out_dir}}/ios/Runner/Info.plist
+++ b/{{cookiecutter.out_dir}}/ios/Runner/Info.plist
@ -1,56 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-	<dict>
-		<key>CFBundleDevelopmentRegion</key>
-		<string>$(DEVELOPMENT_LANGUAGE)</string>
-		<key>CFBundleDisplayName</key>
-		<string>{{ cookiecutter.product_name }}</string>
-		<key>CFBundleExecutable</key>
-		<string>$(EXECUTABLE_NAME)</string>
-		<key>CFBundleIdentifier</key>
-		<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-		<key>CFBundleInfoDictionaryVersion</key>
-		<string>6.0</string>
-		<key>CFBundleName</key>
-		<string>{{ cookiecutter.project_name }}</string>
-		<key>CFBundlePackageType</key>
-		<string>APPL</string>
-		<key>CFBundleShortVersionString</key>
-		<string>$(FLUTTER_BUILD_NAME)</string>
-		<key>CFBundleSignature</key>
-		<string>????</string>
-		<key>CFBundleVersion</key>
-		<string>$(FLUTTER_BUILD_NUMBER)</string>
-		<key>LSRequiresIPhoneOS</key>
-		<true />
-		<key>UILaunchStoryboardName</key>
-		<string>LaunchScreen</string>
-		<key>UIMainStoryboardFile</key>
-		<string>Main</string>
-		<key>UISupportedInterfaceOrientations</key>
-		<array>
-			<string>UIInterfaceOrientationPortrait</string>
-			<string>UIInterfaceOrientationLandscapeLeft</string>
-			<string>UIInterfaceOrientationLandscapeRight</string>
-		</array>
-		<key>UISupportedInterfaceOrientations~ipad</key>
-		<array>
-			<string>UIInterfaceOrientationPortrait</string>
-			<string>UIInterfaceOrientationPortraitUpsideDown</string>
-			<string>UIInterfaceOrientationLandscapeLeft</string>
-			<string>UIInterfaceOrientationLandscapeRight</string>
-		</array>
-		<key>CADisableMinimumFrameDurationOnPhone</key>
-		<true />
-		<key>UIApplicationSupportsIndirectInputEvents</key>
-		<true />
-		<key>NSAppTransportSecurity</key>
-		<dict>
-			<key>NSAllowsArbitraryLoads</key>
-			<true />
-		</dict>
-		<key>NSMicrophoneUsageDescription</key>
-		<string>Audio Recording</string>
-	</dict>
-</plist>
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleDisplayName</key>
+	<string>{{ cookiecutter.product_name }}</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>{{ cookiecutter.project_name }}</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>$(FLUTTER_BUILD_NAME)</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>$(FLUTTER_BUILD_NUMBER)</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
+	<key>UIMainStoryboardFile</key>
+	<string>Main</string>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>CADisableMinimumFrameDurationOnPhone</key>
+	<true/>
+	<key>UIApplicationSupportsIndirectInputEvents</key>
+	<true/>
+</dict>
+</plist>
--- a/{{cookiecutter.out_dir}}/lib/main.dart
+++ b/{{cookiecutter.out_dir}}/lib/main.dart
@ -9,10 +9,6 @@ import 'package:path/path.dart' as path;
 import 'package:serious_python/serious_python.dart';
 import 'package:url_strategy/url_strategy.dart';

-{% for dep in cookiecutter.flutter.dependencies %}
-import 'package:{{ dep }}/{{ dep }}.dart' as {{ dep }};
-{% endfor %}
-
 const bool isProduction = bool.fromEnvironment('dart.vm.product');

 const assetPath = "app/app.zip";
@ -23,12 +19,6 @@ final hideLoadingPage =
 const outLogFilename = "out.log";
 const errorExitCode = 100;

-List<CreateControlFactory> createControlFactories = [
-{% for dep in cookiecutter.flutter.dependencies %}
-{{ dep }}.createControl,
-{% endfor %}
-];
-
 const pythonScript = """
 import certifi, os, runpy, socket, sys, traceback

@ -89,10 +79,6 @@ void main() async {
    debugPrint = (String? message, {int? wrapWidth}) => null;
  }

-  {% for dep in cookiecutter.flutter.dependencies %}
-  {{ dep }}.ensureInitialized();
-  {% endfor %}
-
  runApp(FutureBuilder(
      future: prepareApp(),
      builder: (BuildContext context, AsyncSnapshot snapshot) {
@ -103,7 +89,6 @@ void main() async {
                  pageUrl: pageUrl,
                  assetsDir: assetsDir,
                  hideLoadingPage: hideLoadingPage,
-                  createControlFactories: createControlFactories
                )
              : FutureBuilder(
                  future: runPythonApp(),
@ -122,7 +107,6 @@ void main() async {
                        pageUrl: pageUrl,
                        assetsDir: assetsDir,
                        hideLoadingPage: hideLoadingPage,
-                        createControlFactories: createControlFactories
                      );
                    }
                  });
--- 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.21.0
+  flet: ^0.19.0
  # flet:
  #   git:
  #     url: https://github.com/flet-dev/flet.git
@ -27,7 +27,7 @@ dependencies:
  
  path: ^1.8.3
  url_strategy: ^0.2.0
-  cupertino_icons: ^1.0.6
+  cupertino_icons: ^1.0.2

 dev_dependencies:
  flutter_test:
--- a/{{cookiecutter.out_dir}}/web/python-worker.js
+++ b/{{cookiecutter.out_dir}}/web/python-worker.js
@ -1,4 +1,4 @@
-importScripts("https://cdn.jsdelivr.net/pyodide/v0.25.0/full/pyodide.js");
+importScripts("https://cdn.jsdelivr.net/pyodide/v0.24.1/full/pyodide.js");

 self.pythonModuleName = null;
 self.initialized = false;