Merge pull request #11 from flet-dev/0.23.0-fix1

Fix dependencies

cookiecutter.json

@@ -7,6 +7,7 @@
     "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,

{{cookiecutter.out_dir}}/android/app/build.gradle

@@ -41,11 +41,8 @@ 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.
+        minSdkVersion 23
-        // 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
@@ -57,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
         }
     }
@@ -68,4 +63,4 @@ flutter {
     source '../..'
 }
 
-dependencies {}
+dependencies {}

{{cookiecutter.out_dir}}/android/app/src/debug/AndroidManifest.xml

@@ -3,5 +3,6 @@
          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.INTERNET" />
-</manifest>
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+</manifest>

{{cookiecutter.out_dir}}/android/app/src/main/AndroidManifest.xml

@@ -1,9 +1,13 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <application
-        android:label="{{ cookiecutter.project_name }}"
+        android:label="{{ cookiecutter.product_name }}"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
+        <meta-data
+                android:name="io.flutter.embedding.android.EnableImpeller"
+                android:value="true"/>
         <activity
             android:name=".MainActivity"
             android:exported="true"
@@ -17,12 +21,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:name="io.flutter.embedding.android.NormalTheme"
-              android:resource="@style/NormalTheme"
+                android:resource="@style/NormalTheme"
-              />
+            />
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
+                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <!-- Don't delete the meta-data below.
@@ -31,4 +35,4 @@
             android:name="flutterEmbedding"
             android:value="2" />
     </application>
-</manifest>
+</manifest>

{{cookiecutter.out_dir}}/android/app/src/profile/AndroidManifest.xml

@@ -3,5 +3,6 @@
          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.INTERNET" />
-</manifest>
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+</manifest>

{{cookiecutter.out_dir}}/android/build.gradle

@@ -1,12 +1,11 @@
 buildscript {
-    ext.kotlin_version = '1.7.10'
+    ext.kotlin_version = '1.7.22'
     repositories {
         google()
         mavenCentral()
     }
 
     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
-}
+}

{{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"

{{cookiecutter.out_dir}}/ios/Runner/Info.plist

@@ -1,49 +1,56 @@
 <?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>
+	<dict>
-	<key>CFBundleDevelopmentRegion</key>
+		<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
+		<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleDisplayName</key>
+		<key>CFBundleDisplayName</key>
-	<string>{{ cookiecutter.product_name }}</string>
+		<string>{{ cookiecutter.product_name }}</string>
-	<key>CFBundleExecutable</key>
+		<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
+		<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
+		<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+		<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
+		<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
+		<string>6.0</string>
-	<key>CFBundleName</key>
+		<key>CFBundleName</key>
-	<string>{{ cookiecutter.project_name }}</string>
+		<string>{{ cookiecutter.project_name }}</string>
-	<key>CFBundlePackageType</key>
+		<key>CFBundlePackageType</key>
-	<string>APPL</string>
+		<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
+		<key>CFBundleShortVersionString</key>
-	<string>$(FLUTTER_BUILD_NAME)</string>
+		<string>$(FLUTTER_BUILD_NAME)</string>
-	<key>CFBundleSignature</key>
+		<key>CFBundleSignature</key>
-	<string>????</string>
+		<string>????</string>
-	<key>CFBundleVersion</key>
+		<key>CFBundleVersion</key>
-	<string>$(FLUTTER_BUILD_NUMBER)</string>
+		<string>$(FLUTTER_BUILD_NUMBER)</string>
-	<key>LSRequiresIPhoneOS</key>
+		<key>LSRequiresIPhoneOS</key>
-	<true/>
+		<true />
-	<key>UILaunchStoryboardName</key>
+		<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
+		<string>LaunchScreen</string>
-	<key>UIMainStoryboardFile</key>
+		<key>UIMainStoryboardFile</key>
-	<string>Main</string>
+		<string>Main</string>
-	<key>UISupportedInterfaceOrientations</key>
+		<key>UISupportedInterfaceOrientations</key>
-	<array>
+		<array>
-		<string>UIInterfaceOrientationPortrait</string>
+			<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
+			<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
+			<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
+		</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
+		<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
+		<array>
-		<string>UIInterfaceOrientationPortrait</string>
+			<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+			<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
+			<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
+			<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
+		</array>
-	<key>CADisableMinimumFrameDurationOnPhone</key>
+		<key>CADisableMinimumFrameDurationOnPhone</key>
-	<true/>
+		<true />
-	<key>UIApplicationSupportsIndirectInputEvents</key>
+		<key>UIApplicationSupportsIndirectInputEvents</key>
-	<true/>
+		<true />
-</dict>
+		<key>NSAppTransportSecurity</key>
-</plist>
+		<dict>
+			<key>NSAllowsArbitraryLoads</key>
+			<true />
+		</dict>
+		<key>NSMicrophoneUsageDescription</key>
+		<string>Audio Recording</string>
+	</dict>
+</plist>

{{cookiecutter.out_dir}}/lib/main.dart

@@ -9,6 +9,10 @@ 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";
@@ -19,12 +23,21 @@ 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
 
 os.environ["REQUESTS_CA_BUNDLE"] = certifi.where()
 os.environ["SSL_CERT_FILE"] = certifi.where()
 
+# fix for: https://github.com/flet-dev/serious-python/issues/85#issuecomment-2065000974
+os.environ["OPENBLAS_NUM_THREADS"] = "1"
+
 if os.getenv("FLET_PLATFORM") == "android":
     import ssl
 
@@ -79,6 +92,10 @@ 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) {
@@ -89,6 +106,7 @@ void main() async {
                   pageUrl: pageUrl,
                   assetsDir: assetsDir,
                   hideLoadingPage: hideLoadingPage,
+                  createControlFactories: createControlFactories
                 )
               : FutureBuilder(
                   future: runPythonApp(),
@@ -107,6 +125,7 @@ void main() async {
                         pageUrl: pageUrl,
                         assetsDir: assetsDir,
                         hideLoadingPage: hideLoadingPage,
+                        createControlFactories: createControlFactories
                       );
                     }
                   });

