Skip to content
This repository was archived by the owner on May 22, 2024. It is now read-only.

Commit a123932

Browse files
Add fixes to mail page
1 parent f1f1980 commit a123932

File tree

24 files changed

+442
-467
lines changed

24 files changed

+442
-467
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@ lib/generated_plugin_registrant.dart
3939
/android/key.properties
4040
/android/app/key.jks
4141
pronoteAPI.py
42-
42+
/android/fastlane/.env.default

README.md

Lines changed: 0 additions & 106 deletions
This file was deleted.

android/Gemfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
source "https://rubygems.org"
22

33
gem "fastlane"
4+
5+
gem 'fastlane-plugin-flutter_version', '~> 1.0'
6+
7+
gem 'dotenv-rails', groups: [:development, :test]

android/Gemfile.lock

Lines changed: 64 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,31 @@ GEM
22
remote: https://rubygems.org/
33
specs:
44
CFPropertyList (3.0.2)
5+
actionpack (6.0.3.4)
6+
actionview (= 6.0.3.4)
7+
activesupport (= 6.0.3.4)
8+
rack (~> 2.0, >= 2.0.8)
9+
rack-test (>= 0.6.3)
10+
rails-dom-testing (~> 2.0)
11+
rails-html-sanitizer (~> 1.0, >= 1.2.0)
12+
actionview (6.0.3.4)
13+
activesupport (= 6.0.3.4)
14+
builder (~> 3.1)
15+
erubi (~> 1.4)
16+
rails-dom-testing (~> 2.0)
17+
rails-html-sanitizer (~> 1.1, >= 1.2.0)
18+
activesupport (6.0.3.4)
19+
concurrent-ruby (~> 1.0, >= 1.0.2)
20+
i18n (>= 0.7, < 2)
21+
minitest (~> 5.1)
22+
tzinfo (~> 1.1)
23+
zeitwerk (~> 2.2, >= 2.2.2)
524
addressable (2.7.0)
625
public_suffix (>= 2.0.2, < 5.0)
726
atomos (0.1.3)
827
aws-eventstream (1.1.0)
928
aws-partitions (1.402.0)
10-
aws-sdk-core (3.109.3)
29+
aws-sdk-core (3.110.0)
1130
aws-eventstream (~> 1, >= 1.0.2)
1231
aws-partitions (~> 1, >= 1.239.0)
1332
aws-sigv4 (~> 1.1)
@@ -22,20 +41,27 @@ GEM
2241
aws-sigv4 (1.2.2)
2342
aws-eventstream (~> 1, >= 1.0.2)
2443
babosa (1.0.4)
44+
builder (3.2.4)
2545
claide (1.0.3)
2646
colored (1.2)
2747
colored2 (3.1.2)
2848
commander-fastlane (4.4.6)
2949
highline (~> 1.7.2)
50+
concurrent-ruby (1.1.7)
51+
crass (1.0.6)
3052
declarative (0.0.20)
3153
declarative-option (0.1.0)
32-
digest-crc (0.6.1)
33-
rake (~> 13.0)
54+
digest-crc (0.6.2)
55+
rake (~> 12.0)
3456
domain_name (0.5.20190701)
3557
unf (>= 0.0.5, < 1.0.0)
3658
dotenv (2.7.6)
59+
dotenv-rails (2.7.6)
60+
dotenv (= 2.7.6)
61+
railties (>= 3.2)
3762
emoji_regex (3.2.1)
38-
excon (0.78.0)
63+
erubi (1.10.0)
64+
excon (0.78.1)
3965
faraday (1.1.0)
4066
multipart-post (>= 1.2, < 3)
4167
ruby2_keywords
@@ -45,7 +71,7 @@ GEM
4571
faraday_middleware (1.0.0)
4672
faraday (~> 1.0)
4773
fastimage (2.2.0)
48-
fastlane (2.169.0)
74+
fastlane (2.170.0)
4975
CFPropertyList (>= 2.3, < 4.0.0)
5076
addressable (>= 2.3, < 3.0.0)
5177
aws-sdk-s3 (~> 1.0)
@@ -81,6 +107,7 @@ GEM
81107
xcodeproj (>= 1.13.0, < 2.0.0)
82108
xcpretty (~> 0.3.0)
83109
xcpretty-travis-formatter (>= 0.0.3)
110+
fastlane-plugin-flutter_version (1.0.0)
84111
gh_inspector (1.1.3)
85112
google-api-client (0.38.0)
86113
addressable (~> 2.5, >= 2.5.1)
@@ -114,20 +141,44 @@ GEM
114141
http-cookie (1.0.3)
115142
domain_name (~> 0.5)
116143
httpclient (2.8.3)
144+
i18n (1.8.5)
145+
concurrent-ruby (~> 1.0)
117146
jmespath (1.4.0)
118147
json (2.3.1)
119148
jwt (2.2.2)
149+
loofah (2.8.0)
150+
crass (~> 1.0.2)
151+
nokogiri (>= 1.5.9)
120152
memoist (0.16.2)
153+
method_source (1.0.0)
121154
mini_magick (4.11.0)
122155
mini_mime (1.0.2)
156+
mini_portile2 (2.4.0)
157+
minitest (5.14.2)
123158
multi_json (1.15.0)
124159
multipart-post (2.0.0)
125160
nanaimo (0.3.0)
126161
naturally (2.2.0)
162+
nokogiri (1.10.10-x64-mingw32)
163+
mini_portile2 (~> 2.4.0)
127164
os (1.1.1)
128165
plist (3.5.0)
129166
public_suffix (4.0.6)
130-
rake (13.0.1)
167+
rack (2.2.3)
168+
rack-test (1.1.0)
169+
rack (>= 1.0, < 3)
170+
rails-dom-testing (2.0.3)
171+
activesupport (>= 4.2.0)
172+
nokogiri (>= 1.6)
173+
rails-html-sanitizer (1.3.0)
174+
loofah (~> 2.3)
175+
railties (6.0.3.4)
176+
actionpack (= 6.0.3.4)
177+
activesupport (= 6.0.3.4)
178+
method_source
179+
rake (>= 0.8.7)
180+
thor (>= 0.20.3, < 2.0)
181+
rake (12.3.3)
131182
representable (3.0.4)
132183
declarative (< 0.1.0)
133184
declarative-option (< 0.2.0)
@@ -149,10 +200,14 @@ GEM
149200
terminal-notifier (2.0.0)
150201
terminal-table (1.8.0)
151202
unicode-display_width (~> 1.1, >= 1.1.1)
203+
thor (1.0.1)
204+
thread_safe (0.3.6)
152205
tty-cursor (0.7.1)
153206
tty-screen (0.8.1)
154207
tty-spinner (0.9.3)
155208
tty-cursor (~> 0.7)
209+
tzinfo (1.2.8)
210+
thread_safe (~> 0.1)
156211
uber (0.1.0)
157212
unf (0.1.4)
158213
unf_ext
@@ -169,12 +224,15 @@ GEM
169224
rouge (~> 2.0.7)
170225
xcpretty-travis-formatter (1.0.0)
171226
xcpretty (~> 0.2, >= 0.0.7)
227+
zeitwerk (2.4.2)
172228

