Skip to content

Commit 760b87f

Browse files
author
DeveloperMahak
committed
solve ndk issue
1 parent d22a97e commit 760b87f

File tree

10 files changed

+49
-19
lines changed

10 files changed

+49
-19
lines changed

.idea/zulip.iml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

android/app/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ try {
2121

2222
android {
2323
namespace "com.zulip.flutter"
24+
ndkVersion "26.3.11579264"
2425

2526
compileSdkVersion flutter.compileSdkVersion
2627

android/build.gradle

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
buildscript {
2+
repositories {
3+
google() // Ensure this is included
4+
mavenCentral()// Optional, depending on your project
5+
}
6+
dependencies {
7+
classpath 'com.android.tools.build:gradle:8.2.0' // Your Gradle plugin version
8+
}
9+
}
10+
111
allprojects {
212
repositories {
313
google()
@@ -6,6 +16,7 @@ allprojects {
616
}
717

818
rootProject.buildDir = '../build'
19+
920
subprojects {
1021
project.buildDir = "${rootProject.buildDir}/${project.name}"
1122
}

android/gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
org.gradle.jvmargs=-Xmx3072M
22
android.useAndroidX=true
33
android.enableJetifier=true
4+
android.ndkVersion=26.3.11579264
5+
46

57
# Versions for our Android build dependencies.
68
# Defining them here makes them available both in

packages/zulip_plugin/pubspec.lock

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Generated by pub
2+
# See https://dart.dev/tools/pub/glossary#lockfile
3+
packages: {}
4+
sdks:
5+
dart: ">=3.4.0-256.0.dev <4.0.0"
6+
flutter: ">=3.3.0"

pubspec.lock

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -291,10 +291,10 @@ packages:
291291
dependency: "direct dev"
292292
description:
293293
name: fake_async
294-
sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc"
294+
sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
295295
url: "https://pub.dev"
296296
source: hosted
297-
version: "1.3.2"
297+
version: "1.3.3"
298298
ffi:
299299
dependency: transitive
300300
description:
@@ -355,10 +355,10 @@ packages:
355355
dependency: "direct main"
356356
description:
357357
name: firebase_core
358-
sha256: "0307c1fde82e2b8b97e0be2dab93612aff9a72f31ebe9bfac66ed8b37ef7c568"
358+
sha256: "93dc4dd12f9b02c5767f235307f609e61ed9211047132d07f9e02c668f0bfc33"
359359
url: "https://pub.dev"
360360
source: hosted
361-
version: "3.10.0"
361+
version: "3.11.0"
362362
firebase_core_platform_interface:
363363
dependency: transitive
364364
description:
@@ -371,10 +371,10 @@ packages:
371371
dependency: transitive
372372
description:
373373
name: firebase_core_web
374-
sha256: fbc008cf390d909b823763064b63afefe9f02d8afdb13eb3f485b871afee956b
374+
sha256: "0e13c80f0de8acaa5d0519cbe23c8b4cc138a2d5d508b5755c861bdfc9762678"
375375
url: "https://pub.dev"
376376
source: hosted
377-
version: "2.19.0"
377+
version: "2.20.0"
378378
firebase_messaging:
379379
dependency: "direct main"
380380
description:
@@ -607,10 +607,10 @@ packages:
607607
dependency: "direct main"
608608
description:
609609
name: intl
610-
sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
610+
sha256: "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5"
611611
url: "https://pub.dev"
612612
source: hosted
613-
version: "0.19.0"
613+
version: "0.20.2"
614614
io:
615615
dependency: transitive
616616
description:
@@ -647,10 +647,10 @@ packages:
647647
dependency: transitive
648648
description:
649649
name: leak_tracker
650-
sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec
650+
sha256: "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0"
651651
url: "https://pub.dev"
652652
source: hosted
653-
version: "10.0.8"
653+
version: "10.0.9"
654654
leak_tracker_flutter_testing:
655655
dependency: transitive
656656
description:
@@ -1244,10 +1244,10 @@ packages:
12441244
dependency: transitive
12451245
description:
12461246
name: vm_service
1247-
sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14"
1247+
sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02
12481248
url: "https://pub.dev"
12491249
source: hosted
1250-
version: "14.3.1"
1250+
version: "15.0.0"
12511251
wakelock_plus:
12521252
dependency: "direct main"
12531253
description:
@@ -1300,10 +1300,10 @@ packages:
13001300
dependency: transitive
13011301
description:
13021302
name: webdriver
1303-
sha256: "3d773670966f02a646319410766d3b5e1037efb7f07cc68f844d5e06cd4d61c8"
1303+
sha256: "2f3a14ca026957870cfd9c635b83507e0e51d8091568e90129fbf805aba7cade"
13041304
url: "https://pub.dev"
13051305
source: hosted
1306-
version: "3.0.4"
1306+
version: "3.1.0"
13071307
webkit_inspection_protocol:
13081308
dependency: transitive
13091309
description:

pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ dependencies:
4242
device_info_plus: ^11.2.0
4343
drift: ^2.5.0
4444
file_picker: ^8.0.0+1
45-
firebase_core: ^3.3.0
4645
firebase_messaging: ^15.0.1
4746
flutter_color_models: ^1.3.3+2
4847
html: ^0.15.1
@@ -64,6 +63,7 @@ dependencies:
6463
wakelock_plus: ^1.2.8
6564
zulip_plugin:
6665
path: ./packages/zulip_plugin
66+
firebase_core: ^3.11.0
6767
# Keep list sorted when adding dependencies; it helps prevent merge conflicts.
6868

6969
dependency_overrides:

tools/content/fetch_messages.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import 'package:zulip/api/backoff.dart';
1111
import 'model.dart';
1212

1313
/// Fetch all public message contents from a Zulip server in bulk.
14-
///
14+
///dsa
1515
/// It outputs JSON entries of the message IDs and the rendered HTML contents in
1616
/// JSON Lines (https://jsonlines.org) format. The output can be used later to
1717
/// perform checks for discovering unimplemented features.

windows/flutter/CMakeLists.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@ include(${EPHEMERAL_DIR}/generated_config.cmake)
1010
# https://github.com/flutter/flutter/issues/57146.
1111
set(WRAPPER_ROOT "${EPHEMERAL_DIR}/cpp_client_wrapper")
1212

13+
# Set fallback configurations for older versions of the flutter tool.
14+
if (NOT DEFINED FLUTTER_TARGET_PLATFORM)
15+
set(FLUTTER_TARGET_PLATFORM "windows-x64")
16+
endif()
17+
1318
# === Flutter Library ===
1419
set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/flutter_windows.dll")
1520

@@ -92,7 +97,7 @@ add_custom_command(
9297
COMMAND ${CMAKE_COMMAND} -E env
9398
${FLUTTER_TOOL_ENVIRONMENT}
9499
"${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat"
95-
windows-x64 $<CONFIG>
100+
${FLUTTER_TARGET_PLATFORM} $<CONFIG>
96101
VERBATIM
97102
)
98103
add_custom_target(flutter_assemble DEPENDS

windows/runner/flutter_window.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@ bool FlutterWindow::OnCreate() {
3131
this->Show();
3232
});
3333

34+
// Flutter can complete the first frame before the "show window" callback is
35+
// registered. The following call ensures a frame is pending to ensure the
36+
// window is shown. It is a no-op if the first frame hasn't completed yet.
37+
flutter_controller_->ForceRedraw();
38+
3439
return true;
3540
}
3641

0 commit comments

Comments
 (0)