{{cookiecutter.out_dir}}/macos/Runner/Info.plist

@@ -1,32 +1,36 @@
 <?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>
+	<dict>
-	<key>CFBundleDevelopmentRegion</key>
+    <key>FLTEnableImpeller</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
+    <true />
-	<key>CFBundleExecutable</key>
+		<key>CFBundleDevelopmentRegion</key>
-	<string>$(EXECUTABLE_NAME)</string>
+		<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleIconFile</key>
+		<key>CFBundleExecutable</key>
-	<string></string>
+		<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
+		<key>CFBundleIconFile</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+		<string></string>
-	<key>CFBundleInfoDictionaryVersion</key>
+		<key>CFBundleIdentifier</key>
-	<string>6.0</string>
+		<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleName</key>
+		<key>CFBundleInfoDictionaryVersion</key>
-	<string>$(PRODUCT_NAME)</string>
+		<string>6.0</string>
-	<key>CFBundlePackageType</key>
+		<key>CFBundleName</key>
-	<string>APPL</string>
+		<string>$(PRODUCT_NAME)</string>
-	<key>CFBundleShortVersionString</key>
+		<key>CFBundlePackageType</key>
-	<string>$(FLUTTER_BUILD_NAME)</string>
+		<string>APPL</string>
-	<key>CFBundleVersion</key>
+		<key>CFBundleShortVersionString</key>
-	<string>$(FLUTTER_BUILD_NUMBER)</string>
+		<string>$(FLUTTER_BUILD_NAME)</string>
-	<key>LSMinimumSystemVersion</key>
+		<key>CFBundleVersion</key>
-	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
+		<string>$(FLUTTER_BUILD_NUMBER)</string>
-	<key>NSHumanReadableCopyright</key>
+		<key>LSMinimumSystemVersion</key>
-	<string>$(PRODUCT_COPYRIGHT)</string>
+		<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
-	<key>NSMainNibFile</key>
+		<key>NSHumanReadableCopyright</key>
-	<string>MainMenu</string>
+		<string>$(PRODUCT_COPYRIGHT)</string>
-	<key>NSPrincipalClass</key>
+		<key>NSMainNibFile</key>
-	<string>NSApplication</string>
+		<string>MainMenu</string>
-</dict>
+		<key>NSPrincipalClass</key>
-</plist>
+		<string>NSApplication</string>
+		<key>NSMicrophoneUsageDescription</key>
+		<string>Audio Recording</string>
+	</dict>
+</plist>

{{cookiecutter.out_dir}}/pubspec.yaml

@@ -12,22 +12,15 @@ dependencies:
     sdk: flutter
 
   serious_python: ^0.7.0
-  # serious_python:
+  flet: ^0.23.0
-  #   git:
-  #     url: https://github.com/flet-dev/serious-python
-  #     path: src/serious_python
-  #     ref: 'd059aef'
-
-  flet: ^0.19.0
-  # flet:
-  #   git:
-  #     url: https://github.com/flet-dev/flet.git
-  #     path: package
-  #     ref: '37b9581'
   
   path: ^1.8.3
   url_strategy: ^0.2.0
-  cupertino_icons: ^1.0.2
+  cupertino_icons: ^1.0.6
+
+dependency_overrides:
+  wakelock_plus: ^1.2.5
+  package_info_plus: ^8.0.0
 
 dev_dependencies:
   flutter_test:

{{cookiecutter.out_dir}}/web/python-worker.js

@@ -1,4 +1,4 @@
-importScripts("https://cdn.jsdelivr.net/pyodide/v0.24.1/full/pyodide.js");
+importScripts("https://cdn.jsdelivr.net/pyodide/v0.25.0/full/pyodide.js");
 
 self.pythonModuleName = null;
 self.initialized = false;