new goldens and minor windows build update

win containers

.drone.yml

@@ -8,7 +8,7 @@ clone:
 
 steps:
   - name: clone
-    image: openpriv/flutter-desktop:linux-fstable-3.13.4
+    image: openpriv/flutter-desktop:linux-fstable-3.19.3
     environment:
       buildbot_key_b64:
         from_secret: buildbot_key_b64
@@ -24,7 +24,7 @@ steps:
       - git checkout $DRONE_COMMIT
 
   - name: fetch
-    image: openpriv/flutter-desktop:linux-fstable-3.13.4
+    image: openpriv/flutter-desktop:linux-fstable-3.19.3
     volumes:
       - name: deps
         path: /root/.pub-cache
@@ -47,7 +47,7 @@ steps:
   #    #Todo: fix all the lint errors and add `-set_exit_status` above to enforce linting
 
   - name: build-linux
-    image: openpriv/flutter-desktop:linux-fstable-3.13.4
+    image: openpriv/flutter-desktop:linux-fstable-3.19.3
     volumes:
       - name: deps
         path: /root/.pub-cache
@@ -62,7 +62,7 @@ steps:
       - rm -r cwtch
 
   - name: linux-ui-tests
-    image: openpriv/flutter-desktop:linux-fstable-3.13.4
+    image: openpriv/flutter-desktop:linux-fstable-3.19.3
     volumes:
       - name: deps
         path: /root/.pub-cache
@@ -71,7 +71,7 @@ steps:
       - ./run-tests-headless.sh "01_general|01_tor|02_global_settings|04_profile_mgmt"
 
   - name: test-build-android
-    image: openpriv/flutter-desktop:linux-fstable-3.13.4
+    image: openpriv/flutter-desktop:linux-fstable-3.19.3
     when:
       event: pull_request
     volumes:
@@ -81,7 +81,7 @@ steps:
       - flutter build apk --debug
 
   - name: build-android
-    image: openpriv/flutter-desktop:linux-fstable-3.13.4
+    image: openpriv/flutter-desktop:linux-fstable-3.19.3
     when:
       event: push
     environment:
@@ -105,7 +105,7 @@ steps:
       #- cp build/app/outputs/flutter-apk/app-debug.apk deploy/android
 
   - name: widget-tests
-    image:  openpriv/flutter-desktop:linux-fstable-3.13.4
+    image:  openpriv/flutter-desktop:linux-fstable-3.19.3
     volumes:
       - name: deps
         path: /root/.pub-cache
@@ -115,7 +115,7 @@ steps:
       - genhtml coverage/lcov.info -o coverage/html
 
   - name: upload-nightlies
-    image: openpriv/flutter-desktop:linux-fstable-3.13.4
+    image: openpriv/flutter-desktop:linux-fstable-3.19.3
     environment:
       GOGS_ACCOUNT_TOKEN:
         from_secret: gogs_account_token
@@ -127,9 +127,6 @@ steps:
         event: push
         status: [ success ]
     commands:
-      # TODO When we update Flutter Container to 3.19 migrate these calls...
-      - apt update
-      - apt install -y jq openssh-client ca-certificates curl
       - ./upload-releases.sh deploy/cwtch-`cat VERSION`.apk application/vnd.android.package-archive cwtch-`cat VERSION`.apk
 
   - name: deploy-buildfiles
@@ -196,7 +193,7 @@ clone:
 
 steps:
   - name: clone
-    image: openpriv/flutter-desktop:windows-sdk30-fstable-3.13.4
+    image: openpriv/flutter-desktop:windows-sdk30-fstable-3.19.3
     environment:
       buildbot_key_b64:
         from_secret: buildbot_key_b64
@@ -214,7 +211,7 @@ steps:
       - git checkout $Env:DRONE_COMMIT
 
   - name: fetch
-    image: openpriv/flutter-desktop:windows-sdk30-fstable-3.10.2
+    image: openpriv/flutter-desktop:windows-sdk30-fstable-3.19.3
     commands:
       - git describe --tags --abbrev=1 > VERSION
       - git log -1 --format=%cd --date=format:'%Y-%m-%d-%H-%M' > COMMIT_DATE
