TW-2555 Support Flutter 3.32.8 and Android 16kb page size

.github/workflows/build.yaml

@@ -6,7 +6,7 @@ on:
 name: Build
 
 env:
-  FLUTTER_VERSION: 3.27.4
+  FLUTTER_VERSION: 3.32.8
   XCODE_VERSION: 16.0
 
 jobs:

.github/workflows/gh-pages.yaml

@@ -2,7 +2,7 @@ on:
   pull_request:
 
 env:
-  FLUTTER_VERSION: 3.27.4
+  FLUTTER_VERSION: 3.32.8
   LIBOLM_VERSION: 3.2.16
 
 name: Deploying on GitHub Pages
@@ -41,13 +41,6 @@ jobs:
       - name: Setup Nix (to build libolm)
         uses: cachix/install-nix-action@v26
 
-      - name: Build libolm
-        run: |
-          rm -rf assets/js
-          nix build -v "gitlab:matrix-org/olm/$LIBOLM_VERSION?host=gitlab.matrix.org#javascript" -o assets/js
-          sudo chmod 777 -R assets/js
-          cd assets/js/ && mv javascript package
-
       - name: Build Web version
         env:
           FOLDER: ${{ github.event.pull_request.number }}

.github/workflows/integration-tests.yaml

@@ -20,7 +20,7 @@ jobs:
       USERNAME: ${{ secrets.USERNAME }}
       PASSWORD: ${{ secrets.PASSWORD }}
       SERVER_URL: ${{ secrets.SERVER_URL }}
-      FLUTTER_VERSION: "3.27.4"
+      FLUTTER_VERSION: "3.32.8"
       JAVA_VERSION: 17
 
     steps:

.github/workflows/release.yaml

@@ -4,7 +4,7 @@ on:
       - "v*.*.*"
 
 env:
-  FLUTTER_VERSION: 3.27.4
+  FLUTTER_VERSION: 3.32.8
   XCODE_VERSION: 16.0
 
 name: Release

.github/workflows/tests.yaml

@@ -4,7 +4,7 @@ on:
 name: Tests
 
 env:
-  FLUTTER_VERSION: 3.27.4
+  FLUTTER_VERSION: 3.32.8
 
 jobs:
   code_analyze:

.gitignore

@@ -66,7 +66,7 @@ ios/Podfile.lock
 /linux/out
 /macos/out
 .vs
