diff --git a/.drone.yml b/.drone.yml index 129e1070..76bf5dd7 100644 --- a/.drone.yml +++ b/.drone.yml @@ -97,16 +97,16 @@ steps: GOOGLE_KEYSTORE_PASS: from_secret: GOOGLE_KEYSTORE_PASS -# - name: Build Intermediate Android Release Artifact (Bundle) -# commands: -# - ./ci.py --build-bundle -# environment: -# STANDALONE_KEYSTORE_PASS: -# from_secret: STANDALONE_KEYSTORE_PASS -# FDROID_KEYSTORE_PASS: -# from_secret: FDROID_KEYSTORE_PASS -# GOOGLE_KEYSTORE_PASS: -# from_secret: GOOGLE_KEYSTORE_PASS + - name: Build Intermediate Android Release Artifact (Bundle) + commands: + - ./ci.py --build-bundle + environment: + STANDALONE_KEYSTORE_PASS: + from_secret: STANDALONE_KEYSTORE_PASS + FDROID_KEYSTORE_PASS: + from_secret: FDROID_KEYSTORE_PASS + GOOGLE_KEYSTORE_PASS: + from_secret: GOOGLE_KEYSTORE_PASS - name: Sign Android Release Artifact (.APK) for Standalone Use commands: @@ -132,16 +132,16 @@ steps: GOOGLE_KEYSTORE_PASS: from_secret: GOOGLE_KEYSTORE_PASS -# - name: Sign Android Release Artifact (Bundle) for Google Play -# commands: -# - ./ci.py --sign-bundle -# environment: -# STANDALONE_KEYSTORE_PASS: -# from_secret: STANDALONE_KEYSTORE_PASS -# FDROID_KEYSTORE_PASS: -# from_secret: FDROID_KEYSTORE_PASS -# GOOGLE_KEYSTORE_PASS: -# from_secret: GOOGLE_KEYSTORE_PASS + - name: Sign Android Release Artifact (Bundle) for Google Play + commands: + - ./ci.py --sign-bundle + environment: + STANDALONE_KEYSTORE_PASS: + from_secret: STANDALONE_KEYSTORE_PASS + FDROID_KEYSTORE_PASS: + from_secret: FDROID_KEYSTORE_PASS + GOOGLE_KEYSTORE_PASS: + from_secret: GOOGLE_KEYSTORE_PASS - name: Package Linux AppImage Artifact commands: diff --git a/android/gradle.properties b/android/gradle.properties index 94adc3a3..c396be2a 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,3 +1,4 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true android.enableJetifier=true +android.bundle.enableUncompressedNativeLibs=false diff --git a/assets/markdown/about-en.md b/assets/markdown/about-en.md index 3963aa6e..d9027d38 100644 --- a/assets/markdown/about-en.md +++ b/assets/markdown/about-en.md @@ -1,12 +1,24 @@ ### About us -More and more corporations want to control our data. -We want to have full control of our **data** on our own. +More and more organizations want to own our data. The project allows everyone to create private services for themselves and their loved ones, and only you can fully manage your own **data** on your own server. -### Our mission +**Digital independence and privacy, available to everyone.** -Digital independence and privacy, available to everyone -### Target +### Where to find us? -Develop the program, which will allow everyone to deploy their private services for themselves and their neighbours. \ No newline at end of file +[Official site](https://selfprivacy.org) + +[Source Code](https://git.selfprivacy.org/kherel/selfprivacy.org.app) + +[Go to Fdroid page](http://f-droid.org/en/packages/pro.kherel.selfprivacy) + +Channels with news: + +- [matrix: #news:selfprivacy.org](https://matrix.to/#/#news:selfprivacy.org) +- [telegram: @selfprivacy](https://t.me/selfprivacy) + +Chats, where you can get help: + +- [matrix: #chat:selfprivacy.org](https://matrix.to/#/#chat:selfprivacy.org) +- [telegram: @selfprivacy_chat](https://t.me/selfprivacy_chat) \ No newline at end of file diff --git a/assets/markdown/about-ru.md b/assets/markdown/about-ru.md index c93abce2..3a56c5c0 100644 --- a/assets/markdown/about-ru.md +++ b/assets/markdown/about-ru.md @@ -1,12 +1,25 @@ ### О проекте -Всё больше организаций хотят владеть нашими данными -Проект позволяет только Вам в полной мере распоряжаться собственными **данными** на своём сервере. +Всё больше организаций хотят владеть нашими данными. Проект позволяет каждому создавать приватные сервисы для себя и своих близких, и только вам в полной мере распоряжаться собственными **данными** на своём сервере. -### Миссия проекта +**Цифровая независимость и приватность доступная каждому.** -Цифровая независимость и приватность доступная каждому. -### Цель +### Где нас найти? -Развивать программу, которая позволит каждому создавать приватные сервисы для себя и своих близких. \ No newline at end of file +[Официальный сайт](https://selfprivacy.org) + +[Исходный код](https://git.selfprivacy.org/kherel/selfprivacy.org.app) + +[Перейти на страницу Fdroid](http://f-droid.org/en/packages/pro.kherel.selfprivacy) + +Каналы с новостями: + +- [matrix: #news:selfprivacy.org](https://matrix.to/#/#news:selfprivacy.org) +- [telegram: @selfprivacy](https://t.me/selfprivacy) + +Чаты, где вам помогут: + +- [matrix: #chat:selfprivacy.org](https://matrix.to/#/#chat:selfprivacy.org) +- [telegram: @selfprivacy_chat](https://t.me/selfprivacy_chat) + \ No newline at end of file diff --git a/ci.py b/ci.py index 02a17004..b0b9e996 100755 --- a/ci.py +++ b/ci.py @@ -149,6 +149,7 @@ def package_linux_archive(): def deploy_gitea_release(): gitea_upload_attachment(f"{HOST_MOUNTED_VOLUME}/standalone_{APP_NAME}-{APP_SEMVER}.apk") gitea_upload_attachment(f"{HOST_MOUNTED_VOLUME}/standalone_{APP_NAME}-{APP_SEMVER}.apk.idsig") + gitea_upload_attachment(f"{HOST_MOUNTED_VOLUME}/{APP_NAME}-{APP_SEMVER}.aab") gitea_upload_attachment(f"{HOST_MOUNTED_VOLUME}/SelfPrivacy-{APP_SEMVER}-x86_64.AppImage") gitea_upload_attachment(f"{HOST_MOUNTED_VOLUME}/SelfPrivacy-{APP_SEMVER}-x86_64.AppImage.zsync") gitea_upload_attachment(f"{HOST_MOUNTED_VOLUME}/{APP_NAME}-{APP_SEMVER}.flatpak")