1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2025-01-07 10:42:07 +00:00

build.gradle: Update dependencies, Update tx config (#428)

* build.gradle: Update play-publisher from 1.2.2 to 2.2.1

* build.gradle: Update dependencies

* Update transifex config

* Update .gitignore

* Update tx mappings

* Add supported language: tx:no => gplay:no-NO

* Update .tx/config source_lang for play resources

* Add resolutionStrategy = 'auto'
This commit is contained in:
Catfriend1 2019-06-17 06:32:19 +02:00 committed by GitHub
parent 2cd4e5893e
commit 7899ff3931
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 64 additions and 32 deletions

7
.gitignore vendored
View file

@ -52,7 +52,6 @@ ext/
\#enable_push_to_device
# Unsupported translations
app/src/main/play/el-EL
app/src/main/play/en
app/src/main/play/nb
app/src/main/play/nn
app/src/main/play/listings/nb
app/src/main/play/listings/nl-BE
app/src/main/play/listings/nn

View file

@ -9,23 +9,22 @@ source_lang = en
type = ANDROID
[syncthing-android-1.description_fulltxt]
file_filter = app/src/main/play/<lang>/listing/fulldescription
lang_map = ja: ja-JP, sv: sv-SE, da: da-DK, de: de-DE, el: el-EL, es: es-ES, fi: fi-FI, it: it-IT, pl: pl-PL, nl: nl-NL, ru: ru-RU, no: no-NO, pt: pt-PT, ko: ko-KR, cs: cs-CZ, hu: hu-HU, fr: fr-FR, tr: tr-TR
source_file = app/src/main/play/en-GB/listing/fulldescription
source_lang = en_GB
file_filter = app/src/main/play/listings/<lang>/full-description.txt
lang_map = ca_ES: ca, cs: cs-CZ, da: da-DK, de_AT: de-AT, de: de-DE, el: el-GR, en: en-GB, es_EC: es-419, es_MX: es-US, es: es-ES, eu: eu-ES, fi: fi-FI, fr: fr-FR, hu: hu-HU, it: it-IT, ja: ja-JP, ko: ko-KR, nl: nl-NL, nl_BE: nl-BE, no: no-NO, pl: pl-PL, pt_BR: pt-BR, pt: pt-PT, ru: ru-RU, sv: sv-SE, ta: ta-IN, tr: tr-TR, uk_UA: uk-UA, zh_CN: zh-CN, zh_TW: zh-TW
source_file = app/src/main/play/listings/en-GB/full-description.txt
source_lang = en
type = TXT
[syncthing-android-1.description_shorttxt]
file_filter = app/src/main/play/<lang>/listing/shortdescription
lang_map = ja: ja-JP, sv: sv-SE, da: da-DK, de: de-DE, el: el-EL, es: es-ES, fi: fi-FI, it: it-IT, pl: pl-PL, nl: nl-NL, ru: ru-RU, no: no-NO, pt: pt-PT, ko: ko-KR, cs: cs-CZ, hu: hu-HU, fr: fr-FR, tr: tr-TR
source_file = app/src/main/play/en-GB/listing/shortdescription
source_lang = en_GB
file_filter = app/src/main/play/listings/<lang>/short-description.txt
lang_map = ca_ES: ca, cs: cs-CZ, da: da-DK, de: de-DE, de_AT: de-AT, el: el-GR, en: en-GB, es_EC: es-419, es_MX: es-US, es: es-ES, eu: eu-ES, fi: fi-FI, fr: fr-FR, hu: hu-HU, it: it-IT, ja: ja-JP, ko: ko-KR, nl: nl-NL, nl_BE: nl-BE, no: no-NO, pl: pl-PL, pt_BR: pt-BR, pt: pt-PT, ru: ru-RU, sv: sv-SE, ta: ta-IN, tr: tr-TR, uk_UA: uk-UA, zh_CN: zh-CN, zh_TW: zh-TW
source_file = app/src/main/play/listings/en-GB/short-description.txt
source_lang = en
type = TXT
[syncthing-android-1.titletxt]
file_filter = app/src/main/play/<lang>/listing/title
lang_map = ja: ja-JP, sv: sv-SE, da: da-DK, de: de-DE, el: el-EL, es: es-ES, fi: fi-FI, it: it-IT, pl: pl-PL, nl: nl-NL, ru: ru-RU, no: no-NO, pt: pt-PT, ko: ko-KR, cs: cs-CZ, hu: hu-HU, fr: fr-FR, tr: tr-TR
source_file = app/src/main/play/en-GB/listing/title
source_lang = en_GB
file_filter = app/src/main/play/listings/<lang>/title.txt
lang_map = ca_ES: ca, cs: cs-CZ, da: da-DK, de: de-DE, de_AT: de-AT, el: el-GR, en: en-GB, es_EC: es-419, es_MX: es-US, es: es-ES, eu: eu-ES, fi: fi-FI, fr: fr-FR, hu: hu-HU, it: it-IT, ja: ja-JP, ko: ko-KR, nl: nl-NL, nl_BE: nl-BE, no: no-NO, pl: pl-PL, pt_BR: pt-BR, pt: pt-PT, ru: ru-RU, sv: sv-SE, ta: ta-IN, tr: tr-TR, uk_UA: uk-UA, zh_CN: zh-CN, zh_TW: zh-TW
source_file = app/src/main/play/listings/en-GB/title.txt
source_lang = en
type = TXT

View file

@ -3,19 +3,19 @@ apply plugin: 'com.github.ben-manes.versions'
apply plugin: 'com.github.triplet.play'
dependencies {
implementation 'eu.chainfire:libsuperuser:1.0.0.201704021214'
implementation 'eu.chainfire:libsuperuser:1.1.0.201903290044'
implementation 'com.android.support:design:28.0.0'
implementation 'com.android.support:recyclerview-v7:28.0.0'
implementation 'com.google.zxing:android-integration:3.3.0'
implementation 'com.google.code.gson:gson:2.8.5'
implementation 'org.mindrot:jbcrypt:0.4'
// com.google.guava:guava:24.1-jre will crash on Android 5.x
implementation 'com.google.guava:guava:26.0-android'
implementation 'com.google.guava:guava:27.1-android'
implementation 'com.annimon:stream:1.2.1'
implementation 'com.android.volley:volley:1.1.1'
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
implementation 'com.google.dagger:dagger:2.21'
annotationProcessor "com.google.dagger:dagger-compiler:2.21"
implementation 'com.google.dagger:dagger:2.23.1'
annotationProcessor "com.google.dagger:dagger-compiler:2.23.1"
androidTestImplementation 'com.android.support.test:rules:1.0.2'
androidTestImplementation 'com.android.support:support-annotations:28.0.0'
}
@ -32,9 +32,9 @@ android {
buildTypes.debug.applicationIdSuffix ".debug"
dataBinding.enabled = true
playAccountConfigs {
playConfigs {
defaultAccountConfig {
jsonFile = file(System.getenv("SYNCTHING_RELEASE_PLAY_ACCOUNT_CONFIG_FILE") ?: 'keys.json')
serviceAccountCredentials = file(System.getenv("SYNCTHING_RELEASE_PLAY_ACCOUNT_CONFIG_FILE") ?: 'keys.json')
}
}
defaultConfig {
@ -45,7 +45,6 @@ android {
versionName ourVersionName
testApplicationId 'com.github.catfriend1.syncthingandroid.test'
testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
playAccountConfig = playAccountConfigs.defaultAccountConfig
}
signingConfigs {
@ -83,10 +82,9 @@ android {
}
play {
jsonFile = file(System.getenv("SYNCTHING_RELEASE_PLAY_ACCOUNT_CONFIG_FILE") ?: 'keys.json')
errorOnSizeLimit = false
uploadImages = false
serviceAccountCredentials = file(System.getenv("SYNCTHING_RELEASE_PLAY_ACCOUNT_CONFIG_FILE") ?: 'keys.json')
track = 'beta'
resolutionStrategy = 'auto'
}
tasks.whenTaskAdded { task ->
@ -100,10 +98,14 @@ tasks.whenTaskAdded { task ->
* Some languages are not supported by Google Play, so we ignore them.
*/
task deleteUnsupportedPlayTranslations(type: Delete) {
delete 'src/main/play/nn'
delete 'src/main/play/el-EL'
delete 'src/main/play/nb'
delete 'src/main/play/en/'
delete 'src/main/play/listings/el-EL/'
delete 'src/main/play/listings/en/'
delete 'src/main/play/listings/eu/'
delete 'src/main/play/listings/nb/'
delete 'src/main/play/listings/nl_BE/'
delete 'src/main/play/listings/nl-BE/'
delete 'src/main/play/listings/nn/'
delete 'src/main/play/listings/ta/'
}
task postBuildScript(type: Exec) {

View file

@ -0,0 +1,27 @@
This is a fork of the Syncthing-Android wrapper for Syncthing that brings major enhancements like:
* Individual sync conditions can be applied per device and per folder
* Recent changes UI, click to open files.
* "Battery eater" problem is fixed.
* Android 8 and 9 support.
Syncthing-Fork for Android is a wrapper for Syncthing that provides an Android UI instead of Syncthing's built-in Web UI. Syncthing replaces proprietary sync and cloud services with something open, trustworthy and decentralized. Your data is your data alone and you deserve to choose where it is stored, if it is shared with some third party and how it's transmitted over the Internet.
Goals of the fork:
* Develop and try out enhancements together with the community.
* Release the wrapper more frequently to identify and fix bugs caused by changes in the syncthing submodule
* Make enhancements configurable in the UI, users should be able to turn them on and off
Comparison between upstream and fork at the time of writing this:
* Both contain the syncthing binary built from the official source at GitHub:syncthing/syncthing
* Syncing functionality and reliability depends on the syncthing binary submodule version.
* Fork gets along with upstream and sometimes they pick up my improvements.
* Strategy and release frequency is different
* Only the wrapper containing the Android UI is addressed by the fork.
Website: https://github.com/Catfriend1/syncthing-android
Source code: https://github.com/Catfriend1/syncthing-android
Issues: https://github.com/Catfriend1/syncthing-android/issues
Translation: https://www.transifex.com/projects/p/syncthing-android-1

View file

@ -0,0 +1 @@
Wrapper for Syncthing - Open and decentralized file synchronization

View file

@ -0,0 +1 @@
Syncthing-Fork

View file

@ -7,7 +7,6 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:3.4.1'
classpath 'com.github.triplet.gradle:play-publisher:1.2.2'
classpath 'com.github.ben-manes:gradle-versions-plugin:0.21.0'
// NOTE: Do not place your application dependencies here; they belong
@ -15,6 +14,10 @@ buildscript {
}
}
plugins {
id 'com.github.triplet.play' version '2.2.1'
}
allprojects {
repositories {
google()