Skip to content

Commit 7a07a52

Browse files
authored
Merge pull request #190 from wger-project/feature/exercise-crowdsourcing
Exercise crowdsourcing
2 parents 5aeda07 + faadab1 commit 7a07a52

File tree

182 files changed

+6640
-817
lines changed

Some content is hidden

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

182 files changed

+6640
-817
lines changed

.github/workflows/android-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
WGER_API_KEY: ${{ secrets.WGER_API_KEY }}
7979

8080
- name: Upload build to Play Store
81-
uses: maierj/fastlane-action@v2.1.0
81+
uses: maierj/fastlane-action@v2.2.1
8282
with:
8383
lane: production
8484

.github/workflows/ci.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
name: Continous Integration
22
on:
33
push:
4-
branches: [ master ]
54
paths:
65
- '**.dart'
76
- 'pubspec.yaml'
87
pull_request:
9-
branches: [ master ]
8+
branches: [ pull_request, master ]
109
paths:
1110
- '**.dart'
1211
- 'pubspec.yaml'

.github/workflows/linter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
uses: subosito/flutter-action@v1
2121
with:
2222
channel: 'stable'
23-
flutter-version: '3.0.x'
23+
flutter-version: '3.3.x'
2424

2525
- name: Get dependencies
2626
run: flutter pub get

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,8 @@ app.*.map.json
4848
/fastlane/metadata/envfiles/wger.properties
4949
/fastlane/metadata/envfiles/keys.jks
5050
/fastlane/metadata/envfiles/key.properties
51+
52+
53+
# Others
54+
/vendor/bundle/ruby/
55+
/coverage/

Gemfile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
source "https://rubygems.org"
2+
3+
gem "fastlane"
4+
plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
5+
eval_gemfile(plugins_path) if File.exist?(plugins_path)

Gemfile.lock

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

android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ if(wgerApiKey == null){
5555
}
5656

5757
android {
58-
compileSdkVersion 31
58+
compileSdkVersion 32
5959

6060
sourceSets {
6161
main.java.srcDirs += 'src/main/kotlin'
@@ -69,7 +69,7 @@ android {
6969
// Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
7070
applicationId "de.wger.flutter"
7171
minSdkVersion 21
72-
targetSdkVersion 31
72+
targetSdkVersion 32
7373
versionCode flutterVersionCode.toInteger()
7474
versionName flutterVersionName
7575
manifestPlaceholders += [WGER_API_KEY: wgerApiKey]

fastlane/metadata/android/README.md

Lines changed: 2 additions & 1 deletion
137 KB
1.21 MB

0 commit comments

Comments
 (0)