173229
PLATFORMS
174230
x64-mingw32
175231

176232
DEPENDENCIES
233+
dotenv-rails
177234
fastlane
235+
fastlane-plugin-flutter_version (~> 1.0)
178236

179237
BUNDLED WITH
180238
2.1.4

android/fastlane/Appfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
json_key_file("E:/Desktop/pc-api-8841092832662857981-537-d6380090d6cb.json") # Path to the json secret file - Follow https://docs.fastlane.tools/actions/supply/#setup to get one
2-
package_name("") # e.g. com.krausefx.app
2+
package_name("fr.ynotes") # e.g. com.krausefx.app

android/fastlane/Fastfile

Lines changed: 32 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,19 +38,42 @@ platform :android do
3838
end
3939

4040
lane :internal do
41-
increment_build_number(build_number: number_of_commits)
41+
build_number = number_of_commits()
42+
version = flutter_version()["version_name"]
43+
continue = prompt(
44+
text: ENV["GITHUB_TOKEN"],
45+
boolean: true)
4246

4347
#Copy changelog
44-
Dir.chdir "metadata/android/fr-FR" do
45-
sh("type last_changelog.txt >> changelogs/#{build_number}.txt /Y")
46-
end
48+
if continue
49+
Dir.chdir "metadata/android/fr-FR" do
50+
sh("type last_changelog.txt >> changelogs/#{build_number}.txt")
51+
end
4752

48-
Dir.chdir "../.." do
49-
sh("flutter", "packages", "get")
50-
sh("flutter", "clean")
51-
sh("flutter", "build", "appbundle")
53+
Dir.chdir "../.." do
54+
sh("flutter", "packages", "get")
55+
sh("flutter", "clean")
56+
sh("flutter", "build", "appbundle","--build-number=#{build_number}")
57+
sh("flutter", "build", "apk","--build-number=#{build_number}", "--split-per-abi")
58+
59+
end
60+
github_release = set_github_release(
61+
repository_name: "ModernChocolate/ynotes",
62+
api_token: ENV["GITHUB_TOKEN"],
63+
name: "yNotes #{version}+#{build_number}",
64+
tag_name: "v#{version}+#{build_number}",
65+
description: (File.read("metadata/android/fr-FR/last_changelog_github.txt") rescue "No changelog provided."),
66+
commitish: "master",
67+
upload_assets: ["../../app/outputs/apk/release/"]
68+
)
69+
upload_to_play_store(track: 'internal', aab: '../build/app/outputs/bundle/release/app-release.aab', package_name: "fr.ynotes")
70+
71+
mailgun(
72+
73+
success: true,
74+
message: "La mise en circuit interne de l'application yNotes (build : #{build_number}) est un succès !")
5275
end
53-
upload_to_play_store(track: 'internal', aab: '../build/app/outputs/bundle/release/app-release.aab')
76+
5477
end
5578

5679
lane :release do
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Ajout de quelques améliorations à la page de résumé.Ajout de quelques améliorations à la page de résumé.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Ajout de quelques améliorations à la page de résumé.

android/fastlane/metadata/android/fr-FR/last_changelog_github.txt

Whitespace-only changes.

android/fastlane/report.xml

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,22 @@
55

66

77

8-
<testcase classname="fastlane.lanes" name="0: default_platform" time="0.0036018">
8+
<testcase classname="fastlane.lanes" name="0: default_platform" time="0.0022811">
99

1010
</testcase>
1111

1212

13-
<testcase classname="fastlane.lanes" name="1: flutter packages get" time="4.1483612">
13+
<testcase classname="fastlane.lanes" name="1: number_of_commits" time="0.1404468">
1414

1515
</testcase>
1616

1717

18-
<testcase classname="fastlane.lanes" name="2: flutter clean" time="3.3327144">
18+
<testcase classname="fastlane.lanes" name="2: flutter_version" time="0.0239584">
1919

2020
</testcase>
2121

2222

23-
<testcase classname="fastlane.lanes" name="3: flutter build appbundle" time="140.4558603">
24-
25-
</testcase>
26-
27-
28-
<testcase classname="fastlane.lanes" name="4: upload_to_play_store" time="558.1904549">
23+
<testcase classname="fastlane.lanes" name="3: prompt" time="7.9148664">
2924

3025
</testcase>
3126

0 commit comments

Comments
 (0)