Skip to content

Commit bc523e8

Browse files
git-elliotgit-elliot
authored
Merge pull request #254 from osociety/build-fix
fix build failure
2 parents fd7bf29 + fa42a06 commit bc523e8

File tree

18 files changed

+243
-236
lines changed

18 files changed

+243
-236
lines changed

‎.github/workflows/flutter_test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494
- name: Download and upgrade pub dependencies
9595
run: flutter pub get && flutter pub upgrade
9696
- name: Run build_runner
97-
run: flutter pub run build_runner build --delete-conflicting-outputs
97+
run: dart run build_runner build --delete-conflicting-outputs
9898
- name: Run analyzer
9999
run: flutter analyze
100100
- name: Install coverage tools
@@ -173,7 +173,7 @@ jobs:
173173
- name: Download and upgrade pub dependencies
174174
run: flutter pub get && flutter pub upgrade
175175
- name: Run build_runner
176-
run: flutter pub run build_runner build --delete-conflicting-outputs
176+
run: dart run build_runner build --delete-conflicting-outputs
177177
- name: Build Android
178178
if: ${{ (matrix.os == 'ubuntu') && (needs.changes.outputs.branch == 'dev') && (needs.changes.outputs.lib || needs.changes.outputs.test || needs.changes.outputs.android || needs.changes.outputs.yaml )}}
179179
run: |

‎android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ if (keystorePropertiesFile.exists()) {
2929
}
3030

3131
android {
32-
ndkVersion = "26.3.11579264"
32+
ndkVersion = "27.0.12077973"
3333
sourceSets {
3434
main.java.srcDirs += 'src/main/kotlin'
3535
}
@@ -94,7 +94,7 @@ android {
9494
}
9595

9696
dependencies {
97-
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.2.2'
97+
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.4'
9898
implementation 'androidx.window:window:1.0.0'
9999
implementation 'androidx.window:window-java:1.0.0'
100100
}

‎android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ subprojects {
2525
project.plugins.hasPlugin("com.android.library")) {
2626
project.android {
2727
compileSdkVersion 35
28-
buildToolsVersion "34.0.0"
28+
buildToolsVersion "35.0.0"
2929
}
3030
}
3131
}

‎android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
77
#distributionSha256Sum=22449f5231796abd892c98b2a07c9ceebe4688d192cd2d6763f8e3bf8acbedeb

