Commit Graph

31 Commits

Author SHA1 Message Date
SpiritCroc fa48365aaa Fix fdroid changelog generation
May still be broken for split ABI, but at least works again for
universal apk now

Change-Id: Ib04b56effc23cb05645040f8981d6b0e23188495
2023-07-26 15:14:19 +02:00
SpiritCroc 92e9d9e747 Enable split ABI support
https://github.com/SchildiChat/SchildiChat-android/issues/183

Change-Id: Ia8eff01c973d365d6d4a4390153f23510ab77e0e
2023-07-21 15:10:01 +02:00
SpiritCroc dab8f0b51c increment_version.sh: weblate now auto-pushes, no need to manage here
Change-Id: I1d671cc682e02c9e8bc29634471ac18c2e41c112
2023-04-01 11:23:33 +02:00
SpiritCroc 791766dce2 pre_merge.sh: tag last pre-merge commit
Change-Id: Iaf7ffada4c7cc77b85547e7b3c64aaa96e80b64b
2022-11-18 15:13:36 +01:00
SpiritCroc bc1f3cb24d Merge tag 'v1.4.36' into merge-v1.4.36
Change-Id: I6fa1182a07b7b8ad507124fad3a8971ac38f2ac5

Conflicts:
	library/ui-strings/src/main/res/values-bg/strings_sc.xml
	library/ui-strings/src/main/res/values-cs/strings_sc.xml
	library/ui-strings/src/main/res/values-de/strings_sc.xml
	library/ui-strings/src/main/res/values-de/strings_sc_donottranslate.xml
	library/ui-strings/src/main/res/values-es/strings_sc.xml
	library/ui-strings/src/main/res/values-et/strings_sc.xml
	library/ui-strings/src/main/res/values-eu/strings_sc.xml
	library/ui-strings/src/main/res/values-fa/strings_sc.xml
	library/ui-strings/src/main/res/values-fr/strings_sc.xml
	library/ui-strings/src/main/res/values-hu/strings_sc.xml
	library/ui-strings/src/main/res/values-it/strings_sc.xml
	library/ui-strings/src/main/res/values-nb-rNO/strings_sc.xml
	library/ui-strings/src/main/res/values-nl/strings_sc.xml
	library/ui-strings/src/main/res/values-pl/strings_sc.xml
	library/ui-strings/src/main/res/values-pt-rBR/strings_sc.xml
	library/ui-strings/src/main/res/values-ro/strings_sc.xml
	library/ui-strings/src/main/res/values-ru/strings_sc.xml
	library/ui-strings/src/main/res/values-sk/strings_sc.xml
	library/ui-strings/src/main/res/values-sv/strings_sc.xml
	library/ui-strings/src/main/res/values-tr/strings_sc.xml
	library/ui-strings/src/main/res/values-vi/strings_sc.xml
	library/ui-strings/src/main/res/values-zh-rCN/strings_sc.xml
	library/ui-strings/src/main/res/values-zh-rTW/strings_sc.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncResponseHandler.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
	vector-app/src/main/res/mipmap-anydpi-v26/ic_launcher_sc.xml
	vector-app/src/main/res/mipmap-hdpi/ic_launcher_foreground_sc.png
	vector-app/src/main/res/mipmap-hdpi/ic_launcher_sc.png
	vector-app/src/main/res/mipmap-mdpi/ic_launcher_foreground_sc.png
	vector-app/src/main/res/mipmap-mdpi/ic_launcher_sc.png
	vector-app/src/main/res/mipmap-xhdpi/ic_launcher_foreground_sc.png
	vector-app/src/main/res/mipmap-xhdpi/ic_launcher_sc.png
	vector-app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground_sc.png
	vector-app/src/main/res/mipmap-xxhdpi/ic_launcher_sc.png
	vector-app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground_sc.png
	vector-app/src/main/res/mipmap-xxxhdpi/ic_launcher_sc.png
	vector/build.gradle
	vector/src/fdroid/java/im/vector/app/fdroid/receiver/KeepInternalDistributor.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt
	vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
	vector/src/main/java/im/vector/app/core/pushers/KeepInternalDistributor.kt
	vector/src/main/java/im/vector/app/core/pushers/VectorPushHandler.kt
	vector/src/main/java/im/vector/app/core/receiver/KeepInternalDistributor.kt
	vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt
	vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.kt
	vector/src/main/java/im/vector/app/features/grouplist/NewHomeSpaceSummaryItem.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/breadcrumbs/BreadcrumbsItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomCategoryItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt
	vector/src/main/java/im/vector/app/features/home/room/list/UnreadCounterBadgeView.kt
	vector/src/main/java/im/vector/app/features/home/room/list/home/recent/RecentRoomItem.kt
	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
	vector/src/main/java/im/vector/app/features/permalink/PermalinkHandler.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsAdvancedSettingsFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
	vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryController.kt
	vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryItem.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryItem.kt
	vector/src/main/java/im/vector/app/features/spaces/SubSpaceSummaryItem.kt
	vector/src/main/res/xml/vector_settings_labs.xml
	vector/src/main/res/xml/vector_settings_preferences.xml
