Skip to content

Commit c720e21

Browse files
Manuito83Manuito83
authored
Merge pull request #299 from Manuito83/develop
Merged for v3.6.2 release
2 parents 793f710 + 98df104 commit c720e21

19 files changed

+22478
-7358
lines changed

‎android/app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ if (localPropertiesFile.exists()) {
1616

1717
def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
1818
if (flutterVersionCode == null) {
19-
flutterVersionCode = '466'
19+
flutterVersionCode = '467'
2020
}
2121

2222
def flutterVersionName = localProperties.getProperty('flutter.versionName')

‎ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
0C63CA7633124196C9127741 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 492B180639AA4D421B53B01B /* Pods_Runner.framework */; };
1110
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
1211
176E1F592CCBD5DD00DD41A5 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 176E1F582CCBD5DD00DD41A5 /* GoogleService-Info.plist */; };
1312
32018DF526A491BB007D71C3 /* aircraft_seatbelt.aiff in Resources */ = {isa = PBXBuildFile; fileRef = 32018DF426A491BB007D71C3 /* aircraft_seatbelt.aiff */; };
@@ -16,6 +15,7 @@
1615
3260890E2BC0A46800B8E959 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 3260890D2BC0A46800B8E959 /* PrivacyInfo.xcprivacy */; };
1716
32CA1C422C371F140099E06D /* car_start.aiff in Resources */ = {isa = PBXBuildFile; fileRef = 32CA1C412C371F140099E06D /* car_start.aiff */; };
1817
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
18+
6097A39E04E2B920E58AC271 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B54EB0EA0F73A26B3BBEB640 /* Pods_Runner.framework */; };
1919
74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
2020
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
2121
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
@@ -39,19 +39,16 @@
3939
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
4040
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
4141
176E1F582CCBD5DD00DD41A5 /* GoogleService-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
42-
2BBA5ED6D9C7D4F43CA253D8 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
43-
2C56F4BD57024BABF848A480 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
4442
32018DF426A491BB007D71C3 /* aircraft_seatbelt.aiff */ = {isa = PBXFileReference; lastKnownFileType = audio.aiff; path = aircraft_seatbelt.aiff; sourceTree = SOURCE_ROOT; };
4543
32018E2026A492CB007D71C3 /* slow_spring_board.aiff */ = {isa = PBXFileReference; lastKnownFileType = audio.aiff; path = slow_spring_board.aiff; sourceTree = "<group>"; };
4644
3213EB7527258275006C1C26 /* sword_clash.aiff */ = {isa = PBXFileReference; lastKnownFileType = audio.aiff; path = sword_clash.aiff; sourceTree = "<group>"; };
4745
32445F0924B20CCE0057069B /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
4846
3260890D2BC0A46800B8E959 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
4947
32CA1C412C371F140099E06D /* car_start.aiff */ = {isa = PBXFileReference; lastKnownFileType = audio.aiff; path = car_start.aiff; sourceTree = "<group>"; };
5048
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
51-
492B180639AA4D421B53B01B /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
49+
4D28D0715F932D2240B98467 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
5250
74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
5351
74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
54-
767A28456D0F58E8B5DEF8A8 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
5552
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
5653
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
5754
9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
@@ -60,6 +57,9 @@
6057
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
6158
97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
6259
97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
60+
B54EB0EA0F73A26B3BBEB640 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
61+
C4C7D82A8366AA96A2F6D10F /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
62+
F483A6CAF671B34615A91B13 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
6363
FA586AA32B10F20E002D1F8C /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = usr/lib/libsqlite3.tbd; sourceTree = SDKROOT; };
6464
/* End PBXFileReference section */
6565

