diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000000..63ab206bf2 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,5 @@ +**/.* +**/build.Containerfile +**/local.properties +**/build +**/*.iml diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index e4dfc8cd96..a2bde9a3ba 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -3,5 +3,5 @@ We love pull requests from everyone! Bug reports are also welcome. If you would like to contribute language translations, we prefer if you use our -[Transifex project](https://www.transifex.com/bitcoin-wallet/bitcoin-wallet/). Languages will be +[Transifex project](https://explore.transifex.com/bitcoin-wallet/bitcoin-wallet/). Languages will be synced from there regularly. diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6680364fc2..fc20e0720f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,19 +1,31 @@ variables: ANDROID_HOME: $PWD/android-sdk -before_script: - - apt-get update - -after_script: - - gradle --version +reference: + image: debian:bookworm-slim + before_script: + - apt-get update + - apt-get -y install ca-certificates buildah + # switch to iptables legacy, as GitLab CI doesn't support nftables + - apt-get -y install --no-install-recommends iptables + - update-alternatives --set iptables /usr/sbin/iptables-legacy + script: + - buildah build --file build.Containerfile --output build . + after_script: + - sha256sum build/* + artifacts: + name: bitcoin-wallet-$CI_JOB_NAME-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA + paths: + - build/** bullseye-jdk11: image: debian:bullseye-backports script: - - apt-get -y install openjdk-11-jdk-headless - - apt-get -y install sdkmanager gradle + - apt-get update + - apt-get -y install openjdk-11-jdk-headless gradle sdkmanager - yes | sdkmanager --licenses >/dev/null || true - gradle build --stacktrace + - gradle --version artifacts: name: groestlcoin-wallet-$CI_JOB_NAME-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA paths: @@ -22,10 +34,11 @@ bullseye-jdk11: bookworm-jdk17: image: debian:bookworm-slim script: - - apt-get -y install openjdk-17-jdk-headless - - apt-get -y install sdkmanager gradle + - apt-get update + - apt-get -y install openjdk-17-jdk-headless gradle sdkmanager - yes | sdkmanager --licenses >/dev/null || true - gradle build --stacktrace + - gradle --version artifacts: name: groestlcoin-wallet-$CI_JOB_NAME-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA paths: @@ -34,10 +47,11 @@ bookworm-jdk17: jammy-jdk11: image: ubuntu:jammy script: - - apt-get -y install openjdk-11-jdk-headless - - apt-get -y install sdkmanager gradle + - apt-get update + - apt-get -y install openjdk-11-jdk-headless gradle sdkmanager - yes | sdkmanager --licenses >/dev/null || true - gradle build --stacktrace + - gradle --version artifacts: name: groestlcoin-wallet-$CI_JOB_NAME-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA paths: @@ -46,10 +60,11 @@ jammy-jdk11: lunar-jdk17: image: ubuntu:lunar script: - - apt-get -y install openjdk-17-jdk-headless - - apt-get -y install sdkmanager gradle + - apt-get update + - apt-get -y install openjdk-17-jdk-headless gradle sdkmanager - yes | sdkmanager --licenses >/dev/null || true - gradle build --stacktrace + - gradle --version artifacts: name: groestlcoin-wallet-$CI_JOB_NAME-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA paths: diff --git a/README.md b/README.md index 5d53b96b9d..9d5709ee65 100644 --- a/README.md +++ b/README.md @@ -39,6 +39,19 @@ You can build all sub-projects in all flavors at once using Gradle: For details about building the wallet see the [specific README](wallet/README.md). + +### REPRODUCIBLE BUILD + +Alternatively, you can build using buildah: + + # each time + buildah build --cap-add sys_admin --device /dev/fuse --file build.Containerfile --output build/ . + +Access to FUSE and the SYS_ADMIN capability are needed for mounting disorderfs +in order to sort the directory entries of the project folder. + +The unsigned APKs are written to the specified output directory. + ### Stores * __Testnet__: F-Droid | diff --git a/build.Containerfile b/build.Containerfile new file mode 100644 index 0000000000..d9280fc4cd --- /dev/null +++ b/build.Containerfile @@ -0,0 +1,53 @@ +# +# Reproducible reference build +# +# Usage: +# +# docker build --file build.Containerfile --output . +# or +# podman build --file build.Containerfile --output . +# +# For improved reproducibility, the project directory entries can be ordered +# like this: +# +# buildah build --cap-add sys_admin --device /dev/fuse --file build.Containerfile --output . +# +# In any case, the unsigned APKs are written to the specified output +# directory. Use `apksigner` to sign before installing via `adb install`. +# + +FROM debian:bullseye-backports AS build-stage + +# install debian packages +ENV DEBIAN_FRONTEND noninteractive +RUN /usr/bin/apt-get update && \ + /usr/bin/apt-get --yes install disorderfs openjdk-11-jdk-headless gradle sdkmanager && \ + /bin/ln -fs /usr/share/zoneinfo/CET /etc/localtime && \ + /usr/sbin/dpkg-reconfigure --frontend noninteractive tzdata && \ + /bin/ln -s /proc/self/mounts /etc/mtab && \ + /usr/sbin/adduser --disabled-login --gecos "" builder + +# give up privileges +USER builder + +# copy project source code +WORKDIR /home/builder +COPY --chown=builder / project/ + +# accept SDK licenses +ENV ANDROID_HOME /home/builder/android-sdk +RUN yes | /usr/bin/sdkmanager --licenses >/dev/null + +# build project +RUN if [ -e /dev/fuse ] ; \ + then /bin/mv project project.u && /bin/mkdir project && \ + /usr/bin/disorderfs --sort-dirents=yes --reverse-dirents=no project.u project ; \ + fi && \ + /usr/bin/gradle --project-dir project/ --no-build-cache --no-daemon --no-parallel clean :wallet:assembleRelease && \ + if [ -e /dev/fuse ] ; \ + then /bin/fusermount -u project | true && /bin/rmdir project && /bin/mv project.u project ; \ + fi + +# export build output +FROM scratch AS export-stage +COPY --from=build-stage /home/builder/project/wallet/build/outputs/apk/*/release/bitcoin-wallet-*-release-unsigned.apk / diff --git a/market/market-description-ar.txt b/market/market-description-ar.txt index d622e95bf4..ff12947f8e 100644 --- a/market/market-description-ar.txt +++ b/market/market-description-ar.txt @@ -22,7 +22,7 @@ https://www.gnu.org/licenses/gpl-3.0.ar.html https://github.com/Groestlcoin/groestlcoin-wallet كل الترجمات مدارة عبر Transifex: -https://www.transifex.com/bitcoin-wallet/bitcoin-wallet/ +https://explore.transifex.com/bitcoin-wallet/bitcoin-wallet/ استخدم على مسؤوليتك الشخصية ! diff --git a/market/market-description-ca.txt b/market/market-description-ca.txt index ce685f8241..40e4b04cb8 100644 --- a/market/market-description-ca.txt +++ b/market/market-description-ca.txt @@ -23,7 +23,7 @@ El nostre codi està disponible a GitHub: https://github.com/Groestlcoin/groestlcoin-wallet Totes les traduccions estan gestionades a través de Transifex: -https://www.transifex.com/bitcoin-wallet/bitcoin-wallet/ +https://explore.transifex.com/bitcoin-wallet/bitcoin-wallet/ Utilitza-la sota la teva responsabilitat! diff --git a/market/market-description-cs.txt b/market/market-description-cs.txt index 9681265f13..a5154a72b5 100644 --- a/market/market-description-cs.txt +++ b/market/market-description-cs.txt @@ -25,7 +25,7 @@ Náš zdrojový kód je k dispozici na GitHubu: https://github.com/Groestlcoin/groestlcoin-wallet Veškeré překlady jsou spravovány přes Transifex: -https://www.transifex.com/bitcoin-wallet/bitcoin-wallet/ +https://explore.transifex.com/bitcoin-wallet/bitcoin-wallet/ Používejte jen na vlastní nebezpečí! Používejte pouze pro malé částky. diff --git a/market/market-description-cy.txt b/market/market-description-cy.txt index bcb256e1c4..a1993537ce 100644 --- a/market/market-description-cy.txt +++ b/market/market-description-cy.txt @@ -24,7 +24,7 @@ Mae ein cod ar gael ar GitHub: https://github.com/Groestlcoin/groestlcoin-wallet Rheolir pob cyfieithiad trwy Transifex: -https://www.transifex.com/bitcoin-wallet/bitcoin-wallet/ +https://explore.transifex.com/bitcoin-wallet/bitcoin-wallet/ Defnyddir ar dy risg dy hun! diff --git a/market/market-description-da.txt b/market/market-description-da.txt index e3a6f79fea..9e00f0d3be 100644 --- a/market/market-description-da.txt +++ b/market/market-description-da.txt @@ -23,7 +23,7 @@ Vores kildekode er tilgængelig på GitHub: https://github.com/Groestlcoin/groestlcoin-wallet Alle oversættelser håndteres via Transifex: -https://www.transifex.com/bitcoin-wallet/bitcoin-wallet/ +https://explore.transifex.com/bitcoin-wallet/bitcoin-wallet/ Brug for egen risiko! diff --git a/market/market-description-de.txt b/market/market-description-de.txt index 9f15dba2fb..362e2dfa28 100644 --- a/market/market-description-de.txt +++ b/market/market-description-de.txt @@ -25,7 +25,7 @@ Unser Source Code ist auf GitHub verfügbar: https://github.com/Groestlcoin/groestlcoin-wallet Alle Übersetzungen werden auf Transifex organisiert: -https://www.transifex.com/bitcoin-wallet/bitcoin-wallet/ +https://explore.transifex.com/bitcoin-wallet/bitcoin-wallet/ Nutzung auf eigene Gefahr! diff --git a/market/market-description-el.txt b/market/market-description-el.txt index 5145fe4875..277663ad69 100644 --- a/market/market-description-el.txt +++ b/market/market-description-el.txt @@ -23,7 +23,7 @@ https://www.gnu.org/licenses/gpl-3.0.en.html https://github.com/Groestlcoin/groestlcoin-wallet Διαχείρηση όλων των μεταφράσεων μέσω του Transifex: -https://www.transifex.com/bitcoin-wallet/bitcoin-wallet/ +https://explore.transifex.com/bitcoin-wallet/bitcoin-wallet/ Χρησιμοποιήστε με δική σας ευθύνη! diff --git a/market/market-description-es.txt b/market/market-description-es.txt index f0a5f12fe1..bce411fcf4 100644 --- a/market/market-description-es.txt +++ b/market/market-description-es.txt @@ -23,7 +23,7 @@ Nuestro código fuente está disponible en GitHub: https://github.com/Groestlcoin/groestlcoin-wallet Todas las traducciones son administradas a través de Transifex: -https://www.transifex.com/bitcoin-wallet/bitcoin-wallet/ +https://explore.transifex.com/bitcoin-wallet/bitcoin-wallet/ ¡Úsalo bajo tu propio riesgo! diff --git a/market/market-description-fa.txt b/market/market-description-fa.txt index 037f5250a7..d2640595ff 100644 --- a/market/market-description-fa.txt +++ b/market/market-description-fa.txt @@ -24,7 +24,7 @@ https://www.gnu.org/licenses/gpl-3.0.en.html https://github.com/Groestlcoin/groestlcoin-wallet همهٔ ترجمها توسط Transifex مدیریت شده. -https://www.transifex.com/bitcoin-wallet/bitcoin-wallet/ +https://explore.transifex.com/bitcoin-wallet/bitcoin-wallet/ با ریسک خود استفاده کنید. diff --git a/market/market-description-fi.txt b/market/market-description-fi.txt index cce184fbd1..bcbaabfb73 100644 --- a/market/market-description-fi.txt +++ b/market/market-description-fi.txt @@ -23,7 +23,7 @@ Lähdekoodi saatavilla GitHub:sta: https://github.com/Groestlcoin/groestlcoin-wallet Kaikki käännökset on hallinnoitu Transifex:n kautta: -https://www.transifex.com/bitcoin-wallet/bitcoin-wallet/ +https://explore.transifex.com/bitcoin-wallet/bitcoin-wallet/ Käytä omalla vastuulla! diff --git a/market/market-description-fr.txt b/market/market-description-fr.txt index dab0f49c33..e2ee6ad0dd 100644 --- a/market/market-description-fr.txt +++ b/market/market-description-fr.txt @@ -23,7 +23,7 @@ Notre code source se trouve sur GitHub : https://github.com/Groestlcoin/groestlcoin-wallet Toutes les traductions sont gérées sur Transifex : -https://www.transifex.com/bitcoin-wallet/bitcoin-wallet/ +https://explore.transifex.com/bitcoin-wallet/bitcoin-wallet/ Utilisez-le à vos propres risques ! Ne l’utilisez que pour des montants de poche. \ No newline at end of file diff --git a/market/market-description-hi.txt b/market/market-description-hi.txt index 47f4a45368..a3d3fb1884 100644 --- a/market/market-description-hi.txt +++ b/market/market-description-hi.txt @@ -22,7 +22,7 @@ https://www.gnu.org/licenses/gpl-3.0.en.html https://github.com/Groestlcoin/groestlcoin-wallet सभी अनुवाद Transifex के माध्यम से प्रबंधित कर रहे हैं: -https://www.transifex.com/bitcoin-wallet/bitcoin-wallet/ +https://explore.transifex.com/bitcoin-wallet/bitcoin-wallet/ अपने जोखिम पर उपयोग करें! diff --git a/market/market-description-hr.txt b/market/market-description-hr.txt index 2746d1ee35..ad0911d681 100644 --- a/market/market-description-hr.txt +++ b/market/market-description-hr.txt @@ -22,7 +22,7 @@ Naš izvorni kod je dostušan na GitHub-u: https://github.com/Groestlcoin/groestlcoin-wallet Sve transakcije se provode preko Transifex-a: -https://www.transifex.com/bitcoin-wallet/bitcoin-wallet/ +https://explore.transifex.com/bitcoin-wallet/bitcoin-wallet/ Koristi na svoj vlastiti rizik. diff --git a/market/market-description-hu.txt b/market/market-description-hu.txt index 4668e35029..4cc2734318 100644 --- a/market/market-description-hu.txt +++ b/market/market-description-hu.txt @@ -25,7 +25,7 @@ A forráskódunk elérhető a GitHub-on: https://github.com/Groestlcoin/groestlcoin-wallet Minden fordítást a Transifex kezelt: -https://www.transifex.com/bitcoin-wallet/bitcoin-wallet/ +https://explore.transifex.com/bitcoin-wallet/bitcoin-wallet/ Kizárólag saját felelősségre! Csak zsebpénznyi összegek használatára. diff --git a/market/market-description-id.txt b/market/market-description-id.txt index f0a3bc46b2..515007faa7 100644 --- a/market/market-description-id.txt +++ b/market/market-description-id.txt @@ -17,6 +17,6 @@ Jika Anda ingin berkontribusi kepada Groestlcoin Wallet, proyeknya berada di https://github.com/Groestlcoin/groestlcoin-wallet Semua terjemahan dikelola via Transifex: -https://www.transifex.com/bitcoin-wallet/bitcoin-wallet/ +https://explore.transifex.com/bitcoin-wallet/bitcoin-wallet/ Gunakan dengan resiko Anda! diff --git a/market/market-description-it.txt b/market/market-description-it.txt index 9dfbbfb447..90c8da489a 100644 --- a/market/market-description-it.txt +++ b/market/market-description-it.txt @@ -25,7 +25,7 @@ Il nostro codice sorgente è disponibile su GitHub https://github.com/Groestlcoin/groestlcoin-wallet Tutte le traduzioni sono gestite attraverso Transifex: -https://www.transifex.com/bitcoin-wallet/bitcoin-wallet/ +https://explore.transifex.com/bitcoin-wallet/bitcoin-wallet/ Uso a proprio rischio! Utilizzare solo per piccoli importi. diff --git a/market/market-description-ja.txt b/market/market-description-ja.txt index 61fef80e91..2a354e638e 100644 --- a/market/market-description-ja.txt +++ b/market/market-description-ja.txt @@ -25,7 +25,7 @@ https://www.gnu.org/licenses/gpl-3.0.ja.html https://github.com/Groestlcoin/groestlcoin-wallet 全ての翻訳はTransifexで管理されています: -https://www.transifex.com/bitcoin-wallet/bitcoin-wallet/ +https://explore.transifex.com/bitcoin-wallet/bitcoin-wallet/ 自己責任でお使いください! ポケットに入るくらいの残高のみに使ってください。 diff --git a/market/market-description-ko.txt b/market/market-description-ko.txt index 198317c0a6..0aa6bb907a 100644 --- a/market/market-description-ko.txt +++ b/market/market-description-ko.txt @@ -22,7 +22,7 @@ https://www.gnu.org/licenses/gpl-3.0.en.html https://github.com/Groestlcoin/groestlcoin-wallet 모든 번역은 Transifex 웹사이트를 통해 이루어집니다. -https://www.transifex.com/bitcoin-wallet/bitcoin-wallet/ +https://explore.transifex.com/bitcoin-wallet/bitcoin-wallet/ 이 앱을 사용하는 것은 앱 사용에 따른 위험에 동의하는 것입니다! diff --git a/market/market-description-nb.txt b/market/market-description-nb.txt index 7bb392f33e..3a6f75b401 100644 --- a/market/market-description-nb.txt +++ b/market/market-description-nb.txt @@ -23,7 +23,7 @@ Vår kildekode er tilgjengelig på GitHub: https://github.com/Groestlcoin/groestlcoin-wallet Alle oversettelser skjer via Transifex: -https://www.transifex.com/bitcoin-wallet/bitcoin-wallet/ +https://explore.transifex.com/bitcoin-wallet/bitcoin-wallet/ Bruk på eget ansvar! diff --git a/market/market-description-nl.txt b/market/market-description-nl.txt index 5638979e66..83a2919cd3 100644 --- a/market/market-description-nl.txt +++ b/market/market-description-nl.txt @@ -23,7 +23,7 @@ Onze broncode is beschikbaar op GitHub: https://github.com/Groestlcoin/groestlcoin-wallet Alle vertalingen worden geregeld via Transifex: -https://www.transifex.com/bitcoin-wallet/bitcoin-wallet/ +https://explore.transifex.com/bitcoin-wallet/bitcoin-wallet/ Het gebruik van de app is voor eigen risico! Niet bedoeld voor grote bedragen. diff --git a/market/market-description-pl.txt b/market/market-description-pl.txt index 2258c3cff9..850280c34d 100644 --- a/market/market-description-pl.txt +++ b/market/market-description-pl.txt @@ -24,7 +24,7 @@ Nasz kod źródłowy jest dostępny na GitHub: https://github.com/Groestlcoin/groestlcoin-wallet Wszystkie tłumaczenia są zarządzane przez Transifex: -https://www.transifex.com/bitcoin-wallet/bitcoin-wallet/ +https://explore.transifex.com/bitcoin-wallet/bitcoin-wallet/ Używaj na własne ryzyko! Stosować tylko do kieszonkowych ilości. diff --git a/market/market-description-pt-BR.txt b/market/market-description-pt-BR.txt index e460d9d9eb..a3ad4a24cd 100644 --- a/market/market-description-pt-BR.txt +++ b/market/market-description-pt-BR.txt @@ -23,7 +23,7 @@ Nosso código fonte está disponível no GitHub: https://github.com/Groestlcoin/groestlcoin-wallet Todas as traduções são gerenciadas através do site Transifex: -https://www.transifex.com/bitcoin-wallet/bitcoin-wallet/ +https://explore.transifex.com/bitcoin-wallet/bitcoin-wallet/ Use por sua conta e risco! diff --git a/market/market-description-pt-PT.txt b/market/market-description-pt-PT.txt index 641972b56d..2e06296781 100644 --- a/market/market-description-pt-PT.txt +++ b/market/market-description-pt-PT.txt @@ -22,7 +22,7 @@ O nosso código fonte está disponível em GitHub: https://github.com/Groestlcoin/groestlcoin-wallet Todas as traduções são geridas via Transifex: -https://www.transifex.com/bitcoin-wallet/bitcoin-wallet/ +https://explore.transifex.com/bitcoin-wallet/bitcoin-wallet/ Utilize por sua conta e risco! diff --git a/market/market-description-ru.txt b/market/market-description-ru.txt index d8d92e9c0c..24b89b0d79 100644 --- a/market/market-description-ru.txt +++ b/market/market-description-ru.txt @@ -24,7 +24,7 @@ https://www.gnu.org/licenses/gpl-3.0.ru.html https://github.com/Groestlcoin/groestlcoin-wallet Все переводы сделаны через Transifex: -https://www.transifex.com/bitcoin-wallet/bitcoin-wallet/ +https://explore.transifex.com/bitcoin-wallet/bitcoin-wallet/ Используйте на свой страх и риск! diff --git a/market/market-description-sq.txt b/market/market-description-sq.txt index 7565764455..a4114c07b8 100644 --- a/market/market-description-sq.txt +++ b/market/market-description-sq.txt @@ -23,7 +23,7 @@ Kodi jonë burimor është i hapur në GitHub: https://github.com/Groestlcoin/groestlcoin-wallet Të gjitha përkthimet menagjohen nga Transifex: -https://www.transifex.com/bitcoin-wallet/bitcoin-wallet/ +https://explore.transifex.com/bitcoin-wallet/bitcoin-wallet/ Përdoreni në përgjegjësin tuaj! diff --git a/market/market-description-sv.txt b/market/market-description-sv.txt index 0110cd97dd..b3aa3e28c7 100644 --- a/market/market-description-sv.txt +++ b/market/market-description-sv.txt @@ -23,7 +23,7 @@ Vår källkod finns tillgänglig på GitHub: https://github.com/Groestlcoin/groestlcoin-wallet All översättning hanteras via Transifex: -https://www.transifex.com/bitcoin-wallet/bitcoin-wallet/ +https://explore.transifex.com/bitcoin-wallet/bitcoin-wallet/ Används på egen risk! diff --git a/market/market-description-tr.txt b/market/market-description-tr.txt index 4fabf3479f..ff0cdbd831 100644 --- a/market/market-description-tr.txt +++ b/market/market-description-tr.txt @@ -25,7 +25,7 @@ Kaynak kodumuz GitHub'da mevcuttur: https://github.com/Groestlcoin/groestlcoin-wallet Tüm tercümeler Transifex üzerinde yönetilir: -https://www.transifex.com/bitcoin-wallet/bitcoin-wallet/ +https://explore.transifex.com/bitcoin-wallet/bitcoin-wallet/ Kullanım kendi sorumluluğunuzdadır! Sadece cep boyutunda miktarlar için kullanın. \ No newline at end of file diff --git a/market/market-description-uk.txt b/market/market-description-uk.txt index 92cf9bd9eb..90d1585dc6 100644 --- a/market/market-description-uk.txt +++ b/market/market-description-uk.txt @@ -23,7 +23,7 @@ https://www.gnu.org/licenses/gpl-3.0.uk.html https://github.com/Groestlcoin/groestlcoin-wallet Всі переклади зроблені через Transifex: -https://www.transifex.com/bitcoin-wallet/bitcoin-wallet/ +https://explore.transifex.com/bitcoin-wallet/bitcoin-wallet/ Використувуйте на свій страх та ризик! diff --git a/market/market-description-zh-TW.txt b/market/market-description-zh-TW.txt index ec49289d4c..ad4e805b09 100644 --- a/market/market-description-zh-TW.txt +++ b/market/market-description-zh-TW.txt @@ -23,7 +23,7 @@ https://www.gnu.org/licenses/gpl-3.0.en.html https://github.com/Groestlcoin/groestlcoin-wallet 所有的翻譯工作都用 Transifex 管理: -https://www.transifex.com/bitcoin-wallet/bitcoin-wallet/ +https://explore.transifex.com/bitcoin-wallet/bitcoin-wallet/ 請自負使用風險！ diff --git a/market/market-description-zh.txt b/market/market-description-zh.txt index 415285c34a..eefe540400 100644 --- a/market/market-description-zh.txt +++ b/market/market-description-zh.txt @@ -23,7 +23,7 @@ https://www.gnu.org/licenses/gpl-3.0.en.html https://github.com/Groestlcoin/groestlcoin-wallet 所有的本地化翻译均在 Transifex 上进行： -https://www.transifex.com/bitcoin-wallet/bitcoin-wallet/ +https://explore.transifex.com/bitcoin-wallet/bitcoin-wallet/ 您需要自担风险！ diff --git a/market/market-description.txt b/market/market-description.txt index 31f9dbd933..2631b10197 100644 --- a/market/market-description.txt +++ b/market/market-description.txt @@ -25,7 +25,7 @@ Our source code is available at GitHub: https://github.com/Groestlcoin/groestlcoin-wallet All translations are managed via Transifex: -https://www.transifex.com/bitcoin-wallet/bitcoin-wallet/ +https://explore.transifex.com/bitcoin-wallet/bitcoin-wallet/ Use at your own risk! diff --git a/wallet/AndroidManifest.xml b/wallet/AndroidManifest.xml index 5171d8fe3f..debc42dcb9 100644 --- a/wallet/AndroidManifest.xml +++ b/wallet/AndroidManifest.xml @@ -4,8 +4,8 @@ xmlns:tools="http://schemas.android.com/tools" package="de.schildbach.wallet" android:installLocation="internalOnly" - android:versionCode="100301" - android:versionName="10.03"> + android:versionCode="100700" + android:versionName="10.07"> diff --git a/wallet/CHANGES b/wallet/CHANGES index 05fa0f64ba..a43ef98dd4 100644 --- a/wallet/CHANGES +++ b/wallet/CHANGES @@ -1,3 +1,6 @@ +v10.07 +* Updated to Bitcoin Wallet 10.07 + v10.03 * Updated to Bitcoin Wallet 10.03 diff --git a/wallet/README.md b/wallet/README.md index b52395fd69..c87e2d2289 100644 --- a/wallet/README.md +++ b/wallet/README.md @@ -101,7 +101,7 @@ You can import the project into IntelliJ IDEA or Android Studio, as it uses Grad ### TRANSLATIONS -The source language is English. Translations for all languages except German [happen on Transifex](https://www.transifex.com/bitcoin-wallet/bitcoin-wallet/). +The source language is English. Translations for all languages except German [happen on Transifex](https://explore.transifex.com/bitcoin-wallet/bitcoin-wallet/). The English resources are pushed to Transifex. Changes are pulled and committed to the git repository from time to time. It can be done by manually downloading the files, but using the `tx` diff --git a/wallet/build.gradle b/wallet/build.gradle index 8fa2ae72d2..b9e99cb736 100644 --- a/wallet/build.gradle +++ b/wallet/build.gradle @@ -13,28 +13,28 @@ configurations { } dependencies { - implementation 'androidx.annotation:annotation:1.5.0' - implementation 'androidx.core:core:1.9.0' + implementation 'androidx.annotation:annotation:1.7.0' + implementation 'androidx.core:core:1.10.0' implementation 'androidx.activity:activity:1.7.0' - implementation 'androidx.fragment:fragment:1.5.6' - implementation 'androidx.recyclerview:recyclerview:1.3.0' + implementation 'androidx.fragment:fragment:1.6.1' + implementation 'androidx.recyclerview:recyclerview:1.3.2' implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0' implementation 'androidx.viewpager2:viewpager2:1.0.0' - implementation 'androidx.lifecycle:lifecycle-livedata:2.6.1' - implementation 'androidx.lifecycle:lifecycle-service:2.6.1' + implementation 'androidx.lifecycle:lifecycle-livedata:2.6.2' + implementation 'androidx.lifecycle:lifecycle-service:2.6.2' implementation 'androidx.sqlite:sqlite:2.3.1' - implementation "androidx.room:room-runtime:2.5.1" - annotationProcessor "androidx.room:room-compiler:2.5.1" + implementation "androidx.room:room-runtime:2.5.2" + annotationProcessor "androidx.room:room-compiler:2.5.2" implementation 'com.github.groestlcoin:groestlcoinj-core:0.16.2' implementation 'com.google.guava:guava:31.1-android' - implementation 'com.google.zxing:core:3.5.1' + implementation 'com.google.zxing:core:3.5.2' //noinspection GradleDependency implementation 'com.squareup.okhttp3:okhttp:3.14.9' //noinspection GradleDependency implementation 'com.squareup.okhttp3:logging-interceptor:3.14.9' implementation 'com.squareup.moshi:moshi:1.11.0' - implementation 'org.slf4j:slf4j-api:2.0.7' + implementation 'org.slf4j:slf4j-api:2.0.9' implementation 'com.github.tony19:logback-android:3.0.0' testImplementation 'junit:junit:4.13.2' } @@ -49,8 +49,6 @@ android { defaultConfig { applicationId 'hashengineering.groestlcoin' - // Enabling multidex support. - multiDexEnabled true ndk { abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64' @@ -69,7 +67,8 @@ android { buildTypes { all { minifyEnabled true - shrinkResources false + shrinkResources true + crunchPngs false proguardFile 'proguard.cfg' } debug { diff --git a/wallet/src/de/schildbach/wallet/util/Bluetooth.java b/wallet/src/de/schildbach/wallet/util/Bluetooth.java index df039d22a3..8ab4400001 100644 --- a/wallet/src/de/schildbach/wallet/util/Bluetooth.java +++ b/wallet/src/de/schildbach/wallet/util/Bluetooth.java @@ -68,7 +68,7 @@ public class Bluetooth { if (mService == null) return null; return (String) mService.getClass().getMethod("getAddress").invoke(mService); - } catch (final InvocationTargetException x) { + } catch (final InvocationTargetException | NoSuchMethodException x) { log.info("Problem determining Bluetooth MAC via reflection", x); return null; } catch (final Exception x) {