‎android/settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ pluginManagement {
1818

1919
plugins {
2020
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
21-
id "com.android.application" version '8.5.2' apply false
21+
id "com.android.application" version '8.12.0' apply false
2222
id "org.jetbrains.kotlin.android" version "1.9.10" apply false
2323
}
2424

‎ios/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Uncomment this line to define a global platform for your project
2-
# platform :ios, '12.0'
2+
platform :ios, '12.0'
33

44
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
55
ENV['COCOAPODS_DISABLE_STATS'] = 'true'

‎ios/Podfile.lock

Lines changed: 57 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ PODS:
88
- Flutter
99
- flutter_local_notifications (0.0.1):
1010
- Flutter
11-
- flutter_native_splash (0.0.1):
11+
- flutter_native_splash (2.4.3):
1212
- Flutter
1313
- flutter_timezone (0.0.1):
1414
- Flutter
15-
- in_app_review (0.2.0):
15+
- in_app_review (2.0.0):
1616
- Flutter
17-
- isar_flutter_libs (1.0.0):
17+
- integration_test (0.0.1):
1818
- Flutter
1919
- network_info_plus (0.0.1):
2020
- Flutter
@@ -30,6 +30,31 @@ PODS:
3030
- shared_preferences_foundation (0.0.1):
3131
- Flutter
3232
- FlutterMacOS
33+
- sqlite3 (3.50.4):
34+
- sqlite3/common (= 3.50.4)
35+
- sqlite3/common (3.50.4)
36+
- sqlite3/dbstatvtab (3.50.4):
37+
- sqlite3/common
38+
- sqlite3/fts5 (3.50.4):
39+
- sqlite3/common
40+
- sqlite3/math (3.50.4):
41+
- sqlite3/common
42+
- sqlite3/perf-threadsafe (3.50.4):
43+
- sqlite3/common
44+
- sqlite3/rtree (3.50.4):
45+
- sqlite3/common
46+
- sqlite3/session (3.50.4):
47+
- sqlite3/common
48+
- sqlite3_flutter_libs (0.0.1):
49+
- Flutter
50+
- FlutterMacOS
51+
- sqlite3 (~> 3.50.4)
52+
- sqlite3/dbstatvtab
53+
- sqlite3/fts5
54+
- sqlite3/math
55+
- sqlite3/perf-threadsafe
56+
- sqlite3/rtree
57+
- sqlite3/session
3358
- url_launcher_ios (0.0.1):
3459
- Flutter
3560

@@ -42,15 +67,20 @@ DEPENDENCIES:
4267
- flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`)
4368
- flutter_timezone (from `.symlinks/plugins/flutter_timezone/ios`)
4469
- in_app_review (from `.symlinks/plugins/in_app_review/ios`)
45-
- isar_flutter_libs (from `.symlinks/plugins/isar_flutter_libs/ios`)
70+
- integration_test (from `.symlinks/plugins/integration_test/ios`)
4671
- network_info_plus (from `.symlinks/plugins/network_info_plus/ios`)
4772
- nsd_ios (from `.symlinks/plugins/nsd_ios/ios`)
4873
- package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
4974
- path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
5075
- permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
5176
- shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
77+
- sqlite3_flutter_libs (from `.symlinks/plugins/sqlite3_flutter_libs/darwin`)
5278
- url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
5379

80+
SPEC REPOS:
81+
trunk:
82+
- sqlite3
83+
5484
EXTERNAL SOURCES:
5585
external_app_launcher:
5686
:path: ".symlinks/plugins/external_app_launcher/ios"
@@ -68,8 +98,8 @@ EXTERNAL SOURCES:
6898
:path: ".symlinks/plugins/flutter_timezone/ios"
6999
in_app_review:
70100
:path: ".symlinks/plugins/in_app_review/ios"
71-
isar_flutter_libs:
72-
:path: ".symlinks/plugins/isar_flutter_libs/ios"
101+
integration_test:
102+
:path: ".symlinks/plugins/integration_test/ios"
73103
network_info_plus:
74104
:path: ".symlinks/plugins/network_info_plus/ios"
75105
nsd_ios:
@@ -82,27 +112,31 @@ EXTERNAL SOURCES:
82112
:path: ".symlinks/plugins/permission_handler_apple/ios"
83113
shared_preferences_foundation:
84114
:path: ".symlinks/plugins/shared_preferences_foundation/darwin"
115+
sqlite3_flutter_libs:
116+
:path: ".symlinks/plugins/sqlite3_flutter_libs/darwin"
85117
url_launcher_ios:
86118
:path: ".symlinks/plugins/url_launcher_ios/ios"
87119

88120
SPEC CHECKSUMS:
89-
external_app_launcher: ad55ac844aa21f2d2197d7cec58ff0d0dc40bbc0
121+
external_app_launcher: 3411245965270a74040a3de17e27bd02b8abb905
90122
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
91-
flutter_icmp_ping: 2b159955eee0c487c766ad83fec224ae35e7c935
92-
flutter_isolate: 0edf5081826d071adf21759d1eb10ff5c24503b5
93-
flutter_local_notifications: 4cde75091f6327eb8517fa068a0a5950212d2086
94-
flutter_native_splash: edf599c81f74d093a4daf8e17bd7a018854bc778
95-
flutter_timezone: ffb07bdad3c6276af8dada0f11978d8a1f8a20bb
96-
in_app_review: 318597b3a06c22bb46dc454d56828c85f444f99d
97-
isar_flutter_libs: b69f437aeab9c521821c3f376198c4371fa21073
98-
network_info_plus: 6d0c3eb8367b8164fa3fb0c19875e3f59d49697f
99-
nsd_ios: 8c37babdc6538e3350dbed3a52674d2edde98173
100-
package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85
101-
path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
102-
permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
103-
shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
104-
url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
123+
flutter_icmp_ping: 47c1df3440c18ddd39fc457e607bb3b42d4a339f
124+
flutter_isolate: ca1a284bbb8dcfeb26c4764794e0206f58ffa984
125+
flutter_local_notifications: a5a732f069baa862e728d839dd2ebb904737effb
126+
flutter_native_splash: c32d145d68aeda5502d5f543ee38c192065986cf
127+
flutter_timezone: 7c838e17ffd4645d261e87037e5bebf6d38fe544
128+
in_app_review: 5596fe56fab799e8edb3561c03d053363ab13457
129+
integration_test: 4a889634ef21a45d28d50d622cf412dc6d9f586e
130+
network_info_plus: cf61925ab5205dce05a4f0895989afdb6aade5fc
131+
nsd_ios: 596ad79109ddd3e52d665f650f36428049e3653e
132+
package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
133+
path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
134+
permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d
135+
shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
136+
sqlite3: 73513155ec6979715d3904ef53a8d68892d4032b
137+
sqlite3_flutter_libs: 83f8e9f5b6554077f1d93119fe20ebaa5f3a9ef1
138+
url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
105139

106-
PODFILE CHECKSUM: c4c93c5f6502fe2754f48404d3594bf779584011
140+
PODFILE CHECKSUM: 4e8f8b2be68aeea4c0d5beb6ff1e79fface1d048
107141

108-
COCOAPODS: 1.15.2
142+
COCOAPODS: 1.16.2

‎ios/Runner.xcodeproj/project.pbxproj

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -212,10 +212,14 @@
212212
inputFileListPaths = (
213213
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
214214
);
215+
inputPaths = (
216+
);
215217
name = "[CP] Embed Pods Frameworks";
216218
outputFileListPaths = (
217219
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
218220
);
221+
outputPaths = (
222+
);
219223
runOnlyForDeploymentPostprocessing = 0;
220224
shellPath = /bin/sh;
221225
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
@@ -245,10 +249,14 @@
245249
inputFileListPaths = (
246250
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
247251
);
252+
inputPaths = (
253+
);
248254
name = "[CP] Copy Pods Resources";
249255
outputFileListPaths = (
250256
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
251257
);
258+
outputPaths = (
259+
);
252260
runOnlyForDeploymentPostprocessing = 0;
253261
shellPath = /bin/sh;
254262
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
@@ -269,23 +277,6 @@
269277
shellPath = /bin/sh;
270278
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
271279
};
272-
9964CF9BE27615006489D488 /* [CP] Copy Pods Resources */ = {
273-
isa = PBXShellScriptBuildPhase;
274-
buildActionMask = 2147483647;
275-
files = (
276-
);
277-
inputFileListPaths = (
278-
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
279-
);
280-
name = "[CP] Copy Pods Resources";
281-
outputFileListPaths = (
282-
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
283-
);
284-
runOnlyForDeploymentPostprocessing = 0;
285-
shellPath = /bin/sh;
286-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
287-
showEnvVarsInLog = 0;
288-
};
289280
A23E1C57A48CD5731ACA870B /* [CP] Check Pods Manifest.lock */ = {
290281
isa = PBXShellScriptBuildPhase;
291282
buildActionMask = 2147483647;
@@ -408,7 +399,7 @@
408399
"$(inherited)",
409400
"@executable_path/Frameworks",
410401
);
411-
PRODUCT_BUNDLE_IDENTIFIER = org.osociety.vernet;
402+
PRODUCT_BUNDLE_IDENTIFIER = org.osociety.vernet.store;
412403
PRODUCT_NAME = "$(TARGET_NAME)";
413404
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
414405
SWIFT_VERSION = 5.0;
@@ -541,7 +532,7 @@
541532
"$(inherited)",
542533
"@executable_path/Frameworks",
543534
);
544-
PRODUCT_BUNDLE_IDENTIFIER = org.osociety.vernet;
535+
PRODUCT_BUNDLE_IDENTIFIER = org.osociety.vernet.store;
545536
PRODUCT_NAME = "$(TARGET_NAME)";
546537
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
547538
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -566,7 +557,7 @@
566557
"$(inherited)",
567558
"@executable_path/Frameworks",
568559
);
569-
PRODUCT_BUNDLE_IDENTIFIER = org.osociety.vernet;
560+
PRODUCT_BUNDLE_IDENTIFIER = org.osociety.vernet.store;
570561
PRODUCT_NAME = "$(TARGET_NAME)";
571562
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
572563
SWIFT_VERSION = 5.0;

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<MacroExpansion>
3132
<BuildableReference
@@ -43,11 +44,13 @@
4344
buildConfiguration = "Debug"
4445
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4546
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
47+
customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
4648
launchStyle = "0"
4749
useCustomWorkingDirectory = "NO"
4850
ignoresPersistentStateOnLaunch = "NO"
4951
debugDocumentVersioning = "YES"
5052
debugServiceExtension = "internal"
53+
enableGPUValidationMode = "1"
5154
allowLocationSimulation = "YES">
5255
<BuildableProductRunnable
5356
runnableDebuggingMode = "0">

0 commit comments

Comments
 (0)