Skip to content

Commit 61f61a6

Browse files
rolandgeiderrolandgeider
committed
Merge branch 'master' into feature/improve-min-app-version
# Conflicts: # lib/providers/auth.dart
2 parents e4b550a + bc45e46 commit 61f61a6

File tree

121 files changed

+872
-262
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+872
-262
lines changed

‎.gitignore‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,3 +54,14 @@ app.*.map.json
5454
/vendor/bundle/ruby/
5555
/coverage/
5656
/lib/l10n/generated/
57+
58+
# ios build and fastlane
59+
ios/fastlane/.env
60+
ios/fastlane/*.p8
61+
ios/fastlane/test_output
62+
ios/fastlane/screenshots
63+
ios/fastlane/report.xml
64+
ios/fastlane/Preview.html
65+
ios/fastlane/output
66+
ios/Runner.ipa
67+
ios/Runner.app.dSYM.zip

‎test_data/dart_test.yaml‎ renamed to ‎dart_test.yaml‎

File renamed without changes.

‎fastlane/Appfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
json_key_file("fastlane/metadata/android/envfiles/playstore.json")
2-
package_name("de.wger.flutter")
2+
package_name("de.wger.flutter")

‎ios/Gemfile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
source "https://rubygems.org"
2+
3+
gem "fastlane"

‎ios/Gemfile.lock‎

Lines changed: 222 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,222 @@
1+
GEM
2+
remote: https://rubygems.org/
3+
specs:
4+
CFPropertyList (3.0.7)
5+
base64
6+
nkf
7+
rexml
8+
addressable (2.8.7)
9+
public_suffix (>= 2.0.2, < 7.0)
10+
artifactory (3.0.17)
11+
atomos (0.1.3)
12+
aws-eventstream (1.3.0)
13+
aws-partitions (1.1018.0)
14+
aws-sdk-core (3.214.0)
15+
aws-eventstream (~> 1, >= 1.3.0)
16+
aws-partitions (~> 1, >= 1.992.0)
17+
aws-sigv4 (~> 1.9)
18+
jmespath (~> 1, >= 1.6.1)
19+
aws-sdk-kms (1.96.0)
20+
aws-sdk-core (~> 3, >= 3.210.0)
21+
aws-sigv4 (~> 1.5)
22+
aws-sdk-s3 (1.176.0)
23+
aws-sdk-core (~> 3, >= 3.210.0)
24+
aws-sdk-kms (~> 1)
25+
aws-sigv4 (~> 1.5)
26+
aws-sigv4 (1.10.1)
27+
aws-eventstream (~> 1, >= 1.0.2)
28+
babosa (1.0.4)
29+
base64 (0.2.0)
30+
claide (1.1.0)
31+
colored (1.2)
32+
colored2 (3.1.2)
33+
commander (4.6.0)
34+
highline (~> 2.0.0)
35+
declarative (0.0.20)
36+
digest-crc (0.6.5)
37+
rake (>= 12.0.0, < 14.0.0)
38+
domain_name (0.6.20240107)
39+
dotenv (2.8.1)
40+
emoji_regex (3.2.3)
41+
excon (0.112.0)
42+
faraday (1.10.4)
43+
faraday-em_http (~> 1.0)
44+
faraday-em_synchrony (~> 1.0)
45+
faraday-excon (~> 1.1)
46+
faraday-httpclient (~> 1.0)
47+
faraday-multipart (~> 1.0)
48+
faraday-net_http (~> 1.0)
49+
faraday-net_http_persistent (~> 1.0)
50+
faraday-patron (~> 1.0)
51+
faraday-rack (~> 1.0)
52+
faraday-retry (~> 1.0)
53+
ruby2_keywords (>= 0.0.4)
54+
faraday-cookie_jar (0.0.7)
55+
faraday (>= 0.8.0)
56+
http-cookie (~> 1.0.0)
57+
faraday-em_http (1.0.0)
58+
faraday-em_synchrony (1.0.0)
59+
faraday-excon (1.1.0)
60+
faraday-httpclient (1.0.1)
61+
faraday-multipart (1.0.4)
62+
multipart-post (~> 2)
63+
faraday-net_http (1.0.2)
64+
faraday-net_http_persistent (1.2.0)
65+
faraday-patron (1.0.0)
66+
faraday-rack (1.0.0)
67+
faraday-retry (1.0.3)
68+
faraday_middleware (1.2.1)
69+
faraday (~> 1.0)
70+
fastimage (2.3.1)
71+
fastlane (2.225.0)
72+
CFPropertyList (>= 2.3, < 4.0.0)
73+
addressable (>= 2.8, < 3.0.0)
74+
artifactory (~> 3.0)
75+
aws-sdk-s3 (~> 1.0)
76+
babosa (>= 1.0.3, < 2.0.0)
77+
bundler (>= 1.12.0, < 3.0.0)
78+
colored (~> 1.2)
79+
commander (~> 4.6)
80+
dotenv (>= 2.1.1, < 3.0.0)
81+
emoji_regex (>= 0.1, < 4.0)
82+
excon (>= 0.71.0, < 1.0.0)
83+
faraday (~> 1.0)
84+
faraday-cookie_jar (~> 0.0.6)
85+
faraday_middleware (~> 1.0)
86+
fastimage (>= 2.1.0, < 3.0.0)
87+
fastlane-sirp (>= 1.0.0)
88+
gh_inspector (>= 1.1.2, < 2.0.0)
89+
google-apis-androidpublisher_v3 (~> 0.3)
90+
google-apis-playcustomapp_v1 (~> 0.1)
91+
google-cloud-env (>= 1.6.0, < 2.0.0)
92+
google-cloud-storage (~> 1.31)
93+
highline (~> 2.0)
94+
http-cookie (~> 1.0.5)
95+
json (< 3.0.0)
96+
jwt (>= 2.1.0, < 3)
97+
mini_magick (>= 4.9.4, < 5.0.0)
98+
multipart-post (>= 2.0.0, < 3.0.0)
99+
naturally (~> 2.2)
100+
optparse (>= 0.1.1, < 1.0.0)
101+
plist (>= 3.1.0, < 4.0.0)
102+
rubyzip (>= 2.0.0, < 3.0.0)
103+
security (= 0.1.5)
104+
simctl (~> 1.6.3)
105+
terminal-notifier (>= 2.0.0, < 3.0.0)
106+
terminal-table (~> 3)
107+
tty-screen (>= 0.6.3, < 1.0.0)
108+
tty-spinner (>= 0.8.0, < 1.0.0)
109+
word_wrap (~> 1.0.0)
110+
xcodeproj (>= 1.13.0, < 2.0.0)
111+
xcpretty (~> 0.3.0)
112+
xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
113+
fastlane-sirp (1.0.0)
114+
sysrandom (~> 1.0)
115+
gh_inspector (1.1.3)
116+
google-apis-androidpublisher_v3 (0.54.0)
117+
google-apis-core (>= 0.11.0, < 2.a)
118+
google-apis-core (0.11.3)
119+
addressable (~> 2.5, >= 2.5.1)
120+
googleauth (>= 0.16.2, < 2.a)
121+
httpclient (>= 2.8.1, < 3.a)
122+
mini_mime (~> 1.0)
123+
representable (~> 3.0)
124+
retriable (>= 2.0, < 4.a)
125+
rexml
126+
google-apis-iamcredentials_v1 (0.17.0)
127+
google-apis-core (>= 0.11.0, < 2.a)
128+
google-apis-playcustomapp_v1 (0.13.0)
129+
google-apis-core (>= 0.11.0, < 2.a)
130+
google-apis-storage_v1 (0.31.0)
131+
google-apis-core (>= 0.11.0, < 2.a)
132+
google-cloud-core (1.7.1)
133+
google-cloud-env (>= 1.0, < 3.a)
134+
google-cloud-errors (~> 1.0)
135+
google-cloud-env (1.6.0)
136+
faraday (>= 0.17.3, < 3.0)
137+
google-cloud-errors (1.4.0)
138+
google-cloud-storage (1.47.0)
139+
addressable (~> 2.8)
140+
digest-crc (~> 0.4)
141+
google-apis-iamcredentials_v1 (~> 0.1)
142+
google-apis-storage_v1 (~> 0.31.0)
143+
google-cloud-core (~> 1.6)
144+
googleauth (>= 0.16.2, < 2.a)
145+
mini_mime (~> 1.0)
146+
googleauth (1.8.1)
147+
faraday (>= 0.17.3, < 3.a)
148+
jwt (>= 1.4, < 3.0)
149+
multi_json (~> 1.11)
150+
os (>= 0.9, < 2.0)
151+
signet (>= 0.16, < 2.a)
152+
highline (2.0.3)
153+
http-cookie (1.0.8)
154+
domain_name (~> 0.5)
155+
httpclient (2.8.3)
156+
jmespath (1.6.2)
157+
json (2.9.0)
158+
jwt (2.9.3)
159+
base64
160+
mini_magick (4.13.2)
161+
mini_mime (1.1.5)
162+
multi_json (1.15.0)
163+
multipart-post (2.4.1)
164+
nanaimo (0.4.0)
165+
naturally (2.2.1)
166+
nkf (0.2.0)
167+
optparse (0.6.0)
168+
os (1.1.4)
169+
plist (3.7.1)
170+
public_suffix (6.0.1)
171+
rake (13.2.1)
172+
representable (3.2.0)
173+
declarative (< 0.1.0)
174+
trailblazer-option (>= 0.1.1, < 0.2.0)
175+
uber (< 0.2.0)
176+
retriable (3.1.2)
177+
rexml (3.3.9)
178+
rouge (2.0.7)
179+
ruby2_keywords (0.0.5)
180+
rubyzip (2.3.2)
181+
security (0.1.5)
182+
signet (0.19.0)
183+
addressable (~> 2.8)
184+
faraday (>= 0.17.5, < 3.a)
185+
jwt (>= 1.5, < 3.0)
186+
multi_json (~> 1.10)
187+
simctl (1.6.10)
188+
CFPropertyList
189+
naturally
190+
sysrandom (1.0.5)
191+
terminal-notifier (2.0.0)
192+
terminal-table (3.0.2)
193+
unicode-display_width (>= 1.1.1, < 3)
194+
trailblazer-option (0.1.2)
195+
tty-cursor (0.7.1)
196+
tty-screen (0.8.2)
197+
tty-spinner (0.9.3)
198+
tty-cursor (~> 0.7)
199+
uber (0.1.0)
200+
unicode-display_width (2.6.0)
201+
word_wrap (1.0.0)
202+
xcodeproj (1.27.0)
203+
CFPropertyList (>= 2.3.3, < 4.0)
204+
atomos (~> 0.1.3)
205+
claide (>= 1.0.2, < 2.0)
206+
colored2 (~> 3.1)
207+
nanaimo (~> 0.4.0)
208+
rexml (>= 3.3.6, < 4.0)
209+
xcpretty (0.3.0)
210+
rouge (~> 2.0.7)
211+
xcpretty-travis-formatter (1.0.1)
212+
xcpretty (~> 0.2, >= 0.0.7)
213+
214+
PLATFORMS
215+
arm64-darwin-24
216+
ruby
217+
218+
DEPENDENCIES
219+
fastlane
220+
221+
BUNDLED WITH
222+
2.5.18

‎ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
3939
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
4040
89F44165E15E0A7B109A05EB /* 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>"; };
41+
8D383D452D8E929100066A20 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
4142
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
4243
9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
4344
97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -102,6 +103,7 @@
102103
97C146F01CF9000F007C117D /* Runner */ = {
103104
isa = PBXGroup;
104105
children = (
106+
8D383D452D8E929100066A20 /* Runner.entitlements */,
105107
97C146FA1CF9000F007C117D /* Main.storyboard */,
106108
97C146FD1CF9000F007C117D /* Assets.xcassets */,
107109
97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */,
@@ -357,8 +359,9 @@
357359
buildSettings = {
358360
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
359361
CLANG_ENABLE_MODULES = YES;
362+
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
360363
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
361-
DEVELOPMENT_TEAM = 643RNGR6QG;
364+
DEVELOPMENT_TEAM = U92KZ4HZ4C;
362365
ENABLE_BITCODE = NO;
363366
FRAMEWORK_SEARCH_PATHS = (
364367
"$(inherited)",
@@ -373,7 +376,8 @@
373376
"$(inherited)",
374377
"$(PROJECT_DIR)/Flutter",
375378
);
376-
PRODUCT_BUNDLE_IDENTIFIER = de.wger.flutter;
379+
MARKETING_VERSION = 1.8.0;
380+
PRODUCT_BUNDLE_IDENTIFIER = de.wger.flutter.community;
377381
PRODUCT_NAME = "$(TARGET_NAME)";
378382
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
379383
SWIFT_VERSION = 5.0;
@@ -494,8 +498,9 @@
494498
buildSettings = {
495499
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
496500
CLANG_ENABLE_MODULES = YES;
501+
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
497502
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
498-
DEVELOPMENT_TEAM = 643RNGR6QG;
503+
DEVELOPMENT_TEAM = U92KZ4HZ4C;
499504
ENABLE_BITCODE = NO;
500505
FRAMEWORK_SEARCH_PATHS = (
501506
"$(inherited)",
@@ -510,7 +515,8 @@
510515
"$(inherited)",
511516
"$(PROJECT_DIR)/Flutter",
512517
);
513-
PRODUCT_BUNDLE_IDENTIFIER = de.wger.flutter;
518+
MARKETING_VERSION = 1.8.0;
519+
PRODUCT_BUNDLE_IDENTIFIER = de.wger.flutter.community;
514520
PRODUCT_NAME = "$(TARGET_NAME)";
515521
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
516522
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -525,8 +531,9 @@
525531
buildSettings = {
526532
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
527533
CLANG_ENABLE_MODULES = YES;
534+
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
528535
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
529-
DEVELOPMENT_TEAM = 643RNGR6QG;
536+
DEVELOPMENT_TEAM = U92KZ4HZ4C;
530537
ENABLE_BITCODE = NO;
531538
FRAMEWORK_SEARCH_PATHS = (
532539
"$(inherited)",
@@ -541,7 +548,8 @@
541548
"$(inherited)",
542549
"$(PROJECT_DIR)/Flutter",
543550
);
544-
PRODUCT_BUNDLE_IDENTIFIER = de.wger.flutter;
551+
MARKETING_VERSION = 1.8.0;
552+
PRODUCT_BUNDLE_IDENTIFIER = de.wger.flutter.community;
545553
PRODUCT_NAME = "$(TARGET_NAME)";
546554
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
547555
SWIFT_VERSION = 5.0;

‎ios/Runner/Assets.xcassets/AppIcon.appiconset/100.png‎

3.46 KB
Loading

‎ios/Runner/Assets.xcassets/AppIcon.appiconset/1024.png‎

42.5 KB
Loading

‎ios/Runner/Assets.xcassets/AppIcon.appiconset/114.png‎

3.92 KB
Loading

‎ios/Runner/Assets.xcassets/AppIcon.appiconset/120.png‎

4.09 KB
Loading

0 commit comments

Comments
 (0)