Commit Graph

265 Commits

Author SHA1 Message Date
LucasGGamerM e2c62aa76b Merge remote-tracking branch 'megalodon_main/main'
# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
#	mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetAccountByHandle.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BaseAccountListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/FollowerListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/FollowingListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/PaginatedAccountListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/model/Account.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/text/ClickableLinksDelegate.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
#	mastodon/src/main/res/layout/display_item_footer.xml
#	mastodon/src/main/res/values/dimens.xml
2023-06-09 18:09:23 -03:00
LucasGGamerM 16ee7371e7
build: make nightly builds not debuggable 2023-06-06 16:52:35 -03:00
sk ad13b1e927 bump version 2023-06-06 17:13:30 +02:00
sk 1db4b1319e use latest appkit version 2023-06-04 23:26:39 +02:00
sk 4baaa39f35 bump version 2023-06-04 23:16:32 +02:00
LucasGGamerM 3a73dbf304 build(nightly): make nightly builds debuggable and not resource shrinked 2023-06-04 11:23:52 -03:00
sk e04fd8a004 bump version 2023-06-02 19:10:08 +02:00
sk 1ce49c68fe bump version 2023-06-02 01:45:55 +02:00
sk e12c0fb81f bump version 2023-06-01 18:10:30 +02:00
sk 24977ec613 bump version 2023-05-29 13:03:18 +02:00
sk ab7489a049 bump version 2023-05-26 02:37:32 +02:00
sk 961c69b525 Merge remote-tracking branch 'upstream/master' 2023-05-13 15:15:00 +02:00
Grishka 33cbd85e19 Bump version 2023-05-11 05:42:40 +03:00
LucasGGamerM 9d09a904ab build: fixing debug build with wrong resources 2023-04-29 16:38:14 -03:00
LucasGGamerM c047c53aac build: bumping version name from 1.2.0 to 1.3.0
I forgot to do it
2023-04-28 16:05:12 -03:00
LucasGGamerM 489a49ca40 build: bump version number 2023-04-28 15:53:46 -03:00
LucasGGamerM 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
r3g_5z 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
sk c9bcd000c3 update gradle 2023-04-22 16:49:42 +02:00
sk b6186a349f update gradle 2023-04-20 16:03:57 +02:00
LucasGGamerM 0c6efac46a build: re-enable releases resource shrinking 2023-04-15 10:46:16 -03:00
LucasGGamerM 3df62d2516 Revert "refactor: make nightly build debuggable "
This reverts commit ee18236ec8.
2023-04-14 13:35:49 -03:00
LucasGGamerM ee18236ec8
refactor: make nightly build debuggable
This is a temporary thing, as for now there is a bug (on theme change crash) that I just cannot reproduce on local builds. Making the nightly build debuggable for now will help debug this problem.
2023-04-14 10:46:19 -03:00
sk 3ad46926f1 Merge remote-tracking branch 'upstream/master' 2023-04-13 21:46:45 +02:00
Grishka 4ef18f1f4a Add touch interaction for the SplashFragment art 2023-04-12 19:20:23 +03:00
LucasGGamerM f39690b7e5
Merge pull request #160 from FineFindus/fix/sign-in-flow
fix: use BuilType defined REDIRECT_URI
2023-04-10 07:34:19 -03:00
FineFindus a59587eb62
fix(auth): use BuildType depended redirect uri 2023-04-09 15:46:30 +02:00
LucasGGamerM fe21a95766 fix: wrong property name in build.gradle 2023-04-08 21:09:43 -03:00
LucasGGamerM 1698a32d75 chore: tweak build.gradle to check properties for current date
Check the local.properties file for date in case its null. This should be useful for testing the new nightly updater
2023-04-08 20:58:23 -03:00
LucasGGamerM 1e54b21842 fix: gradle not compiling on nightly build 2023-04-08 20:39:43 -03:00
LucasGGamerM 828617f7d7 feat: change nightly release versionName 2023-04-08 20:22:12 -03:00
Grishka d93d66f702 Prepare new release 2023-04-09 01:59:13 +03:00
LucasGGamerM 325d962bbb chore: update build.gradle for easier testing of nightly release 2023-04-07 19:13:06 -03:00
Grishka 915b0603d0 Reblog -> boost 2023-04-07 22:42:16 +03:00
sk f6279fcc0c Merge branch 'l10n_fr' of codeberg.org:butterflyoffire/megalodon 2023-04-06 20:08:46 +02:00
LucasGGamerM eacaf214e8 chore: debugging the signing process for nightly 2023-04-02 13:14:14 -03:00
LucasGGamerM 1369756e1e chore maybe fixing this again 2023-04-02 12:26:19 -03:00
LucasGGamerM 80931b8948 chore: debugging the issue with github actions 2023-04-02 12:13:57 -03:00
LucasGGamerM 1287dff879 refactor: changing back the location of the keystore
This is bullshit. Why is this not working?
2023-04-02 11:56:06 -03:00
LucasGGamerM 9578b139a9 Revert "refactor: build.gradle tinkering"
This reverts commit 4299e15ad2.
2023-04-01 21:27:11 -03:00
LucasGGamerM 4299e15ad2 refactor: build.gradle tinkering
Work plz i want to sleep
2023-04-01 21:24:19 -03:00
LucasGGamerM 32bfdd231a refactor: changing signing key location
Why am I doing this to myself?
2023-04-01 21:19:57 -03:00
LucasGGamerM e7967eadc5 feat: using proper signing config for nightly flavor 2023-04-01 21:06:46 -03:00
LucasGGamerM 3d834a0c44 fix: maybe fixing gradle build error on nightly build
Github actions is such a pain
2023-04-01 21:00:30 -03:00
LucasGGamerM 35dcc44fe8 Revert "feat: add build.gradle parameters for nightly builds"
This reverts commit 14775aeb67.
2023-04-01 20:57:18 -03:00
LucasGGamerM 14775aeb67 feat: add build.gradle parameters for nightly builds 2023-04-01 20:38:51 -03:00
LucasGGamerM 72e0a9c32e feat: make nightly builds require signing 2023-04-01 16:32:15 -03:00
LucasGGamerM 5ec762ac0d feat: add nightly flavor to the app 2023-03-30 14:20:10 -03:00
sk 6c44575f7a bump version 2023-03-24 20:04:35 +01:00
sk 244c5dc6b4 bump version 2023-03-24 19:58:10 +01:00