@@ -68,7 +68,7 @@
6868
isa = PBXFrameworksBuildPhase;
6969
buildActionMask = 2147483647;
7070
files = (
71-
0C63CA7633124196C9127741 /* Pods_Runner.framework in Frameworks */,
71+
6097A39E04E2B920E58AC271 /* Pods_Runner.framework in Frameworks */,
7272
);
7373
runOnlyForDeploymentPostprocessing = 0;
7474
};
@@ -78,9 +78,9 @@
7878
0774D295BE5E2390343C1BAC /* Pods */ = {
7979
isa = PBXGroup;
8080
children = (
81-
767A28456D0F58E8B5DEF8A8 /* Pods-Runner.debug.xcconfig */,
82-
2C56F4BD57024BABF848A480 /* Pods-Runner.release.xcconfig */,
83-
2BBA5ED6D9C7D4F43CA253D8 /* Pods-Runner.profile.xcconfig */,
81+
F483A6CAF671B34615A91B13 /* Pods-Runner.debug.xcconfig */,
82+
C4C7D82A8366AA96A2F6D10F /* Pods-Runner.release.xcconfig */,
83+
4D28D0715F932D2240B98467 /* Pods-Runner.profile.xcconfig */,
8484
);
8585
path = Pods;
8686
sourceTree = "<group>";
@@ -89,7 +89,7 @@
8989
isa = PBXGroup;
9090
children = (
9191
FA586AA32B10F20E002D1F8C /* libsqlite3.tbd */,
92-
492B180639AA4D421B53B01B /* Pods_Runner.framework */,
92+
B54EB0EA0F73A26B3BBEB640 /* Pods_Runner.framework */,
9393
);
9494
name = Frameworks;
9595
sourceTree = "<group>";
@@ -161,16 +161,16 @@
161161
isa = PBXNativeTarget;
162162
buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
163163
buildPhases = (
164-
0CCBE4403D1780067D05D9E8 /* [CP] Check Pods Manifest.lock */,
164+
069EA7E37F42F7CABF67B963 /* [CP] Check Pods Manifest.lock */,
165165
9740EEB61CF901F6004384FC /* Run Script */,
166166
97C146EA1CF9000F007C117D /* Sources */,
167167
97C146EB1CF9000F007C117D /* Frameworks */,
168168
97C146EC1CF9000F007C117D /* Resources */,
169169
9705A1C41CF9048500538489 /* Embed Frameworks */,
170170
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
171171
BF8E73EE9817346BE5615987 /* FlutterFire: "flutterfire upload-crashlytics-symbols" */,
172-
3F526C1B90237251393F2F90 /* [CP] Embed Pods Frameworks */,
173-
E27245FFD13B719D557D8311 /* [CP] Copy Pods Resources */,
172+
2016070E90A4EEC826B26CA6 /* [CP] Embed Pods Frameworks */,
173+
7FB0ADA9B66CF46F7A6141ED /* [CP] Copy Pods Resources */,
174174
);
175175
buildRules = (
176176
);
@@ -235,7 +235,7 @@
235235
/* End PBXResourcesBuildPhase section */
236236

237237
/* Begin PBXShellScriptBuildPhase section */
238-
0CCBE4403D1780067D05D9E8 /* [CP] Check Pods Manifest.lock */ = {
238+
069EA7E37F42F7CABF67B963 /* [CP] Check Pods Manifest.lock */ = {
239239
isa = PBXShellScriptBuildPhase;
240240
buildActionMask = 2147483647;
241241
files = (
@@ -257,23 +257,7 @@
257257
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
258258
showEnvVarsInLog = 0;
259259
};
260-
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
261-
isa = PBXShellScriptBuildPhase;
262-
alwaysOutOfDate = 1;
263-
buildActionMask = 2147483647;
264-
files = (
265-
);
266-
inputPaths = (
267-
"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
268-
);
269-
name = "Thin Binary";
270-
outputPaths = (
271-
);
272-
runOnlyForDeploymentPostprocessing = 0;
273-
shellPath = /bin/sh;
274-
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin\n";
275-
};
276-
3F526C1B90237251393F2F90 /* [CP] Embed Pods Frameworks */ = {
260+
2016070E90A4EEC826B26CA6 /* [CP] Embed Pods Frameworks */ = {
277261
isa = PBXShellScriptBuildPhase;
278262
buildActionMask = 2147483647;
279263
files = (
@@ -389,40 +373,23 @@
389373
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
390374
showEnvVarsInLog = 0;
391375
};
392-
9740EEB61CF901F6004384FC /* Run Script */ = {
376+
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
393377
isa = PBXShellScriptBuildPhase;
394378
alwaysOutOfDate = 1;
395379
buildActionMask = 2147483647;
396380
files = (
397381
);
398382
inputPaths = (
383+
"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
399384
);
400-
name = "Run Script";
401-
outputPaths = (
402-
);
403-
runOnlyForDeploymentPostprocessing = 0;
404-
shellPath = /bin/sh;
405-
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n";
406-
};
407-
BF8E73EE9817346BE5615987 /* FlutterFire: "flutterfire upload-crashlytics-symbols" */ = {
408-
isa = PBXShellScriptBuildPhase;
409-
buildActionMask = 2147483647;
410-
files = (
411-
);
412-
inputFileListPaths = (
413-
);
414-
inputPaths = (
415-
);
416-
name = "FlutterFire: \"flutterfire upload-crashlytics-symbols\"";
417-
outputFileListPaths = (
418-
);
385+
name = "Thin Binary";
419386
outputPaths = (
420387
);
421388
runOnlyForDeploymentPostprocessing = 0;
422389
shellPath = /bin/sh;
423-
shellScript = "\n#!/bin/bash\nPATH=${PATH}:$FLUTTER_ROOT/bin:$HOME/.pub-cache/bin\nflutterfire upload-crashlytics-symbols --upload-symbols-script-path=$PODS_ROOT/FirebaseCrashlytics/upload-symbols --platform=ios --apple-project-path=${SRCROOT} --env-platform-name=${PLATFORM_NAME} --env-configuration=${CONFIGURATION} --env-project-dir=${PROJECT_DIR} --env-built-products-dir=${BUILT_PRODUCTS_DIR} --env-dwarf-dsym-folder-path=${DWARF_DSYM_FOLDER_PATH} --env-dwarf-dsym-file-name=${DWARF_DSYM_FILE_NAME} --env-infoplist-path=${INFOPLIST_PATH} --default-config=default\n";
390+
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin\n";
424391
};
425-
E27245FFD13B719D557D8311 /* [CP] Copy Pods Resources */ = {
392+
7FB0ADA9B66CF46F7A6141ED /* [CP] Copy Pods Resources */ = {
426393
isa = PBXShellScriptBuildPhase;
427394
buildActionMask = 2147483647;
428395
files = (
@@ -452,6 +419,39 @@
452419
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
453420
showEnvVarsInLog = 0;
454421
};
422+
9740EEB61CF901F6004384FC /* Run Script */ = {
423+
isa = PBXShellScriptBuildPhase;
424+
alwaysOutOfDate = 1;
425+
buildActionMask = 2147483647;
426+
files = (
427+
);
428+
inputPaths = (
429+
);
430+
name = "Run Script";
431+
outputPaths = (
432+
);
433+
runOnlyForDeploymentPostprocessing = 0;
434+
shellPath = /bin/sh;
435+
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n";
436+
};
437+
BF8E73EE9817346BE5615987 /* FlutterFire: "flutterfire upload-crashlytics-symbols" */ = {
438+
isa = PBXShellScriptBuildPhase;
439+
buildActionMask = 2147483647;
440+
files = (
441+
);
442+
inputFileListPaths = (
443+
);
444+
inputPaths = (
445+
);
446+
name = "FlutterFire: \"flutterfire upload-crashlytics-symbols\"";
447+
outputFileListPaths = (
448+
);
449+
outputPaths = (
450+
);
451+
runOnlyForDeploymentPostprocessing = 0;
452+
shellPath = /bin/sh;
453+
shellScript = "\n#!/bin/bash\nPATH=${PATH}:$FLUTTER_ROOT/bin:$HOME/.pub-cache/bin\nflutterfire upload-crashlytics-symbols --upload-symbols-script-path=$PODS_ROOT/FirebaseCrashlytics/upload-symbols --platform=ios --apple-project-path=${SRCROOT} --env-platform-name=${PLATFORM_NAME} --env-configuration=${CONFIGURATION} --env-project-dir=${PROJECT_DIR} --env-built-products-dir=${BUILT_PRODUCTS_DIR} --env-dwarf-dsym-folder-path=${DWARF_DSYM_FOLDER_PATH} --env-dwarf-dsym-file-name=${DWARF_DSYM_FILE_NAME} --env-infoplist-path=${INFOPLIST_PATH} --default-config=default\n";
454+
};
455455
/* End PBXShellScriptBuildPhase section */
456456

457457
/* Begin PBXSourcesBuildPhase section */
@@ -549,7 +549,7 @@
549549
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
550550
CODE_SIGN_IDENTITY = "Apple Development";
551551
CODE_SIGN_STYLE = Automatic;
552-
CURRENT_PROJECT_VERSION = 466;
552+
CURRENT_PROJECT_VERSION = 467;
553553
DEVELOPMENT_ASSET_PATHS = "";
554554
DEVELOPMENT_TEAM = 53KVJRJS99;
555555
ENABLE_BITCODE = NO;
@@ -698,7 +698,7 @@
698698
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
699699
CODE_SIGN_IDENTITY = "Apple Development";
700700
CODE_SIGN_STYLE = Automatic;
701-
CURRENT_PROJECT_VERSION = 466;
701+
CURRENT_PROJECT_VERSION = 467;
702702
DEVELOPMENT_ASSET_PATHS = "";
703703
DEVELOPMENT_TEAM = 53KVJRJS99;
704704
ENABLE_BITCODE = NO;
@@ -739,7 +739,7 @@
739739
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
740740
CODE_SIGN_IDENTITY = "Apple Development";
741741
CODE_SIGN_STYLE = Automatic;
742-
CURRENT_PROJECT_VERSION = 466;
742+
CURRENT_PROJECT_VERSION = 467;
743743
DEVELOPMENT_ASSET_PATHS = "";
744744
DEVELOPMENT_TEAM = 53KVJRJS99;
745745
ENABLE_BITCODE = NO;

‎lib/main.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ import 'package:workmanager/workmanager.dart';
6969

7070
// TODO (App release)
7171
const String appVersion = '3.6.2';
72-
const String androidCompilation = '466';
73-
const String iosCompilation = '466';
72+
const String androidCompilation = '467';
73+
const String iosCompilation = '467';
7474

7575
// TODO (App release)
7676
// Note: if using Windows and calling HTTP functions, we need to change the URL in [firebase_functions.dart]

0 commit comments

Comments
 (0)