Skip to content

1.25.0 to master #1209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 329 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
329 commits
Select commit Hold shift + click to select a range
12961cd
comment to fix
ThomasSession May 5, 2025
3c9ee9e
Fixed conversation app bar insets
ThomasSession May 5, 2025
e1b500b
Clean up
ThomasSession May 5, 2025
143dc08
Fixed tests
ThomasSession May 5, 2025
2af3485
Merge pull request #1130 from session-foundation/feature/ucs-features2
ThomasSession May 5, 2025
13c6dd8
Merge branch 'dev' into feature/updated-conversation-settings
ThomasSession May 5, 2025
4806ca0
Fixing up dev merge with latest dependencies
ThomasSession May 5, 2025
6be30d5
Base set up for clearing messages confirmation
ThomasSession May 5, 2025
267de32
Custom dialog for clearing messages from a group admin
ThomasSession May 5, 2025
d25e0ca
Clearing message logic (not complete)
ThomasSession May 5, 2025
dc15d23
Reminder of logic for clearing messages
ThomasSession May 5, 2025
493a3cf
Making sure group admins remove messages from swarm when getting a de…
ThomasSession May 5, 2025
ddc6ed0
Update app/src/main/java/org/thoughtcrime/securesms/configs/ConfigToD…
ThomasSession May 6, 2025
340b9bc
Added comment
ThomasSession May 6, 2025
8308bff
Merge pull request #1131 from session-foundation/feature/ucs-feautres-3
ThomasSession May 6, 2025
9082850
Added try catch and toast for "Clear all messages"
ThomasSession May 6, 2025
0c0b635
No status indicator when thread is empty
ThomasSession May 6, 2025
218a2e1
Clean up
ThomasSession May 6, 2025
74b1352
Handle singular/plural for toast and empty state for Select Cotnacts
ThomasSession May 6, 2025
b375bd7
Reusing SelectContactVM for the community invite
ThomasSession May 6, 2025
f81ec61
Default filtering of contact list
ThomasSession May 7, 2025
2102bf8
Adding 'clear' button to search bar
ThomasSession May 7, 2025
3933c84
Added search in group members
ThomasSession May 7, 2025
cf7d7c9
Fixed contact display name logic (we were not catering for empty stri…
ThomasSession May 7, 2025
0385ecf
New sorting logic
ThomasSession May 7, 2025
62cb045
Might be due to debug mode
ThomasSession May 7, 2025
b203024
Merge pull request #1135 from session-foundation/feature/ucs-features-4
ThomasSession May 7, 2025
e14c731
Notifications settings base logic
ThomasSession May 7, 2025
6a59d45
RadioButton updates
ThomasSession May 8, 2025
1b5746c
Enable/Disable set button if choice is the currently set one
ThomasSession May 8, 2025
0fb8912
Reworking notification settings setup
ThomasSession May 8, 2025
945733d
More notification settings logic
ThomasSession May 8, 2025
845dbd6
More notification settings
ThomasSession May 8, 2025
689e911
Fixed logic
ThomasSession May 8, 2025
cea5eff
Notification settings styling
ThomasSession May 8, 2025
9210fac
comment
ThomasSession May 8, 2025
93fa747
Using qaTag instead of contentDescription in Compose
ThomasSession May 9, 2025
2baefaa
QA tags for settings buttons
ThomasSession May 9, 2025
df48c21
Using a local version of formatting until we get network page code
ThomasSession May 9, 2025
6379413
test tags for notification settings items
ThomasSession May 9, 2025
5219a4b
Merge branch 'dev' into feature/ucs-notifications
ThomasSession May 9, 2025
67033ed
import
ThomasSession May 9, 2025
6bcb7ef
Fixing conversation app bar
ThomasSession May 9, 2025
021f950
Allowing clicking on members in group memebrs screen
ThomasSession May 11, 2025
cf4321f
Merge branch 'dev' into feature/updated-conversation-settings
ThomasSession May 11, 2025
66b9261
Merge branch 'feature/updated-conversation-settings' into feature/ucs…
ThomasSession May 11, 2025
4cd9b8c
Fixing test
ThomasSession May 11, 2025
a6158bd
Fixed tests
ThomasSession May 11, 2025
dba8680
Update app/src/main/java/org/thoughtcrime/securesms/groups/GroupMembe…
ThomasSession May 11, 2025
9752a58
Merge pull request #1144 from session-foundation/feature/ucs-notifica…
ThomasSession May 12, 2025
9dba763
Added navigation to the group members from the conversation app bar
ThomasSession May 12, 2025
9e582c7
Added navigation access to the notification settings screen from the …
ThomasSession May 12, 2025
9ef214f
Consolidating our muting/notification settings with the new screen
ThomasSession May 12, 2025
1f052fe
Added crowdin string
ThomasSession May 12, 2025
b0cbca8
Base setup for new convo search
ThomasSession May 12, 2025
ceeb82a
Removing callbacks
ThomasSession May 12, 2025
4a728c9
Search bar in conversation app bar
ThomasSession May 12, 2025
0aec5d5
Updating highlight glow intensity
ThomasSession May 13, 2025
1f67b93
Updated tests
ThomasSession May 13, 2025
a5f03ce
Merge pull request #1148 from session-foundation/feature/ucs-notifica…
ThomasSession May 13, 2025
19db834
Merge branch 'feature/updated-conversation-settings' into feature/ucs…
ThomasSession May 13, 2025
866d1d9
Search updated loading and no results ui
ThomasSession May 13, 2025
c027098
Tidy up Gradle scripts (#1150)
SessionHero01 May 13, 2025
8cba483
Avoid forced scroll during search
ThomasSession May 13, 2025
957d84a
Merge pull request #1154 from session-foundation/feature/ucs-convo-se…
ThomasSession May 13, 2025
3dd1650
[SES-3806] - Initial work for 16kb page size (#1156)
SessionHero01 May 14, 2025
08e0cda
Clear icon in testfield, and start of settings dialogs
ThomasSession May 14, 2025
4ba92fe
Fix image not showing up immediately when sending (#1157)
SessionHero01 May 14, 2025
fc3f9d8
Nickname dialog
ThomasSession May 14, 2025
a5d07dd
Moved other dialogs into the new settings dialog file and their accor…
ThomasSession May 14, 2025
92d0ac1
Nickname edtit in UCS
ThomasSession May 15, 2025
2b26992
Updated tags
ThomasSession May 15, 2025
542a1b7
Group edit dialog and making sure the text fields place their cursor …
ThomasSession May 15, 2025
78de8df
min and max line management in input fields
ThomasSession May 15, 2025
5365713
Saving group name edit
ThomasSession May 15, 2025
807f868
Saving description
ThomasSession May 15, 2025
c44da57
Merge remote-tracking branch 'origin/dev' into release/1.23.1
SessionHero01 May 15, 2025
5b33c56
Merge pull request #1159 from session-foundation/release/1.23.1
SessionHero01 May 15, 2025
db0c71f
Merge pull request #1160 from session-foundation/feature/ucs-dialogs
ThomasSession May 15, 2025
3af4b23
Fix google play services (#1163)
SessionHero01 May 15, 2025
3643f42
Fix dependabot syntax issue (#1161)
SessionHero01 May 15, 2025
ed93ce0
[Automated] Update translations from Crowdin (#1158)
stfsession May 15, 2025
8a5817a
Fixed group description error
ThomasSession May 15, 2025
528d4f1
MAking sure communities poll their info details at least once
ThomasSession May 16, 2025
9bf6028
UI fixes
ThomasSession May 16, 2025
a27c34f
Added server to key for prefs
ThomasSession May 16, 2025
338abc9
Uneeded jvmstatic
ThomasSession May 16, 2025
5870859
Merge pull request #1164 from session-foundation/feature/ucs-final-bits
ThomasSession May 16, 2025
8d97c93
Merge library modules back to app (#1162)
SessionHero01 May 16, 2025
52cf6a6
Using SecureRandom as a direct instance
ThomasSession May 16, 2025
7bc301b
Description was being overriden on subsequent poll
ThomasSession May 16, 2025
5c8bd10
Merge pull request #1167 from session-foundation/fix/remember-communi…
ThomasSession May 16, 2025
54b5b6a
Move crowdin string file to strings.xml (#1168)
SessionHero01 May 16, 2025
2951eab
Merge branch 'dev' into fix/securerandom-instance
ThomasSession May 16, 2025
24b4254
Merge pull request #1169 from session-foundation/fix/securerandom-ins…
ThomasSession May 16, 2025
372585c
More places to use message id (#1166)
SessionHero01 May 16, 2025
eac0a52
Proper hint string
ThomasSession May 18, 2025
a483e1d
Merge branch 'release/1.24.0' into feature/merging-network-page
ThomasSession May 19, 2025
914d52b
Bringing in the bumped version
ThomasSession May 19, 2025
730d02e
Accidentally removed
ThomasSession May 19, 2025
d54ff48
Merge branch 'release/1.23.2' into feature/merging-1.23.2
ThomasSession May 19, 2025
ca62901
version bump
ThomasSession May 19, 2025
9627e33
Merge pull request #1178 from session-foundation/feature/merging-1.23.2
ThomasSession May 19, 2025
06c00f4
Merge branch 'dev' into feature/updated-conversation-settings
ThomasSession May 19, 2025
90e55df
Merge branch 'dev' into feature/merging-network-page
ThomasSession May 19, 2025
e7e49a5
Merge pull request #1180 from session-foundation/feature/merging-netw…
ThomasSession May 19, 2025
e399c1c
test import
ThomasSession May 19, 2025
c00c605
Merge branch 'dev' into feature/updated-conversation-settings
ThomasSession May 19, 2025
cede61f
Removing subtitle style as it's not needed
ThomasSession May 19, 2025
0a09e1a
Safely popping back stack
ThomasSession May 19, 2025
bb8a52d
Merge pull request #1181 from session-foundation/feature/updated-conv…
ThomasSession May 19, 2025
334f59e
SES-3253 - Hide blocked contacts from the thread list
ThomasSession May 19, 2025
56845e2
Showing the eye icon for read threads
ThomasSession May 20, 2025
3c531e4
Compare read status for conversation item equality
ThomasSession May 20, 2025
70a50c3
SES-3805 - Do not unpin NTS for wrong reasons
ThomasSession May 20, 2025
f32951f
typo
ThomasSession May 20, 2025
9699d93
todos handled
ThomasSession May 20, 2025
12f21db
Merge pull request #1183 from session-foundation/feature/hide-blocked…
ThomasSession May 20, 2025
0d55bee
Fix missing table column (#1184)
SessionHero01 May 20, 2025
4973dd9
Cleaning up old menu code
ThomasSession May 21, 2025
00b3d74
Merge branch 'dev' into feature/ucs-cleanup
ThomasSession May 21, 2025
0589e2f
Sharing logic for group leave confirmation
ThomasSession May 21, 2025
e3a9436
Fix reactions being put into wrong messages (#1185)
SessionHero01 May 21, 2025
4415233
Making sure the latest edited name is used in dialog
ThomasSession May 21, 2025
8308d56
Added padding
ThomasSession May 21, 2025
19e8371
Proper group access
ThomasSession May 21, 2025
695bff0
Change more message querying to using messageId (#1171)
SessionHero01 May 21, 2025
59fc3f6
Removing unneeded code
ThomasSession May 21, 2025
faaca78
Merge branch 'dev' into feature/ucs-cleanup
ThomasSession May 21, 2025
e8004a8
Merge pull request #1186 from session-foundation/feature/ucs-cleanup
ThomasSession May 21, 2025
8024dc4
Added subproject support for libsession-util-android development (#1187)
SessionHero01 May 21, 2025
a6c1d28
Replace signing/verify with libsession-util (#1188)
SessionHero01 May 21, 2025
f8c0174
Remove scroll animation when opening an image from the conversation
ThomasSession May 21, 2025
43b96a9
Encryption/decryption with libsession-util (#1189)
SessionHero01 May 21, 2025
64db965
Cleaning up edge to edge on some screens
ThomasSession May 22, 2025
1a9a3c3
Fix unable to react on community messages (#1193)
SessionHero01 May 22, 2025
3a36327
Final push to remove libsodium (#1192)
SessionHero01 May 23, 2025
949cc5c
SES-192 - Share contact list clean up
ThomasSession May 23, 2025
f6125b6
Using alias for readability
ThomasSession May 23, 2025
bdf384b
Merge branch 'dev' into feature/backlog-grooming-pt1
ThomasSession May 23, 2025
5a82223
Merge pull request #1196 from session-foundation/feature/backlog-groo…
ThomasSession May 23, 2025
c3625c2
Tweaks to message long press UI
ThomasSession May 26, 2025
632a5f1
Removing unused MESSAGE_TYPE for mms table
ThomasSession May 26, 2025
6042673
Making sure communities do not handle disappearing messages
ThomasSession May 26, 2025
ce1bc2a
16k memory page-size support (#1197)
SessionHero01 May 26, 2025
2a7fa53
Hide input for blinded recipients that have not given message request…
ThomasSession May 26, 2025
55ad6a6
Missing QA tag
ThomasSession May 26, 2025
aede7a0
Fixed input padding
ThomasSession May 26, 2025
c21e785
Merge branch 'dev' into feature/backlog-grooming-pt2
ThomasSession May 26, 2025
381a303
Merge pull request #1199 from session-foundation/feature/backlog-groo…
ThomasSession May 26, 2025
39d4fcf
Modified the inputbar to cater more easily to the various states it c…
ThomasSession May 26, 2025
c053ac4
[Automated] Update translations from Crowdin
ThomasSession May 27, 2025
0cdffd7
Merge pull request #1201 from session-foundation/feature/update-crowd…
ThomasSession May 27, 2025
22fa452
Merge branch 'dev' into feature/conversation-input-state
ThomasSession May 27, 2025
f61df75
Proper string and hide calls for non approved contacts
ThomasSession May 27, 2025
ea8a145
real string
ThomasSession May 27, 2025
363941e
Fixed ripple on avatar
ThomasSession May 27, 2025
290836e
Merge pull request #1203 from session-foundation/feature/conversation…
ThomasSession May 27, 2025
29e2c5e
[Automated] Update translations from Crowdin
ThomasSession May 27, 2025
87abf00
Merge pull request #1204 from session-foundation/feature/update-crowd…
ThomasSession May 27, 2025
7db26b0
SES-3845 - delete contact when deleting message request
ThomasSession May 27, 2025
4705cae
SES-3852 - delete contact from conversation list item long press
ThomasSession May 28, 2025
d4e4485
SES-2547 - filter out communities without write access from share menu
ThomasSession May 28, 2025
1c47ad4
Rename
ThomasSession May 28, 2025
6af68b4
Merge pull request #1205 from session-foundation/feature/backlog-groo…
ThomasSession May 28, 2025
a34d63f
Fixing community long press
ThomasSession May 28, 2025
c0151e3
Extra debug options for new notification screen
ThomasSession May 28, 2025
5818a39
Only for non prod builds...
ThomasSession May 28, 2025
2303369
Merge pull request #1207 from session-foundation/feature/extra-debug-…
ThomasSession May 28, 2025
7e62bac
[SES-3538] - Clean up community related classes (#1208)
SessionHero01 May 28, 2025
89f4ee8
[SES-383] - Fix voice message duration issue (#1200)
SessionHero01 May 29, 2025
d93239d
Merge branch 'dev' into release/1.25.0
ThomasSession May 29, 2025
cc09df0
Version bump
ThomasSession May 29, 2025
dbb25b1
Fixing clear icon size in textfield and adding clear to UCS dialogs
ThomasSession May 29, 2025
cd7fe19
Limiting fullscreen avatars to singular custom images
ThomasSession May 29, 2025
93ea8a8
Fixing expandable text's logic
ThomasSession May 29, 2025
57a3d93
Merge pull request #1210 from session-foundation/fix/ucs-updates
ThomasSession May 29, 2025
8980e32
Disabling 'Set' button when picking existing expiry mode
ThomasSession May 30, 2025
234d9d5
Fixed tests
ThomasSession May 30, 2025
36b6ac5
Merge pull request #1211 from session-foundation/fix/disappearing-mes…
ThomasSession May 30, 2025
cb859f0
Donate button
ThomasSession Jun 1, 2025
391fcbe
Fixed notification settings logic
ThomasSession Jun 1, 2025
47a6d46
[Automated] Update translations from Crowdin
ThomasSession Jun 1, 2025
d786543
Proper crowdin string
ThomasSession Jun 1, 2025
875201b
Merge pull request #1218 from session-foundation/feature/donations
ThomasSession Jun 1, 2025
867408a
Adapt options to blocked state
ThomasSession Jun 2, 2025
00937b4
Long pressing a message when blocked should show the unblock dialog
ThomasSession Jun 2, 2025
a4edd74
Merge pull request #1219 from session-foundation/feature/blocked-user…
ThomasSession Jun 2, 2025
020ceff
QA-1714 - Showing the appropirate messaging when messaging a blinded …
ThomasSession Jun 2, 2025
3a376eb
Merge pull request #1220 from session-foundation/fix/blinded-message-…
ThomasSession Jun 2, 2025
1bd1bd8
SES-3870 - keep microphone while backgrounded
ThomasSession Jun 2, 2025
4e17af9
Merge pull request #1221 from session-foundation/fix/background-mic
ThomasSession Jun 2, 2025
0443934
Updated donation URL
ThomasSession Jun 3, 2025
0a1cd1f
Merge pull request #1224 from session-foundation/feature/updated-dona…
ThomasSession Jun 3, 2025
d5ab74c
SES-3876 and SES-3877
ThomasSession Jun 3, 2025
78674d4
Merge pull request #1225 from session-foundation/feature/qa-fixes
ThomasSession Jun 3, 2025
cb8f0f9
Merge branch 'release/1.25.0' into merge/1.24.1_into_1.25.0
ThomasSession Jun 4, 2025
3f654a7
Bumping versoin number after 1.24.1
ThomasSession Jun 4, 2025
2873062
Merge pull request #1230 from session-foundation/merge/1.24.1_into_1.…
ThomasSession Jun 4, 2025
8e5bdee
Bringing in the 1.24.1 fixes
ThomasSession Jun 5, 2025
325ad32
Making sure we have the right destination for inferred mime types
ThomasSession Jun 10, 2025
f5a2e39
Finishing activity in case of cursor error in the media preview
ThomasSession Jun 10, 2025
8fcfaa4
Add log
ThomasSession Jun 10, 2025
cbaae4b
Merge pull request #1236 from session-foundation/fix/store-crashes
ThomasSession Jun 10, 2025
f0504ee
Fixing "new message" fragments animation
ThomasSession Jun 11, 2025
0b3ed9d
[SES-3896] - Poller refactoring (#1238)
SessionHero01 Jun 11, 2025
a656dcd
Merge remote-tracking branch 'origin/master' into release/1.25.0
SessionHero01 Jun 12, 2025
537fa1c
Merge branch 'release/1.25.0' into fixes/qa-issues
ThomasSession Jun 16, 2025
3622998
SES-3938 - unblock modal when calling
ThomasSession Jun 16, 2025
33fcb57
SES-3914 - Avatar text should always be white
ThomasSession Jun 16, 2025
ed0d172
SES-3915 make sure the group name isn't empty while changing the desc…
ThomasSession Jun 16, 2025
b4d7f50
SES-3921 - only make room for scrollbar in expanded text when requried
ThomasSession Jun 16, 2025
4d96bdb
SES-3930 - allowing empty descirption so that they can be cleared
ThomasSession Jun 16, 2025
59aa407
SES-3926 - proper validation for group description
ThomasSession Jun 16, 2025
367fbda
SES-3916 - default community icon
ThomasSession Jun 16, 2025
53067bf
SES-3917 - dialog copy fixes
ThomasSession Jun 16, 2025
08d235e
Tweaking unknown color
ThomasSession Jun 16, 2025
c1b3866
SES-3920 - new delete copy for dialog
ThomasSession Jun 16, 2025
0035395
SES-3918 no config sync for non standdard contacts
ThomasSession Jun 16, 2025
a59edbc
Deleting legacy group code
ThomasSession Jun 16, 2025
fa894b9
SES-3924 - Invite button text and qa tag
ThomasSession Jun 16, 2025
594f2cf
SES-3925 - hide avatar for outgoing message requests
ThomasSession Jun 16, 2025
ad3a5c9
SES-3932 - fixing search and inputbar's view relationship
ThomasSession Jun 17, 2025
93ff31c
Fixed avatar display logic
ThomasSession Jun 17, 2025
02c6746
SES-3927 - empty search result UI for invite and create group
ThomasSession Jun 17, 2025
4b4623b
SES-3947 - off label in DM
ThomasSession Jun 17, 2025
5f813a3
SES-3946 - update app bar data on recipient changes
ThomasSession Jun 17, 2025
2c5ce97
SES-3948 - removing min width on seed recovery button
ThomasSession Jun 17, 2025
9114e78
Added the ability to mark items as disabled
ThomasSession Jun 17, 2025
fa0a8da
SES-3937 - fixing home page toolbar in RTL
ThomasSession Jun 17, 2025
0298c1c
SES-3941 - plural clear messages toast
ThomasSession Jun 17, 2025
7aa47a5
SES-3935 - nts text
ThomasSession Jun 17, 2025
935d511
SES-3933 - maintain search state in appbar
ThomasSession Jun 17, 2025
4dfdd73
crowdin strings
ThomasSession Jun 17, 2025
303a2d7
Merge pull request #1245 from session-foundation/fixes/qa-issues
ThomasSession Jun 17, 2025
7fe83a5
Updated block icon
ThomasSession Jun 17, 2025
179013f
Updated the block icon throughout
ThomasSession Jun 18, 2025
39be680
SES-3934 - fixed account type check
ThomasSession Jun 18, 2025
54993f9
SES-3922 - fixing community message invites as message id was missing…
ThomasSession Jun 18, 2025
9699628
SES-3928 - rechecking notification state on resume in both conversati…
ThomasSession Jun 18, 2025
9397929
Only show member count when the recipient is approved (#1251)
SessionHero01 Jun 18, 2025
0e79bff
Removed logs
ThomasSession Jun 18, 2025
5fd0703
Merge pull request #1249 from session-foundation/fix/qa-fixes-pt2
ThomasSession Jun 18, 2025
7599b25
SES-3944 - fixed NTS title in attachments
ThomasSession Jun 18, 2025
f05447b
force rebuild
ThomasSession Jun 18, 2025
84cadb2
Remove unnecessary log
SessionHero01 Jun 19, 2025
1969999
SES-3988 and SES-3990: Removed the red blocked banner and made the in…
ThomasSession Jun 19, 2025
ec286db
Merge pull request #1253 from session-foundation/fix/qa-pt3
ThomasSession Jun 19, 2025
cd6387a
updated QA tags
ThomasSession Jun 20, 2025
b64d32a
Added missing qa tag
ThomasSession Jun 20, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
12 changes: 6 additions & 6 deletions .drone.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ local ci_dep_mirror(want_mirror) = (if want_mirror then ' -DLOCAL_MIRROR=https:/
environment: { ANDROID_HOME: '/usr/lib/android-sdk' },
commands: [
'apt-get update --allow-releaseinfo-change',
'apt-get install -y ninja-build openjdk-17-jdk',
'update-java-alternatives -s java-1.17.0-openjdk-amd64',
'apt-get install -y ninja-build openjdk-21-jdk',
'update-java-alternatives -s java-1.21.0-openjdk-amd64',
'./gradlew testPlayDebugUnitTestCoverageReport'
],
}
Expand Down Expand Up @@ -81,10 +81,10 @@ local ci_dep_mirror(want_mirror) = (if want_mirror then ' -DLOCAL_MIRROR=https:/
environment: { SSH_KEY: { from_secret: 'SSH_KEY' }, ANDROID_HOME: '/usr/lib/android-sdk' },
commands: [
'apt-get update --allow-releaseinfo-change',
'apt-get install -y ninja-build openjdk-17-jdk',
'update-java-alternatives -s java-1.17.0-openjdk-amd64',
'./gradlew assemblePlayDebug assembleWebsiteDebug',
'./gradlew -Phuawei=1 assembleHuaweiDebug',
'apt-get install -y ninja-build openjdk-21-jdk',
'update-java-alternatives -s java-1.21.0-openjdk-amd64',
'./gradlew --no-daemon assemblePlayDebug assembleWebsiteDebug',
'./gradlew --no-daemon -Phuawei=1 assembleHuaweiDebug',
'./scripts/drone-static-upload.sh'
],
}
Expand Down
11 changes: 11 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
version: 2
updates:
- package-ecosystem: gradle
directory: "/"
schedule:
interval: weekly

- package-ecosystem: github-actions
directory: "/"
schedule:
interval: weekly
4 changes: 2 additions & 2 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ jobs:
- uses: actions/checkout@v4
with:
submodules: 'recursive'
- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: '17'
java-version: '21'

- name: Build and test with Gradle
id: build
Expand Down
Loading