2022-09-10 15:24:40 +02:00
SpiritCroc 85562dd995 increment_version.sh: Update sm template variant for betas
Change-Id: Ifdce2c629aff4de7d1c6225ad4f155ccb4e94d2d
2022-08-10 12:39:53 +02:00
SpiritCroc 884568cbeb increment_version.sh: exclude [gplay-release] changes
Change-Id: I3084d1c9ee997be4b21de22f77075c59cf0aa7b7
2022-08-09 17:06:15 +02:00
SpiritCroc 8c414b48d9 increment_version.sh: also exclude .md changes from changelog
Change-Id: I20454009a9a078239f279170618debbabbec5d84
2022-05-18 10:21:16 +02:00
SpiritCroc a9bace959b increment_version.sh: fix some "Update codebase" cases
Change-Id: I294c4818345dd062013847ab98b0cb0e296560ac
2022-03-31 09:21:15 +02:00
SpiritCroc ccb49c6c70 increment_version.sh: Exclude more merge-related commits
Change-Id: If9093f1cc195afcc68a694bb6716691875badb8d
2022-03-02 16:14:22 +01:00
SpiritCroc 99dabf7235 Update increment_version.sh
Change-Id: I82e8844f0bff14b3b31563499caec171d1033f76
2021-10-22 11:16:15 +02:00
SpiritCroc 540dd5b778 increment_version.sh: do not always update translations
Change-Id: Ia6257e15e50287eeffe1dcdf4bf9dcc11f8418e9
2021-08-20 09:45:42 +02:00
SpiritCroc b58f9cedbd increment_version.sh: Exclude more merge commits from changelog
Change-Id: Iaaeccb73d0c4b0256b4c7211c3153a639a77eaf7
2021-08-02 13:59:41 +02:00
SpiritCroc 899168e84c increment_version.sh: Exclude merge-specific changes from changelog
Change-Id: I8ec4f78b129efc63613f3881975f9738ac463eb6
2021-08-01 09:39:49 +02:00
SpiritCroc a5db52fe62 increment_version.sh: exclude "Merge branch" lines
Change-Id: I392d38c5408e7e3e1d76baffda246106536c5912
2021-07-19 16:50:32 +02:00
SpiritCroc e985d18df6 increment_version.sh: Fix for empty changelog
Change-Id: Ic3a2a789b73a7a4c672c1edf9632bcd15f37b01e
2021-07-16 13:26:21 +02:00
SpiritCroc ce03789c1a increment_version.sh: Update translation before
Change-Id: I74953d63d3a944640a62923ba0f1bd6ff02ef859
2021-07-16 12:33:26 +02:00
SpiritCroc e76245b278 increment_version.sh: Exclude translation updates
Change-Id: I6a47969a242ec3dbff3e61ace1dcd51ea2a493df
2021-06-04 11:30:11 +02:00
SpiritCroc f4d0993a2b Enable semi-automatic correct_strings.sh-patching
Change-Id: I072f2ff71e862a1a140c8879754669f7231745c2
2021-02-21 10:35:55 +01:00
SpiritCroc 44fcc2c89c Changelog improvement, with respect to maximum length
Change-Id: I6d8845c53adaa7346b81ba5539eed929ef63ca7f
2021-01-17 10:25:24 +01:00
SpiritCroc 92d799ea5a Automated changelog: just link to github for automated builds
Change-Id: I5aa98f07a6c2053fe263d26f9d2265fb2193afef
2021-01-16 18:59:42 +01:00
SpiritCroc 9687bacd9a increment_version: Ensure higher version code than previous test builds
Change-Id: Ia48c13930ca1a26b43a4bb71fd642e0d7d139b60
2021-01-16 18:51:51 +01:00
SpiritCroc 6652ed9a1f Small versioning rework
- Remove the second dot in upstream_version.sc.scVersion
    - Reason: some programs linkify upstream_version.sc
- Always increment scVersion
    - Reason: Easier to identify unique SchildiChat versions
- Increment versionCode independently from versionName
    - Reason: version codes are limitted, don't waste them!
        - ok, it's unlikely that we'll reach the limit either way...
- Unique versionName for test versions (as long as used correctly)!

Change-Id: I7464d27255d55c4b5d51c08fb51e7692d3a24d1f
2021-01-16 11:54:08 +01:00
SpiritCroc 89c8c86ec0 Make automated changelog shorter: F-Droid has a character limit here
Change-Id: I096745f1d80d4aed764f8402842c1c5874a47464
2020-12-22 14:30:45 +01:00
SpiritCroc 11ef70d495 increment_version: improve automatic changelog
Change-Id: I532751e7650145f8c2aaef42b1a1dbe9468dd013
2020-12-20 09:25:13 +01:00
SpiritCroc 4a483986f0 increment_version.sh: Add preview mode
Change-Id: Icc7169e4abdc289ed60884b3ed6aec74c37d19d1
2020-11-05 15:48:16 +01:00
SpiritCroc d245af4d9c increment_version.sh: Add possibility for test releases
Change-Id: I1ae628b56d0d2f49373cf507815f5efa3a881208
2020-11-05 15:10:10 +01:00
SpiritCroc 6844c71987 increment_version.sh: No sc version change required for upstream merges
Change-Id: I55e414902a232426e0af48911183f7f267cc3419
2020-11-05 15:03:13 +01:00
SpiritCroc ad70208d7c Revert "increment_version.sh: Tag pre-release"
F-Droid update scanner seems to pick it up either way...

This reverts commit cc2d95f0dd.
2020-09-30 10:52:45 +02:00
SpiritCroc cc2d95f0dd increment_version.sh: Tag pre-release
Change-Id: I2c1c34f54c2b259235c70a6ff18d77374365a431
2020-09-22 10:21:24 +02:00
SpiritCroc 91c7e39d50 Add increment_version.sh
Change-Id: Id52547142003e34a68645655835b842cab19a869
2020-09-10 11:33:20 +02:00