Skip to content

Commit 08f16a2

Browse files
Merge branch 'wger-project:master' into master
2 parents c315a26 + c664cce commit 08f16a2

File tree

12 files changed

+636
-374
lines changed

12 files changed

+636
-374
lines changed

android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ 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-7.5-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip

ios/Podfile.lock

Lines changed: 27 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,28 @@ PODS:
1717
- path_provider_foundation (0.0.1):
1818
- Flutter
1919
- FlutterMacOS
20+
- pointer_interceptor_ios (0.0.1):
21+
- Flutter
2022
- rive_common (0.0.1):
2123
- Flutter
2224
- shared_preferences_foundation (0.0.1):
2325
- Flutter
2426
- FlutterMacOS
25-
- sqlite3 (3.45.0):
26-
- sqlite3/common (= 3.45.0)
27-
- sqlite3/common (3.45.0)
28-
- sqlite3/fts5 (3.45.0):
27+
- sqlite3 (3.47.0):
28+
- sqlite3/common (= 3.47.0)
29+
- sqlite3/common (3.47.0)
30+
- sqlite3/dbstatvtab (3.47.0):
31+
- sqlite3/common
32+
- sqlite3/fts5 (3.47.0):
2933
- sqlite3/common
30-
- sqlite3/perf-threadsafe (3.45.0):
34+
- sqlite3/perf-threadsafe (3.47.0):
3135
- sqlite3/common
32-
- sqlite3/rtree (3.45.0):
36+
- sqlite3/rtree (3.47.0):
3337
- sqlite3/common
3438
- sqlite3_flutter_libs (0.0.1):
3539
- Flutter
36-
- sqlite3 (~> 3.45.0)
40+
- sqlite3 (~> 3.47.0)
41+
- sqlite3/dbstatvtab
3742
- sqlite3/fts5
3843
- sqlite3/perf-threadsafe
3944
- sqlite3/rtree
@@ -53,6 +58,7 @@ DEPENDENCIES:
5358
- integration_test (from `.symlinks/plugins/integration_test/ios`)
5459
- package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
5560
- path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
61+
- pointer_interceptor_ios (from `.symlinks/plugins/pointer_interceptor_ios/ios`)
5662
- rive_common (from `.symlinks/plugins/rive_common/ios`)
5763
- shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
5864
- sqlite3_flutter_libs (from `.symlinks/plugins/sqlite3_flutter_libs/ios`)
@@ -82,6 +88,8 @@ EXTERNAL SOURCES:
8288
:path: ".symlinks/plugins/package_info_plus/ios"
8389
path_provider_foundation:
8490
:path: ".symlinks/plugins/path_provider_foundation/darwin"
91+
pointer_interceptor_ios:
92+
:path: ".symlinks/plugins/pointer_interceptor_ios/ios"
8593
rive_common:
8694
:path: ".symlinks/plugins/rive_common/ios"
8795
shared_preferences_foundation:
@@ -94,22 +102,23 @@ EXTERNAL SOURCES:
94102
:path: ".symlinks/plugins/video_player_avfoundation/darwin"
95103

96104
SPEC CHECKSUMS:
97-
camera_avfoundation: 3125e8cd1a4387f6f31c6c63abb8a55892a9eeeb
105+
camera_avfoundation: dd002b0330f4981e1bbcb46ae9b62829237459a4
98106
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
99107
flutter_barcode_scanner: 7a1144744c28dc0c57a8de7218ffe5ec59a9e4bf
100108
flutter_keyboard_visibility: 0339d06371254c3eb25eeb90ba8d17dca8f9c069
101109
flutter_zxing: 19a866d17c8a87ee1026d68521c69d2f008635f6
102-
image_picker_ios: 4a8aadfbb6dc30ad5141a2ce3832af9214a705b5
103-
integration_test: 13825b8a9334a850581300559b8839134b124670
104-
package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85
105-
path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
110+
image_picker_ios: c560581cceedb403a6ff17f2f816d7fea1421fc1
111+
integration_test: 252f60fa39af5e17c3aa9899d35d908a0721b573
112+
package_info_plus: c0502532a26c7662a62a356cebe2692ec5fe4ec4
113+
path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
114+
pointer_interceptor_ios: 508241697ff0947f853c061945a8b822463947c1
106115
rive_common: 3a4c254c6e4db7e4b9e05daeb3d1f47ae4f7bf76
107-
shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126
108-
sqlite3: f307b6291c4db7b5086c38d6237446b98a738581
109-
sqlite3_flutter_libs: aeb4d37509853dfa79d9b59386a2dac5dd079428
110-
url_launcher_ios: bf5ce03e0e2088bad9cc378ea97fa0ed5b49673b
111-
video_player_avfoundation: e9e6f9cae7d7a6d9b43519b0aab382bca60fcfd1
116+
shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
117+
sqlite3: 0aa20658a9b238a3b1ff7175eb7bdd863b0ab4fd
118+
sqlite3_flutter_libs: b55ef23cfafea5318ae5081e0bf3fbbce8417c94
119+
url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
120+
video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3
112121

113122
PODFILE CHECKSUM: 4e8f8b2be68aeea4c0d5beb6ff1e79fface1d048
114123

115-
COCOAPODS: 1.14.3
124+
COCOAPODS: 1.16.0

ios/Runner.xcodeproj/project.pbxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@
155155
97C146E61CF9000F007C117D /* Project object */ = {
156156
isa = PBXProject;
157157
attributes = {
158-
LastUpgradeCheck = 1430;
158+
LastUpgradeCheck = 1510;
159159
ORGANIZATIONNAME = "";
160160
TargetAttributes = {
161161
97C146ED1CF9000F007C117D = {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1430"
3+
LastUpgradeVersion = "1510"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

ios/Runner/AppDelegate.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import UIKit
22
import Flutter
33

4-
@UIApplicationMain
4+
@main
55
@objc class AppDelegate: FlutterAppDelegate {
66
override func application(
77
_ application: UIApplication,

0 commit comments

Comments
 (0)