-olm
+lib/generated/*
 
 # Devenv
 .devenv*

.gitlab-ci.yml

@@ -1,5 +1,5 @@
 variables:
-  FLUTTER_VERSION: 3.27.4
+  FLUTTER_VERSION: 3.32.8
 
 image:
   name: cirrusci/flutter:${FLUTTER_VERSION}

Dockerfile

@@ -1,16 +1,15 @@
 # Specify versions
-ARG FLUTTER_VERSION=3.27.4
+ARG FLUTTER_VERSION=3.32.8
 ARG OLM_VERSION=3.2.16
 ARG NIX_VERSION=2.22.1
 
 # Building libolm
 # libolm only has amd64
-FROM --platform=linux/amd64 nixos/nix:${NIX_VERSION} AS olm-builder
-ARG OLM_VERSION
-RUN nix build -v --extra-experimental-features flakes --extra-experimental-features nix-command gitlab:matrix-org/olm/${OLM_VERSION}?host=gitlab.matrix.org\#javascript
+# FROM --platform=linux/amd64 nixos/nix:${NIX_VERSION} AS olm-builder
+# ARG OLM_VERSION
+# RUN nix build -v --extra-experimental-features flakes --extra-experimental-features nix-command gitlab:matrix-org/olm/${OLM_VERSION}?host=gitlab.matrix.org\#javascript
 
 # Building Twake for the web
-# Todo: Because cirrusci still missing 3.27.4 image, so change to use instrumentisto, change back when upgrade new flutter
 FROM --platform=linux/amd64 ghcr.io/instrumentisto/flutter:${FLUTTER_VERSION} AS web-builder
 ARG TWAKECHAT_BASE_HREF="/web/"
 COPY . /app

android/app/build.gradle

@@ -41,7 +41,7 @@ if (keystorePropertiesFile.exists()) {
 
 android {
     compileSdkVersion 35
-    ndkVersion = "26.1.10909125"
+    ndkVersion = "28.2.13676358"
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'

android/app/src/main/kotlin/app/twake/android/chat/FcmPushService.kt

@@ -6,7 +6,6 @@ import app.twake.android.chat.MainActivity
 
 import io.flutter.embedding.android.FlutterActivity
 import io.flutter.embedding.engine.FlutterEngine
-import io.flutter.view.FlutterMain
 import io.flutter.embedding.engine.dart.DartExecutor.DartEntrypoint
 
 import android.content.Context

android/settings.gradle

@@ -18,7 +18,7 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0" // apply true
-    id "com.android.application" version '8.4.1' apply false
+    id "com.android.application" version '8.5.2' apply false
     id "org.jetbrains.kotlin.android" version "2.1.0" apply false
     id "com.google.gms.google-services" version "4.3.8" apply false
 }

assets/l10n/intl_fa.arb

@@ -224,14 +224,6 @@
     "type": "text",
     "placeholders": {}
   },
-  "badServerLoginTypesException": "سرور می‌تواند این گونہ‌های ورود‮ را پشتیباتی کند:\n{serverVersions}\nولی این برنامہ می‌تواند فقط این‌ها را پشتیبانی کند:\n{supportedVersions}",
-  "@badServerLoginTypesException": {
-    "type": "text",
-    "placeholders": {
-      "serverVersions": {},
-      "supportedVersions": {}
-    }
-  },
   "badServerVersionsException": "سرور می‌تواند این نسخہ‌های مشخصات را پشتیبانی کند:\n{serverVersions}\nولی این برنامہ می‌تواند فقط این‌ها را پشتیبانی کند:\n{supportedVersions}",
   "@badServerVersionsException": {
     "type": "text",

integration_test/robots/chat_group_detail_robot.dart

@@ -6,7 +6,7 @@ import 'package:fluffychat/widgets/twake_components/twake_icon_button.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:patrol/patrol.dart';
-import 'package:flutter_gen/gen_l10n/l10n.dart';
+import 'package:fluffychat/generated/l10n/app_localizations.dart';
 import 'package:pull_down_button/pull_down_button.dart';
 import '../base/core_robot.dart';
 import 'menu_robot.dart';

integration_test/robots/home_robot.dart

@@ -6,7 +6,7 @@ import '../base/core_robot.dart';
 import 'chat_list_robot.dart';
 import 'contact_list_robot.dart';
 import 'setting_robot.dart';
-import 'package:flutter_gen/gen_l10n/l10n.dart';
+import 'package:fluffychat/generated/l10n/app_localizations.dart';
 
 class HomeRobot extends CoreRobot {
   HomeRobot(super.$);

integration_test/users.dart

@@ -30,7 +30,7 @@ class User {
   const User(this.name, this.password);
 }
 
-const homeserver = 'http://${const String.fromEnvironment(
+const homeserver = 'http://${String.fromEnvironment(
   'HOMESERVER',
   defaultValue: 'localhost',
 )}';

ios/Flutter/ephemeral/flutter_lldb_helper.py

@@ -0,0 +1,32 @@
+#
+# Generated file, do not edit.
+#
+
+import lldb
+
+def handle_new_rx_page(frame: lldb.SBFrame, bp_loc, extra_args, intern_dict):
+    """Intercept NOTIFY_DEBUGGER_ABOUT_RX_PAGES and touch the pages."""
+    base = frame.register["x0"].GetValueAsAddress()
+    page_len = frame.register["x1"].GetValueAsUnsigned()
+
+    # Note: NOTIFY_DEBUGGER_ABOUT_RX_PAGES will check contents of the
+    # first page to see if handled it correctly. This makes diagnosing
+    # misconfiguration (e.g. missing breakpoint) easier.
+    data = bytearray(page_len)
+    data[0:8] = b'IHELPED!'
+
+    error = lldb.SBError()
+    frame.GetThread().GetProcess().WriteMemory(base, data, error)
+    if not error.Success():
+        print(f'Failed to write into {base}[+{page_len}]', error)
+        return
+
+def __lldb_init_module(debugger: lldb.SBDebugger, _):
+    target = debugger.GetDummyTarget()
+    # Caveat: must use BreakpointCreateByRegEx here and not
+    # BreakpointCreateByName. For some reasons callback function does not
+    # get carried over from dummy target for the later.
+    bp = target.BreakpointCreateByRegex("^NOTIFY_DEBUGGER_ABOUT_RX_PAGES$")
+    bp.SetScriptCallbackFunction('{}.handle_new_rx_page'.format(__name__))
+    bp.SetAutoContinue(True)
+    print("-- LLDB integration loaded --")

ios/Flutter/ephemeral/flutter_lldbinit

@@ -0,0 +1,5 @@
+#
+# Generated file, do not edit.
+#
+
+command script import --relative-to-command-file flutter_lldb_helper.py

ios/Runner.xcodeproj/project.pbxproj

@@ -620,6 +620,7 @@
 				5046FC052E71342000FB466C /* Resources */,
 				5046FC142E7136AC00FB466C /* xcode_backend embed_and_thin */,
 				F4F578CCC19781ECD6AEDE27 /* [CP] Embed Pods Frameworks */,
+				2BA4E379EACFA4CACAE83143 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -644,6 +645,7 @@
 				C1005C4D261071B5002F4F32 /* Embed App Extensions */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
 				27106876655711D150B695DC /* [CP] Embed Pods Frameworks */,
+				6B6EA9266BCB5636F0B7415E /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -839,6 +841,23 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
+		2BA4E379EACFA4CACAE83143 /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner-RunnerUITests/Pods-Runner-RunnerUITests-resources-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner-RunnerUITests/Pods-Runner-RunnerUITests-resources-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner-RunnerUITests/Pods-Runner-RunnerUITests-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
@@ -913,6 +932,23 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin\n";
 		};
+		6B6EA9266BCB5636F0B7415E /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;

ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <MacroExpansion>
          <BuildableReference
@@ -53,11 +54,13 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
+      enableGPUValidationMode = "1"
       allowLocationSimulation = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">