@@ -222,7 +219,7 @@ steps:
       - .\fetch-libcwtch-go.ps1
 
   - name: build-windows
-    image: openpriv/flutter-desktop:windows-sdk30-fstable-3.13.4
+    image: openpriv/flutter-desktop:windows-sdk30-fstable-3.19.3
     commands:
       - flutter pub get
       - $Env:version += type .\VERSION
@@ -279,7 +276,7 @@ steps:
       - move *.sha512.txt deploy\$Env:builddir
 
   - name: deploy-windows
-    image: openpriv/flutter-desktop:windows-sdk30-fstable-3.13.4
+    image: openpriv/flutter-desktop:windows-sdk30-fstable-3.19.3
     when:
       event: push
       status: [ success ]

.gitignore

@@ -59,7 +59,7 @@ package.
 # Compiled Libs
 linux/tor
 linux/libCwtch.so
-android/cwtch/cwtch.aar
+android/app/cwtch/cwtch.aar
 android/app/src/main/jniLibs/*/libtor.so
 *.dylib
 integration_test/gherkin_suite_test.g.dart

android/app/build.gradle

@@ -1,3 +1,9 @@
+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+    id "dev.flutter.flutter-gradle-plugin"
+}
+
 def localProperties = new Properties()
 def localPropertiesFile = rootProject.file('local.properties')
 if (localPropertiesFile.exists()) {
@@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) {
     }
 }
 
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
-    throw new FileNotFoundException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
 if (flutterVersionCode == null) {
     flutterVersionCode = '1'
@@ -21,10 +22,6 @@ if (flutterVersionName == null) {
     flutterVersionName = '1.0'
 }
 
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
 // key.properties MUST have password placeholders filled in (via drone with secrets) and cwtch-upload.jks file must be added (from drone secret)
 def keystoreProperties = new Properties()
 def keystorePropertiesFile = rootProject.file('key.properties')
@@ -33,7 +30,7 @@ if (keystorePropertiesFile.exists()) {
 }
 
 android {
-    compileSdkVersion 33
+    compileSdkVersion 34
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -54,7 +51,7 @@ android {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "im.cwtch.flwtch"
         minSdkVersion 19
-        targetSdkVersion 33
+        targetSdkVersion 34
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -93,11 +90,11 @@ flutter {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation project(':cwtch')
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.21" // same as kotlin version in settings.gradle
+    implementation fileTree( dir: 'cwtch')
+    implementation files ('cwtch/cwtch.aar')
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.2"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.2"
-    implementation "com.airbnb.android:lottie:5.2.0"
     implementation "androidx.localbroadcastmanager:localbroadcastmanager:1.0.0"
     implementation "com.android.support.constraint:constraint-layout:2.0.4"
 

android/app/src/main/AndroidManifest.xml

@@ -13,7 +13,7 @@
         <activity
             android:name=".MainActivity"
             android:launchMode="singleTop"
-            android:theme="@style/NormalTheme"
+            android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
             android:windowSoftInputMode="adjustResize"
@@ -47,6 +47,7 @@
     </application>
 
     <!--Needed to access Tor socket-->
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
 
     <!-- Needed for running in the background -->
@@ -58,9 +59,9 @@
          Allows app to use ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS -->
     <uses-permission-sdk-23 android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
 
-    <!-- TODO when we support sdk 31
+
     <uses-permission-sdk-23 android:name="android.permission.HIDE_OVERLAY_WINDOWS" />
-    -->
+
 
     <!--Needed to check if activity is foregrounded or if messages from the service should be queued-->
     <uses-permission android:name="android.permission.GET_TASKS" />

android/app/src/main/kotlin/im/cwtch/flwtch/MainActivity.kt

@@ -1,6 +1,5 @@
 package im.cwtch.flwtch
 
-import SplashView
 import android.annotation.TargetApi
 import android.content.BroadcastReceiver
 import android.content.Context
@@ -19,7 +18,6 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import androidx.work.*
 import cwtch.Cwtch
 import io.flutter.embedding.android.FlutterActivity
-import io.flutter.embedding.android.SplashScreen
 import io.flutter.embedding.engine.FlutterEngine
 import io.flutter.plugin.common.ErrorLogResult
 import io.flutter.plugin.common.MethodCall
@@ -32,8 +30,6 @@ import java.util.concurrent.TimeUnit
 import kotlinx.coroutines.*
 
 class MainActivity: FlutterActivity() {
-    override fun provideSplashScreen(): SplashScreen? = SplashView()
-
 
     // Channel to get app info
     private val CHANNEL_APP_INFO = "test.flutter.dev/applicationInfo"

android/app/src/main/kotlin/im/cwtch/flwtch/SplashView.kt

@@ -1,15 +0,0 @@
-import android.content.Context
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import im.cwtch.flwtch.R
-import io.flutter.embedding.android.SplashScreen
-
-class SplashView : SplashScreen {
-    override fun createSplashView(context: Context, savedInstanceState: Bundle?): View? =
-            LayoutInflater.from(context).inflate(R.layout.splash_view, null, false)
-
-    override fun transitionToFlutter(onTransitionComplete: Runnable) {
-        onTransitionComplete.run()
-    }
-}

android/app/src/main/res/drawable-v21/launch_background.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Modify this file to customize your launch splash screen -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="?android:colorBackground" />
+    <item android:drawable="@color/darkGreyPurple" />
 
     <!-- You can insert your own image assets here -->
-    <!-- <item>
+    <item>
         <bitmap
             android:gravity="center"
-            android:src="@mipmap/launch_image" />
-    </item> -->
+            android:src="@mipmap/knott" />
+    </item>
 </layer-list>

android/app/src/main/res/drawable/launch_background.xml

@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Modify this file to customize your launch splash screen -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@android:color/white" />
+    <item android:drawable="@color/darkGreyPurple" />
 
     <!-- You can insert your own image assets here -->
-    <!-- <item>
-        <bitmap
-            android:gravity="center"
-            android:src="@mipmap/launch_image" />
-    </item> -->
+    <item android:drawable="@drawable/knott"
+        android:gravity="center"
+        />
 </layer-list>

android/app/src/main/res/layout/splash_view.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <com.airbnb.lottie.LottieAnimationView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:lottie_autoPlay="true"
-        app:lottie_rawRes="@raw/cwtch_animated_logo_op"
-        app:lottie_loop="true"
-        app:lottie_speed="1.00"
-        app:lottie_enableMergePathsForKitKatAndAbove="true" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>

android/app/src/main/res/values-night/styles.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
-    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
-        <!-- Show a splash screen on the activity. Automatically removed when
-             Flutter draws its first frame -->
-        <item name="android:windowBackground">@drawable/launch_background</item>
-    </style>
-    <!-- Theme applied to the Android Window as soon as the process has started.
-         This theme determines the color of the Android Window while your
-         Flutter UI initializes, as well as behind your Flutter UI while its
-         running.
-         
-         This Theme is only used starting with V2 of Flutter's Android embedding. -->
-    <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
-        <item name="android:windowBackground">?android:colorBackground</item>
-    </style>
-</resources>

android/build.gradle

@@ -1,18 +1,3 @@
-buildscript {
-    ext.kotlin_version = '1.8.21'
-    repositories {
-        google()
-        // jCenter() no longer exists... https://blog.gradle.org/jcenter-shutdown
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-
-    }
-}
-
 allprojects {
     repositories {
         google()
@@ -28,7 +13,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-//removed due to gradle namespace conflicts that are beyond erinn's mere mortal understanding
-//task clean(type: Delete) {
-//    delete rootProject.buildDir
-//}
+tasks.register("clean", Delete) {
+    delete rootProject.buildDir
+}

android/settings.gradle

@@ -1,11 +1,25 @@
-include ':app', ':cwtch'
+pluginManagement {
+    def flutterSdkPath = {
+        def properties = new Properties()
+        file("local.properties").withInputStream { properties.load(it) }
+        def flutterSdkPath = properties.getProperty("flutter.sdk")
+        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+        return flutterSdkPath
+    }()
 
-def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
-def properties = new Properties()
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
 
-assert localPropertiesFile.exists()
-localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
 
-def flutterSdkPath = properties.getProperty("flutter.sdk")
-assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
+plugins {
+    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+    id "com.android.application" version "7.4.2" apply false
+    id "org.jetbrains.kotlin.android" version "1.8.21" apply false
+}
+
+include ":app"

fetch-libcwtch-go.sh

@@ -3,6 +3,6 @@
 VERSION=`cat LIBCWTCH-GO.version`
 echo $VERSION
 
-curl --fail  https://build.openprivacy.ca/files/libCwtch-autobindings-$VERSION/android/cwtch.aar --output android/cwtch/cwtch.aar
+curl --fail  https://build.openprivacy.ca/files/libCwtch-autobindings-$VERSION/android/cwtch.aar --output android/app/cwtch/cwtch.aar
 # FIXME...at some point we need to support different linux architectures...for now rely on existing expectations and rename x64 lib
-curl --fail  https://build.openprivacy.ca/files/libCwtch-autobindings-$VERSION/linux/libCwtch.x64.so --output linux/libCwtch.so
+curl --fail  https://build.openprivacy.ca/files/libCwtch-autobindings-$VERSION/linux/libCwtch.x64.so --output linux/libCwtch.so

lib/cwtch/cwtchNotifier.dart

@@ -59,9 +59,7 @@ class CwtchNotifier {
     switch (type) {
       case "CwtchStarted":
 
-        flwtchState.cwtch.getCwtchDir().then((dir) {
-          globalSettings.themeloader.LoadThemes(dir);
-        });
+
 
         if (data["Reload"] == "true" && profileCN.num > 0) {
           // don't reload...
@@ -310,6 +308,7 @@ class CwtchNotifier {
         break;
       case "UpdateGlobalSettings":
         settings.handleUpdate(jsonDecode(data["Data"]));
+        appState.settingsLoaded = true;
         break;
       case "UpdatedProfileAttribute":
         if (data["Key"] == "public.profile.name") {

lib/main.dart

@@ -107,6 +107,9 @@ class FlwtchState extends State<Flwtch> with WindowListener {
     Future.delayed(const Duration(milliseconds: 100), () {
       print("initState delayed: invoking cwtch.Start()");
       cwtch.Start();
+      cwtch.getCwtchDir().then((dir) {
+        globalSettings.themeloader.LoadThemes(dir);
+      });
     });
     print("initState: starting connectivityListener");
     if (EnvironmentConfig.TEST_MODE == false) {
@@ -185,7 +188,7 @@ class FlwtchState extends State<Flwtch> with WindowListener {
             title: 'Cwtch',
             showSemanticsDebugger: settings.useSemanticDebugger,
             theme: mkThemeData(settings),
-            home: (!appState.cwtchInit || appState.modalState != ModalState.none) ? SplashView() : ProfileMgrView(),
+            home: (!appState.loaded) ? SplashView() : ProfileMgrView(),
           ),
         );
       },

lib/models/appstate.dart

@@ -1,6 +1,7 @@
 import 'dart:async';
 
 import 'package:cwtch/config.dart';
+import 'package:cwtch/main.dart';
 import 'package:flutter/widgets.dart';
 
 enum ModalState { none, storageMigration, shutdown }
@@ -17,6 +18,8 @@ class AppState extends ChangeNotifier {
   bool _unreadMessagesBelow = false;
   bool _disableFilePicker = false;
   bool _focus = true;
+  bool _settingsLoaded = false;
+  bool _themesLoaded = false;
 
   StreamController<bool> _profilesUnreadNotifyControler = StreamController<bool>();
   late Stream<bool> profilesUnreadNotify;
@@ -85,6 +88,18 @@ class AppState extends ChangeNotifier {
     notifyListeners();
   }
 
+  set settingsLoaded(bool newVal) {
+    _settingsLoaded = newVal;
+    notifyListeners();
+  }
+
+  set themesLoaded(bool newVal) {
+    _themesLoaded = newVal;
+    notifyListeners();
+  }
+
+  bool get loaded => cwtchInit && _settingsLoaded && globalSettings.themeloader.themes.length > 0 && modalState == ModalState.none;
+
   bool isLandscape(BuildContext c) => MediaQuery.of(c).size.width > MediaQuery.of(c).size.height;
 
   void notifyProfileUnread() {

lib/views/torstatusview.dart

@@ -31,6 +31,7 @@ class _TorStatusView extends State<TorStatusView> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
+      backgroundColor: Provider.of<Settings>(context).theme.backgroundMainColor,
       appBar: AppBar(
         title: Text(AppLocalizations.of(context)!.torNetworkStatus),
       ),

macos/Podfile.lock

@@ -10,7 +10,7 @@ PODS:
   - path_provider_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
-  - ReachabilitySwift (5.0.0)
+  - ReachabilitySwift (5.2.1)
   - screen_retriever (0.0.1):
     - FlutterMacOS
   - url_launcher_macos (0.0.1):
@@ -55,10 +55,10 @@ SPEC CHECKSUMS:
   flutter_local_notifications: 3805ca215b2fb7f397d78b66db91f6a747af52e4
   FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
   package_info_plus: 02d7a575e80f194102bef286361c6c326e4c29ce
-  path_provider_foundation: eaf5b3e458fc0e5fbb9940fb09980e853fe058b8
-  ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
+  path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
+  ReachabilitySwift: 5ae15e16814b5f9ef568963fb2c87aeb49158c66
   screen_retriever: 59634572a57080243dd1bf715e55b6c54f241a38
-  url_launcher_macos: 5335912b679c073563f29d89d33d10d459f95451
+  url_launcher_macos: d2691c7dd33ed713bf3544850a623080ec693d95
   window_manager: 3a1844359a6295ab1e47659b1a777e36773cd6e8
 
 PODFILE CHECKSUM: 353c8bcc5d5b0994e508d035b5431cfe18c1dea7

macos/Runner.xcodeproj/project.pbxproj

@@ -201,8 +201,9 @@
 		33CC10E52044A3C60003C045 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				BuildIndependentTargetsInParallel = YES;
 				LastSwiftUpdateCheck = 0920;
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					33CC10EC2044A3C60003C045 = {
@@ -394,9 +395,11 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CODE_SIGN_IDENTITY = "-";
 				COPY_PHASE_STRIP = NO;
+				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -421,11 +424,14 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				DEAD_CODE_STRIPPING = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
+				MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 				PRODUCT_NAME = Cwtch;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_VERSION = 5.0;
@@ -436,6 +442,9 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CODE_SIGN_STYLE = Manual;
+				DEAD_CODE_STRIPPING = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
+				MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Profile;
@@ -468,9 +477,11 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CODE_SIGN_IDENTITY = "-";
 				COPY_PHASE_STRIP = NO;
+				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -521,9 +532,11 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CODE_SIGN_IDENTITY = "-";
 				COPY_PHASE_STRIP = NO;
+				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -548,11 +561,14 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				DEAD_CODE_STRIPPING = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
+				MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 				PRODUCT_NAME = Cwtch;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -569,11 +585,14 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				DEAD_CODE_STRIPPING = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
+				MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 				PRODUCT_NAME = Cwtch;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_VERSION = 5.0;
@@ -584,6 +603,9 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CODE_SIGN_STYLE = Manual;
+				DEAD_CODE_STRIPPING = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
+				MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -592,6 +614,9 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
+				DEAD_CODE_STRIPPING = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
+				MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;

macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

windows/flutter/CMakeLists.txt

@@ -9,6 +9,11 @@ include(${EPHEMERAL_DIR}/generated_config.cmake)
 # https://github.com/flutter/flutter/issues/57146.
 set(WRAPPER_ROOT "${EPHEMERAL_DIR}/cpp_client_wrapper")
 
+# Set fallback configurations for older versions of the flutter tool.
+if (NOT DEFINED FLUTTER_TARGET_PLATFORM)
+  set(FLUTTER_TARGET_PLATFORM "windows-x64")
+endif()
+
 # === Flutter Library ===
 set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/flutter_windows.dll")
 
@@ -91,7 +96,7 @@ add_custom_command(
   COMMAND ${CMAKE_COMMAND} -E env
     ${FLUTTER_TOOL_ENVIRONMENT}
     "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat"
-      windows-x64 $<CONFIG>
+      ${FLUTTER_TARGET_PLATFORM} $<CONFIG>
   VERBATIM
 )
 add_custom_target(flutter_assemble DEPENDS