Merge pull request #96 from vector-im/feature/vector
Rename `app` to `vector`
This commit is contained in:
Benoit Marty
GitHub
commit
494d893aa3
10
.travis.yml
10
.travis.yml
|
|
@ -45,14 +45,14 @@ before_script:
|
|||
|
||||
# Just build the project for now
|
||||
script:
|
||||
# Build app (assembleAppgplayRelease assembleAppfdroidRelease)
|
||||
# Build app (assembleGplayRelease assembleFdroidRelease)
|
||||
# Build Android test (assembleAndroidTest) (disabled for now)
|
||||
# Code quality (lintAppgplayRelease lintAppfdroidRelease)
|
||||
- ./gradlew clean assembleAppgplayRelease assembleAppfdroidRelease lintAppgplayRelease lintAppfdroidRelease --stacktrace
|
||||
# Code quality (lintGplayRelease lintFdroidRelease)
|
||||
- ./gradlew clean assembleGplayRelease assembleFdroidRelease lintGplayRelease lintFdroidRelease --stacktrace
|
||||
# Run unitary test (Disable for now, see https://travis-ci.org/vector-im/riot-android/builds/502504370)
|
||||
# - ./gradlew testAppgplayReleaseUnitTest --stacktrace
|
||||
# - ./gradlew testGplayReleaseUnitTest --stacktrace
|
||||
# Other code quality check
|
||||
- ./tools/check/check_code_quality.sh
|
||||
- ./tools/travis/check_pr.sh
|
||||
# Check that indonesians file are identical. Due to Android issue, the resource folder must be value-in/, and Weblate export data into value-id/.
|
||||
- diff ./app/src/main/res/values-id/strings.xml ./app/src/main/res/values-in/strings.xml
|
||||
- diff ./vector/src/main/res/values-id/strings.xml ./vector/src/main/res/values-in/strings.xml
|
||||
|
|
|
|||
|
|
@ -42,13 +42,13 @@ Make sure the following commands execute without any error:
|
|||
|
||||
> ./tools/check/check_code_quality.sh
|
||||
|
||||
> ./gradlew lintAppgplayRelease
|
||||
> ./gradlew lintGplayRelease
|
||||
|
||||
### Unit tests
|
||||
|
||||
Make sure the following commands execute without any error:
|
||||
|
||||
> ./gradlew testAppgplayReleaseUnitTest
|
||||
> ./gradlew testGplayReleaseUnitTest
|
||||
|
||||
### Tests
|
||||
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ sonarqube {
|
|||
property "sonar.projectName", "RiotX-Android"
|
||||
property "sonar.projectKey", "vector.android.riotx"
|
||||
property "sonar.host.url", "https://sonarcloud.io"
|
||||
property "sonar.projectVersion", project(":app").android.defaultConfig.versionName
|
||||
property "sonar.projectVersion", project(":vector").android.defaultConfig.versionName
|
||||
property "sonar.sourceEncoding", "UTF-8"
|
||||
property "sonar.links.homepage", "https://github.com/vector-im/riotX-android/"
|
||||
property "sonar.links.ci", "https://matrix.org/jenkins/view/MatrixView/job/RiotXAndroidDevelop/"
|
||||
|
|
@ -52,10 +52,10 @@ sonarqube {
|
|||
}
|
||||
}
|
||||
|
||||
project(":app") {
|
||||
project(":vector") {
|
||||
sonarqube {
|
||||
properties {
|
||||
property "sonar.sources", project(":app").android.sourceSets.main.java.srcDirs
|
||||
property "sonar.sources", project(":vector").android.sourceSets.main.java.srcDirs
|
||||
// exclude source code from analyses separated by a colon (:)
|
||||
// property "sonar.exclusions", "**/*.*"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
include ':app', ':matrix-sdk-android', ':matrix-sdk-android-rx'
|
||||
include ':vector', ':matrix-sdk-android', ':matrix-sdk-android-rx'
|
||||
|
|
|
|||
|
|
@ -22,11 +22,11 @@
|
|||
|
||||
echo "Check drawable quantity"
|
||||
|
||||
numberOfFiles1=`ls -1U ./app/src/main/res/drawable-hdpi | wc -l | sed "s/ //g"`
|
||||
numberOfFiles2=`ls -1U ./app/src/main/res/drawable-mdpi | wc -l | sed "s/ //g"`
|
||||
numberOfFiles3=`ls -1U ./app/src/main/res/drawable-xhdpi | wc -l | sed "s/ //g"`
|
||||
numberOfFiles4=`ls -1U ./app/src/main/res/drawable-xxhdpi | wc -l | sed "s/ //g"`
|
||||
numberOfFiles5=`ls -1U ./app/src/main/res/drawable-xxxhdpi | wc -l | sed "s/ //g"`
|
||||
numberOfFiles1=`ls -1U ./vector/src/main/res/drawable-hdpi | wc -l | sed "s/ //g"`
|
||||
numberOfFiles2=`ls -1U ./vector/src/main/res/drawable-mdpi | wc -l | sed "s/ //g"`
|
||||
numberOfFiles3=`ls -1U ./vector/src/main/res/drawable-xhdpi | wc -l | sed "s/ //g"`
|
||||
numberOfFiles4=`ls -1U ./vector/src/main/res/drawable-xxhdpi | wc -l | sed "s/ //g"`
|
||||
numberOfFiles5=`ls -1U ./vector/src/main/res/drawable-xxxhdpi | wc -l | sed "s/ //g"`
|
||||
|
||||
if [[ ${numberOfFiles1} -eq ${numberOfFiles5} ]] && [[ ${numberOfFiles2} -eq ${numberOfFiles5} ]] && [[ ${numberOfFiles3} -eq ${numberOfFiles5} ]] && [[ ${numberOfFiles4} -eq ${numberOfFiles5} ]]; then
|
||||
resultNbOfDrawable=0
|
||||
|
|
@ -65,7 +65,7 @@ echo
|
|||
echo "Search for forbidden patterns in code..."
|
||||
|
||||
${searchForbiddenStringsScript} ./tools/check/forbidden_strings_in_code.txt \
|
||||
./app/src/main/java
|
||||
./vector/src/main/java
|
||||
|
||||
resultForbiddenStringInCode=$?
|
||||
|
||||
|
|
@ -73,11 +73,11 @@ echo
|
|||
echo "Search for forbidden patterns in resources..."
|
||||
|
||||
${searchForbiddenStringsScript} ./tools/check/forbidden_strings_in_resources.txt \
|
||||
./app/src/main/res/color \
|
||||
./app/src/main/res/layout \
|
||||
./app/src/main/res/values \
|
||||
./app/src/main/res/values-v21 \
|
||||
./app/src/main/res/xml
|
||||
./vector/src/main/res/color \
|
||||
./vector/src/main/res/layout \
|
||||
./vector/src/main/res/values \
|
||||
./vector/src/main/res/values-v21 \
|
||||
./vector/src/main/res/xml
|
||||
|
||||
resultForbiddenStringInResource=$?
|
||||
|
||||
|
|
@ -106,10 +106,10 @@ echo
|
|||
echo "Search for long files..."
|
||||
|
||||
${checkLongFilesScript} 2000 \
|
||||
./app/src/main/java \
|
||||
./app/src/main/res/layout \
|
||||
./app/src/main/res/values \
|
||||
./app/src/main/res/values-v21 \
|
||||
./vector/src/main/java \
|
||||
./vector/src/main/res/layout \
|
||||
./vector/src/main/res/values \
|
||||
./vector/src/main/res/values-v21 \
|
||||
|
||||
resultLongFiles=$?
|
||||
|
||||
|
|
@ -120,7 +120,7 @@ resultLongFiles=$?
|
|||
echo
|
||||
echo "Search for png files in /drawable..."
|
||||
|
||||
ls -1U ./app/src/main/res/drawable/*.png
|
||||
ls -1U ./vector/src/main/res/drawable/*.png
|
||||
resultTmp=$?
|
||||
|
||||
# Inverse the result, cause no file found is an error for ls but this is what we want!
|
||||
|
|
|
|||
|
|
@ -64,48 +64,48 @@ echo
|
|||
echo "Copy strings to Riot"
|
||||
echo
|
||||
|
||||
cp ../riot-android/vector/src/main/res/values/strings.xml ./app/src/main/res/values/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-ar/strings.xml ./app/src/main/res/values-ar/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-bg/strings.xml ./app/src/main/res/values-bg/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-bn-rIN/strings.xml ./app/src/main/res/values-bn-rIN/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-bs/strings.xml ./app/src/main/res/values-bs/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-ca/strings.xml ./app/src/main/res/values-ca/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-cs/strings.xml ./app/src/main/res/values-cs/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-da/strings.xml ./app/src/main/res/values-da/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-de/strings.xml ./app/src/main/res/values-de/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-el/strings.xml ./app/src/main/res/values-el/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-eo/strings.xml ./app/src/main/res/values-eo/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-es/strings.xml ./app/src/main/res/values-es/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-es-rMX/strings.xml ./app/src/main/res/values-es-rMX/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-eu/strings.xml ./app/src/main/res/values-eu/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-fa/strings.xml ./app/src/main/res/values-fa/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-fi/strings.xml ./app/src/main/res/values-fi/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-fr/strings.xml ./app/src/main/res/values-fr/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-fr-rCA/strings.xml ./app/src/main/res/values-fr-rCA/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-gl/strings.xml ./app/src/main/res/values-gl/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-hu/strings.xml ./app/src/main/res/values-hu/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-id/strings.xml ./app/src/main/res/values-id/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-in/strings.xml ./app/src/main/res/values-in/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-is/strings.xml ./app/src/main/res/values-is/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-it/strings.xml ./app/src/main/res/values-it/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-ja/strings.xml ./app/src/main/res/values-ja/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-ko/strings.xml ./app/src/main/res/values-ko/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-lv/strings.xml ./app/src/main/res/values-lv/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-nl/strings.xml ./app/src/main/res/values-nl/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-nn/strings.xml ./app/src/main/res/values-nn/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-pl/strings.xml ./app/src/main/res/values-pl/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-pt/strings.xml ./app/src/main/res/values-pt/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-pt-rBR/strings.xml ./app/src/main/res/values-pt-rBR/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-ru/strings.xml ./app/src/main/res/values-ru/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-sk/strings.xml ./app/src/main/res/values-sk/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-sq/strings.xml ./app/src/main/res/values-sq/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-te/strings.xml ./app/src/main/res/values-te/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-th/strings.xml ./app/src/main/res/values-th/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-tlh/strings.xml ./app/src/main/res/values-tlh/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-tr/strings.xml ./app/src/main/res/values-tr/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-uk/strings.xml ./app/src/main/res/values-uk/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-zh-rCN/strings.xml ./app/src/main/res/values-zh-rCN/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-zh-rTW/strings.xml ./app/src/main/res/values-zh-rTW/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values/strings.xml ./vector/src/main/res/values/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-ar/strings.xml ./vector/src/main/res/values-ar/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-bg/strings.xml ./vector/src/main/res/values-bg/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-bn-rIN/strings.xml ./vector/src/main/res/values-bn-rIN/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-bs/strings.xml ./vector/src/main/res/values-bs/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-ca/strings.xml ./vector/src/main/res/values-ca/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-cs/strings.xml ./vector/src/main/res/values-cs/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-da/strings.xml ./vector/src/main/res/values-da/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-de/strings.xml ./vector/src/main/res/values-de/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-el/strings.xml ./vector/src/main/res/values-el/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-eo/strings.xml ./vector/src/main/res/values-eo/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-es/strings.xml ./vector/src/main/res/values-es/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-es-rMX/strings.xml ./vector/src/main/res/values-es-rMX/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-eu/strings.xml ./vector/src/main/res/values-eu/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-fa/strings.xml ./vector/src/main/res/values-fa/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-fi/strings.xml ./vector/src/main/res/values-fi/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-fr/strings.xml ./vector/src/main/res/values-fr/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-fr-rCA/strings.xml ./vector/src/main/res/values-fr-rCA/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-gl/strings.xml ./vector/src/main/res/values-gl/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-hu/strings.xml ./vector/src/main/res/values-hu/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-id/strings.xml ./vector/src/main/res/values-id/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-in/strings.xml ./vector/src/main/res/values-in/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-is/strings.xml ./vector/src/main/res/values-is/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-it/strings.xml ./vector/src/main/res/values-it/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-ja/strings.xml ./vector/src/main/res/values-ja/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-ko/strings.xml ./vector/src/main/res/values-ko/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-lv/strings.xml ./vector/src/main/res/values-lv/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-nl/strings.xml ./vector/src/main/res/values-nl/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-nn/strings.xml ./vector/src/main/res/values-nn/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-pl/strings.xml ./vector/src/main/res/values-pl/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-pt/strings.xml ./vector/src/main/res/values-pt/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-pt-rBR/strings.xml ./vector/src/main/res/values-pt-rBR/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-ru/strings.xml ./vector/src/main/res/values-ru/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-sk/strings.xml ./vector/src/main/res/values-sk/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-sq/strings.xml ./vector/src/main/res/values-sq/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-te/strings.xml ./vector/src/main/res/values-te/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-th/strings.xml ./vector/src/main/res/values-th/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-tlh/strings.xml ./vector/src/main/res/values-tlh/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-tr/strings.xml ./vector/src/main/res/values-tr/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-uk/strings.xml ./vector/src/main/res/values-uk/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-zh-rCN/strings.xml ./vector/src/main/res/values-zh-rCN/strings.xml
|
||||
cp ../riot-android/vector/src/main/res/values-zh-rTW/strings.xml ./vector/src/main/res/values-zh-rTW/strings.xml
|
||||
|
||||
|
||||
echo
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ android {
|
|||
flavorDimensions "store"
|
||||
|
||||
productFlavors {
|
||||
appgplay {
|
||||
gplay {
|
||||
dimension "store"
|
||||
|
||||
buildConfigField "boolean", "ALLOW_FCM_USE", "true"
|
||||
|
|
@ -95,7 +95,7 @@ android {
|
|||
buildConfigField "String", "FLAVOR_DESCRIPTION", "\"GooglePlay\""
|
||||
}
|
||||
|
||||
appfdroid {
|
||||
fdroid {
|
||||
dimension "store"
|
||||
|
||||
buildConfigField "boolean", "ALLOW_FCM_USE", "false"
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue