From 15b9dccb5294e63592aa41127262600aef5036a8 Mon Sep 17 00:00:00 2001 From: Alexandr Fonari Date: Mon, 29 Jul 2019 20:28:57 +0000 Subject: [PATCH 1/4] Update .travis.yml --- .travis.yml | 74 ++++++++++++++++++++++++++--------------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/.travis.yml b/.travis.yml index 61ea2108b2..f55d83dae3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,55 +1,55 @@ -# FTR: Configuration on https://travis-ci.org/vector-im/riot-android/settings -# -# - Build only if .travis.yml is present -> On -# - Limit concurrent jobs -> Off -# - Build pushed branches -> On (build the branch) -# - Build pushed pull request -> On (build the PR after auto-merge) -# -# - Auto cancel branch builds -> On -# - Auto cancel pull request builds -> On - language: android +dist: trusty +sudo: required jdk: oraclejdk8 -sudo: false -notifications: - email: false +env: + global: + - ANDROID_API_LEVEL=28 + - ANDROID_BUILD_TOOLS_VERSION=28.0.3 + - ANDROID_ABI=armeabi-v7a android: components: - # Uncomment the lines below if you want to - # use the latest revision of Android SDK Tools - tools - platform-tools - - # The BuildTools version used by your project - - build-tools-28.0.3 - - # The SDK version used to compile your project - - android-28 + - tools + - extra-android-m2repository + licenses: + - 'android-sdk-preview-license-52d11cd2' + - 'android-sdk-license-.+' + - 'google-gdk-license-.+' + +before_install: + - touch $HOME/.android/repositories.cfg + - yes | sdkmanager "platforms;android-28" + - yes | sdkmanager "build-tools;28.0.3" + - yes | sdkmanager "ndk-bundle" before_cache: - - rm -fr $HOME/.gradle/caches + - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock + - rm -fr $HOME/.gradle/caches/*/plugin-resolution/ cache: directories: -# Travis is not happy with gradle cache (getting permission denied) -# - $HOME/.gradle/caches/ + - $HOME/.gradle/caches/ + - $HOME/.gradle/wrapper/ + - $HOME/.android/build-cache -# Build with the development SDK before_script: - - /bin/sh ./set_debug_env.sh + - chmod +x gradlew # Just build the project for now script: - # Build app (assembleAppRelease assembleAppfdroidRelease) - # Build Android test (assembleAndroidTest) - # Code quality (lintAppRelease lintAppfdroidRelease) - - ./gradlew clean assembleAppRelease assembleAppfdroidRelease assembleAndroidTest lintAppRelease lintAppfdroidRelease --stacktrace - # Run unitary test (Disable for now, see https://travis-ci.org/vector-im/riot-android/builds/502504370) - # - ./gradlew testAppReleaseUnitTest --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 ./vector/src/main/res/values-id/strings.xml ./vector/src/main/res/values-in/strings.xml + - ./gradlew assembleAppDebug + +deploy: + provider: releases + file: "vector/build/outputs/apk/app/debug/vector-app-debug.apk" + skip_cleanup: true + draft: true + on: + branch: limified-fdroid + api_key: + secure: "qh/v61K0ZP/C29FG57JC3sPeVlJw3D2VXA+M5sym+GMR5mOQd3RkofB4kdSwma0zj6AiEVaTBZ+VWnadLBAOW9avz7BqS2MUn8EbU8dAunwuHiyoMwfq4hPofolt7ftpOO5PaBb3pBYcJdld/94ai+yix11IpxShvM/li5AS+XnAYYne4NQ82GedftPl4pdMsbtla0CBD3lmg1GZzJNALZUvvoxE9lXwkRfPT7bq6pGM+yHkCrCYpIjIyuSCGi5bV6d5uAz8XPXL6C20Gd/kaI47OrkyMvVMZJwCQMSlycwOtiPIv6hWX4v8yb1NQ7NtlHOREM/JwMaDhyeCLwLP+uGDfshA96xD+9z4glySYbxn50orc/DRD6QkfBJW219KTcMRHtueR7VZZl0K1vMjmEzioP6mabyrsZE96fxxJAMBfwgsrozb/gHtHRimoHcs3R4rNu8CLgjolKTesdkhSvbSjasUotKqP9OXE+8kSqojToRQurmnRqcYTpORlOi1/8DTaEoXZu4fDKgOwod2N3fvxK5sxp66yF9yWC+76yR0UMU8sL/ZXVUoO5q3Duteqqk5GytQkUREsQO46cPaUEJY3/tBS9YCeTcPiaM4veOaWZGEkds4jPbromUpa/GFhj8/vEmC4QYZ/U/u9tU8a7IgDwqd5GaWDCuGED5YvfY=" + From 9a3de3b9a6f5654c325d923453f9ea61bf93d022 Mon Sep 17 00:00:00 2001 From: Alexandr Fonari Date: Mon, 29 Jul 2019 20:41:42 +0000 Subject: [PATCH 2/4] Update build.gradle --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 56d96b29c7..99b304440a 100755 --- a/build.gradle +++ b/build.gradle @@ -41,9 +41,9 @@ allprojects { url 'https://jitpack.io' content { // Use this repo only for matrix SDK library - includeGroupByRegex "com\\.github\\.matrix-org" + includeGroupByRegex "com\\.github\\.Bubu" // Also add subgroups, due to SDK split into modules - includeGroupByRegex "com\\.github\\.matrix-org\\.matrix-android-sdk" + includeGroupByRegex "com\\.github\\.Bubu\\.matrix-android-sdk" // And Olm library includeGroupByRegex "org\\.matrix\\.gitlab\\.matrix-org" // And PhotoView From fd51a6f5f91556c3329ab613ca9dcf3f10097e46 Mon Sep 17 00:00:00 2001 From: Sasha Fonari Date: Mon, 29 Jul 2019 17:03:48 -0400 Subject: [PATCH 3/4] Fix --- .travis.yml | 2 +- vector/src/main/java/im/vector/activity/LoginActivity.java | 1 + vector/src/main/res/values/config.xml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f55d83dae3..831127c635 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,7 +49,7 @@ deploy: skip_cleanup: true draft: true on: - branch: limified-fdroid + branch: patch-1 api_key: secure: "qh/v61K0ZP/C29FG57JC3sPeVlJw3D2VXA+M5sym+GMR5mOQd3RkofB4kdSwma0zj6AiEVaTBZ+VWnadLBAOW9avz7BqS2MUn8EbU8dAunwuHiyoMwfq4hPofolt7ftpOO5PaBb3pBYcJdld/94ai+yix11IpxShvM/li5AS+XnAYYne4NQ82GedftPl4pdMsbtla0CBD3lmg1GZzJNALZUvvoxE9lXwkRfPT7bq6pGM+yHkCrCYpIjIyuSCGi5bV6d5uAz8XPXL6C20Gd/kaI47OrkyMvVMZJwCQMSlycwOtiPIv6hWX4v8yb1NQ7NtlHOREM/JwMaDhyeCLwLP+uGDfshA96xD+9z4glySYbxn50orc/DRD6QkfBJW219KTcMRHtueR7VZZl0K1vMjmEzioP6mabyrsZE96fxxJAMBfwgsrozb/gHtHRimoHcs3R4rNu8CLgjolKTesdkhSvbSjasUotKqP9OXE+8kSqojToRQurmnRqcYTpORlOi1/8DTaEoXZu4fDKgOwod2N3fvxK5sxp66yF9yWC+76yR0UMU8sL/ZXVUoO5q3Duteqqk5GytQkUREsQO46cPaUEJY3/tBS9YCeTcPiaM4veOaWZGEkds4jPbromUpa/GFhj8/vEmC4QYZ/U/u9tU8a7IgDwqd5GaWDCuGED5YvfY=" diff --git a/vector/src/main/java/im/vector/activity/LoginActivity.java b/vector/src/main/java/im/vector/activity/LoginActivity.java index 7de19f60bd..2bc96ac424 100644 --- a/vector/src/main/java/im/vector/activity/LoginActivity.java +++ b/vector/src/main/java/im/vector/activity/LoginActivity.java @@ -583,6 +583,7 @@ public void onClick(View view) { } }); + mUseCustomHomeServersCheckbox.setChecked(true); mUseCustomHomeServersCheckbox.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { diff --git a/vector/src/main/res/values/config.xml b/vector/src/main/res/values/config.xml index 9b6ffc98d9..a9b619e6ff 100755 --- a/vector/src/main/res/values/config.xml +++ b/vector/src/main/res/values/config.xml @@ -7,7 +7,7 @@ https://vector.im https://matrix.org https://matrix.org - https://vector.im + https://localhost https://matomo.riot.im 1 AndroidMatomoTracker From 18228bf1150811053a71c4f39e74dd5e6132efdd Mon Sep 17 00:00:00 2001 From: Alexandr Fonari Date: Tue, 30 Jul 2019 11:30:15 +0000 Subject: [PATCH 4/4] Update .travis.yml --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 831127c635..66f52f5e35 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,6 @@ android: components: - tools - platform-tools - - tools - extra-android-m2repository licenses: - 'android-sdk-preview-license-52d11cd2'