5b391b44d3
Merge remote-tracking branch 'megalodon_main/main'
...
# Conflicts:
# mastodon/build.gradle
# mastodon/src/github/AndroidManifest.xml
# mastodon/src/main/res/values-de-rDE/strings_sk.xml
# mastodon/src/main/res/values-es-rES/strings_sk.xml
# mastodon/src/main/res/values-eu-rES/strings_sk.xml
# mastodon/src/main/res/values-ko-rKR/strings_sk.xml
# mastodon/src/main/res/values-pl-rPL/strings_sk.xml
# mastodon/src/main/res/values-uk-rUA/strings_sk.xml
# metadata/es/changelogs/83.txt
# metadata/fr/short_description.txt
# metadata/gl-ES/changelogs/83.txt
2023-04-22 13:53:50 -03:00
226e2a7cdc
Minor maintenance things ( #501 )
...
* validate gradle wrapper jar file
this is extremely important. see the following:
https://blog.gradle.org/wrapper-attack-report
https://github.com/gradle/wrapper-validation-action#the-gradle-wrapper-problem-in-open-source
Signed-off-by: r3g_5z <june@girlboss.ceo>
* update gradle wrapper to 8.1.1
it is necessary to run the gradlew update command twice to actually
update the jar file properly, e.g.:
./gradlew wrapper --gradle-version=8.1.1 --gradle-distribution-sha256-sum=e111cb9948407e26351227dabce49822fb88c37ee72f1d1582a69c68af2e702f
./gradlew wrapper --gradle-version=8.1.1 --gradle-distribution-sha256-sum=e111cb9948407e26351227dabce49822fb88c37ee72f1d1582a69c68af2e702f
Signed-off-by: r3g_5z <june@girlboss.ceo>
* use Gradle toolchain
this allows for better build reproducibility and avoid mix and matching
JDKs from other projects
https://docs.gradle.org/current/userguide/toolchains.html
Signed-off-by: r3g_5z <june@girlboss.ceo>
* update dependencies and fix build errors
Signed-off-by: r3g_5z <june@girlboss.ceo>
---------
Signed-off-by: r3g_5z <june@girlboss.ceo>
Co-authored-by: sk22 <sk22@mailbox.org>
2023-04-22 17:28:16 +02:00
ef4422828b
chore: readd cache
2023-04-14 14:25:59 -03:00
002fc0897c
chore: remove cache on workflow builds
...
This is for maybe making it work again
2023-04-14 14:16:08 -03:00
0a21c90efa
chore: change to coretto java distribution on workflow
2023-04-14 14:06:19 -03:00
88f498409f
chore: refactor deprecated action
2023-04-10 07:57:59 -03:00
6f3cb14dc9
chore: adding CURRENT_DATE environment variable to workflow
2023-04-08 21:00:55 -03:00
7da2c06670
chore: remove on PR nightly build
2023-04-05 15:11:27 -03:00
6f52e5de76
chore: change nightly builds action name
2023-04-03 09:30:05 -03:00
f329f7a241
feat: provide apk instead of zip in nightly builds
2023-04-03 09:28:50 -03:00
1c0b62ac30
chore: still debugging the signing issue
2023-04-02 13:27:29 -03:00
167597bc9f
chore: still in the process of fixing github actions
2023-04-02 12:07:41 -03:00
93dcc12f8d
chore: trying to fix android.yml
...
I forgot that chore is the keyword for this stuff
2023-04-02 12:02:42 -03:00
05b2d603f1
fix: maybe fix nightly builds again
...
Whyyyyyyy
2023-04-01 21:15:19 -03:00
75161fc694
feat: add proper nightly signing to android.yml
2023-04-01 20:40:10 -03:00
5979341fb9
Update android.yml
2023-04-01 18:23:46 -03:00
d86509233f
fix: maybe fix the signing process
2023-04-01 18:18:36 -03:00
d6d45cd9a5
Update android.yml
2023-04-01 18:15:06 -03:00
21e940c94d
fx: maybe fix the error on nightly builds
2023-04-01 18:00:36 -03:00
f3ad600c94
feat: add signing key to the nightly build
2023-04-01 17:58:13 -03:00
44509bb274
feat: change Android CI to Nightly Builds
...
This is in android.yml in github workflows
2023-03-31 20:37:07 -03:00
9f8f7adb26
Revert "refactor: removing name from release"
...
This reverts commit c2341070f5
2023-03-31 20:30:17 -03:00
c2341070f5
refactor: removing name from release
2023-03-31 20:26:35 -03:00
20af9eb6f4
fix: syntax error
2023-03-31 20:23:06 -03:00
36bb1ea8af
feat: add nightly download button
...
I have no idea if it will work, but hopefully it does!
2023-03-31 20:21:43 -03:00
ebb3f3c5ae
feat: add on push build workflow
2023-03-31 16:21:14 -03:00
affd69c577
Updating bug report template
2023-02-10 21:06:39 -03:00
f07e0906dd
Merge branch 'main'
...
# Conflicts:
# README.md
# mastodon/build.gradle
# mastodon/src/github/java/org/joinmastodon/android/updater/GithubSelfUpdaterImpl.java
# mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
# mastodon/src/main/java/org/joinmastodon/android/MainActivity.java
# mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
# mastodon/src/main/java/org/joinmastodon/android/api/requests/notifications/DismissNotification.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/PinnableStatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ScheduledStatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/StatusEditHistoryFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/LocalTimelineFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/AccountActivationFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/CustomWelcomeFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceRulesFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/SignupFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportAddPostsChoiceFragment.java
# mastodon/src/main/java/org/joinmastodon/android/model/TranslatedStatus.java
# mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java
# mastodon/src/main/java/org/joinmastodon/android/ui/M3AlertDialogBuilder.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/LinkCardStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PhotoStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/text/ClickableLinksDelegate.java
# mastodon/src/main/java/org/joinmastodon/android/ui/text/LinkSpan.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/ColorPalette.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
# mastodon/src/main/java/org/joinmastodon/android/utils/StatusFilterPredicate.java
# mastodon/src/main/res/color/button_bg_secondary_dark_on_light.xml
# mastodon/src/main/res/color/button_text_primary_light_on_dark.xml
# mastodon/src/main/res/drawable/ic_fluent_arrow_forward_24_regular.xml
# mastodon/src/main/res/drawable/ic_fluent_arrow_repeat_all_24_very_filled.xml
# mastodon/src/main/res/drawable/ic_fluent_chat_24_filled.xml
# mastodon/src/main/res/drawable/ic_fluent_chat_multiple_24_regular_text.xml
# mastodon/src/main/res/drawable/ic_fluent_eye_24_regular.xml
# mastodon/src/main/res/drawable/ic_fluent_send_24_regular.xml
# mastodon/src/main/res/drawable/ic_fluent_translate_24_regular.xml
# mastodon/src/main/res/layout/compose_action.xml
# mastodon/src/main/res/layout/display_item_footer.xml
# mastodon/src/main/res/layout/fragment_compose.xml
# mastodon/src/main/res/layout/fragment_profile.xml
# mastodon/src/main/res/layout/header_welcome_custom.xml
# mastodon/src/main/res/layout/item_list_header_simple.xml
# mastodon/src/main/res/layout/item_settings_text.xml
# mastodon/src/main/res/layout/item_settings_update.xml
# mastodon/src/main/res/layout/item_text.xml
# mastodon/src/main/res/layout/recycler_fragment_with_fab.xml
# mastodon/src/main/res/menu/color_palettes.xml
# mastodon/src/main/res/menu/post.xml
# mastodon/src/main/res/menu/profile.xml
# mastodon/src/main/res/menu/profile_own.xml
# mastodon/src/main/res/values-fr-rFR/strings_sk.xml
# mastodon/src/main/res/values-in-rID/strings_sk.xml
# mastodon/src/main/res/values-pl-rPL/strings_sk.xml
# mastodon/src/main/res/values-ru-rRU/strings_sk.xml
# mastodon/src/main/res/values-uk-rUA/strings_sk.xml
# mastodon/src/main/res/values-v31/colors.xml
# mastodon/src/main/res/values/attrs.xml
# mastodon/src/main/res/values/colors.xml
# mastodon/src/main/res/values/ids.xml
# mastodon/src/main/res/values/palettes.xml
# mastodon/src/main/res/values/strings.xml
# mastodon/src/main/res/values/strings_sk.xml
# mastodon/src/main/res/values/styles.xml
# metadata/ca/changelogs/50.txt
# metadata/ca/changelogs/51.txt
# metadata/ca/full_description.txt
# metadata/de-DE/full_description.txt
# metadata/en-US/changelogs/50.txt
# metadata/en-US/changelogs/51.txt
# metadata/en-US/changelogs/56.txt
# metadata/en-US/full_description.txt
# metadata/en-US/images/phoneScreenshots/1.jpg
# metadata/en-US/images/phoneScreenshots/2.jpg
# metadata/en-US/images/phoneScreenshots/3.jpg
# metadata/en-US/images/phoneScreenshots/4.jpg
# metadata/en-US/images/phoneScreenshots/5.jpg
# metadata/en-US/images/phoneScreenshots/6.jpg
# metadata/en-US/short_description.txt
# metadata/en-US/title.txt
# metadata/es/changelogs/50.txt
# metadata/es/changelogs/51.txt
# metadata/es/full_description.txt
# metadata/fr-FR/full_description.txt
# metadata/gl-ES/short_description.txt
# metadata/gl-ES/title.txt
# metadata/id/full_description.txt
# metadata/nl-NL/short_description.txt
# metadata/nl-NL/title.txt
# metadata/pt-BR/full_description.txt
# metadata/sl/short_description.txt
# metadata/sl/title.txt
# metadata/sv/full_description.txt
2023-02-07 16:04:28 -03:00
187190c07e
update bug report template
2023-01-21 19:29:48 +01:00
58f79e06ef
Idk what these are, but testing commits
2023-01-05 21:16:03 -03:00
34ba4ceb16
Fixing #31
2023-01-04 21:28:06 -03:00
e1ca97f323
Update FUNDING.yml
2022-12-27 19:28:55 -03:00
b49159f9e0
Update issue templates
2022-11-29 23:06:04 +01:00
781332a7a9
Merge remote-tracking branch 'upstream/master' into fork
2022-11-23 22:01:37 +01:00
68a9eba868
Create FUNDING.yml
2022-07-30 18:22:09 +02:00
LucasGGamerM
r3g_5z
LucasGGamerM
sk
Poussinou