From a1962a723d8de537765c5002e19063add9b0a02f Mon Sep 17 00:00:00 2001 From: Gregor Santner Date: Mon, 18 Jul 2016 11:59:10 +0200 Subject: [PATCH] Fix Travis CI -> SDK 24 --- .travis.yml | 26 +++++++++++-------- CHANGELOG.md | 8 +++--- README.md | 6 ++--- .../diaspora_android/data/AppSettings.java | 2 +- .../diaspora_android/data/PodUserProfile.java | 2 +- .../WebUserProfileChangedListener.java | 2 +- .../task/ImageDownloadTask.java | 2 +- .../task/ProfileFetchTask.java | 2 +- .../ui/CustomWebViewClient.java | 2 +- .../util/AvatarImageLoader.java | 2 +- app/src/main/res/values-de/strings.xml | 8 +++--- app/src/main/res/values-fr/strings.xml | 6 ++--- app/src/main/res/values/strings.xml | 6 ++--- 13 files changed, 35 insertions(+), 39 deletions(-) diff --git a/.travis.yml b/.travis.yml index 241a133b..64b00d3f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,20 +1,24 @@ language: android - -sudo: false - jdk: - - oraclejdk7 - + - oraclejdk8 android: components: - - platform-tools - tools - - android-23 - - build-tools-23.0.3 - - extra-google-m2repository + - tools # TODO https://github.com/travis-ci/travis-ci/issues/6193 + - platform-tools + - build-tools-24.0.0 + - android-24 - extra-android-m2repository - -script: ./gradlew build check --stacktrace +before_cache: + - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock +cache: + directories: + - $HOME/.gradle/caches/ + - $HOME/.gradle/wrapper/ +script: "./gradlew $TASK" +env: + - TASK="lintDebug" + - TASK="build check --stacktrace" notifications: webhooks: diff --git a/CHANGELOG.md b/CHANGELOG.md index 687a3d64..c19b49db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,7 @@ - Big thanks and good luck to @scoute-dich and @martinchodev for accompanying this project :) # v0.1.2 (2016-06-05) -- Extract and show aspects (by @gsantner) +- Extract and show aspects (by @sangre) - Cache last podlist - Better sharing from app - Collapsing top menu @@ -25,7 +25,7 @@ # v0.1.1 - Sharing updated (by @scoute-dich) - Screenshotting updated -- Gitter integration (by @gsantner) +- Gitter integration (by @sangre) - Code refactoring - Start working on #6 - Waffle.io integration @@ -37,10 +37,10 @@ First version of the organization *Diaspora for Android* Consists mostly of code from: - Diaspora-Native-Webapp (by @martinchodev ) - scoutedich additions (by @scoute-dich) -- gsantner additions (by @gsantner) +- sangre additions (by @sangre) ### v1.3 (scoutedich) -*big thanks to gsantner* +*big thanks to sangre* - gitignore - Link to profile - Move menu actions diff --git a/README.md b/README.md index 33da3e2d..2b292c34 100644 --- a/README.md +++ b/README.md @@ -35,9 +35,7 @@ The minimum version supported is Ice Cream Sandwitch, Android version 4.0.3 (or ### App Permissions It requires access to the Internet and to external storage to be able to upload photos when creating a new post and for taking screenshots. -## Main contributors +## Maintainers -- gsantner () -- martinchodev () -- scoute-dich () +- sangre () - vanitasvitae () diff --git a/app/src/main/java/com/github/dfa/diaspora_android/data/AppSettings.java b/app/src/main/java/com/github/dfa/diaspora_android/data/AppSettings.java index d6e92215..babfe15a 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/data/AppSettings.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/data/AppSettings.java @@ -5,7 +5,7 @@ import android.content.Context; import android.content.SharedPreferences; /** - * Created by gsantner on 20.03.16. Part of Diaspora for Android. + * Created by sangre on 20.03.16. Part of Diaspora for Android. */ public class AppSettings { private final SharedPreferences prefApp; diff --git a/app/src/main/java/com/github/dfa/diaspora_android/data/PodUserProfile.java b/app/src/main/java/com/github/dfa/diaspora_android/data/PodUserProfile.java index fa95a7b4..af684131 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/data/PodUserProfile.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/data/PodUserProfile.java @@ -11,7 +11,7 @@ import org.json.JSONException; import org.json.JSONObject; /** - * Created by gsantner on 24.03.16. Part of Diaspora for Android. + * Created by sangre on 24.03.16. Part of Diaspora for Android. */ public class PodUserProfile { private static final int MINIMUM_WEBUSERPROFILE_LOAD_TIMEDIFF = 5000; diff --git a/app/src/main/java/com/github/dfa/diaspora_android/listener/WebUserProfileChangedListener.java b/app/src/main/java/com/github/dfa/diaspora_android/listener/WebUserProfileChangedListener.java index 37788b6a..963647ce 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/listener/WebUserProfileChangedListener.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/listener/WebUserProfileChangedListener.java @@ -1,7 +1,7 @@ package com.github.dfa.diaspora_android.listener; /** - * Created by Gregor Santner (gsantner) on 26.03.16. + * Created by Gregor Santner (sangre) on 26.03.16. */ public interface WebUserProfileChangedListener { void onUserProfileNameChanged(String name); diff --git a/app/src/main/java/com/github/dfa/diaspora_android/task/ImageDownloadTask.java b/app/src/main/java/com/github/dfa/diaspora_android/task/ImageDownloadTask.java index d9059344..3ae1d118 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/task/ImageDownloadTask.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/task/ImageDownloadTask.java @@ -19,7 +19,7 @@ import info.guardianproject.netcipher.NetCipher; /** * Task that can be used to download images from URLs and store them in storage - * Created by Gregor Santner (gsantner) on 24.03.16. + * Created by Gregor Santner (sangre) on 24.03.16. */ public class ImageDownloadTask extends AsyncTask { ImageView imageView; diff --git a/app/src/main/java/com/github/dfa/diaspora_android/task/ProfileFetchTask.java b/app/src/main/java/com/github/dfa/diaspora_android/task/ProfileFetchTask.java index 2771a4b7..4bec9d05 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/task/ProfileFetchTask.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/task/ProfileFetchTask.java @@ -20,7 +20,7 @@ import info.guardianproject.netcipher.NetCipher; /** * AsyncTask to fetch a users profile - * Created by Gregor Santner (gsantner) on 30.03.16. + * Created by Gregor Santner (sangre) on 30.03.16. */ public class ProfileFetchTask extends AsyncTask { // Code for getting the profile async without any UI/WebView diff --git a/app/src/main/java/com/github/dfa/diaspora_android/ui/CustomWebViewClient.java b/app/src/main/java/com/github/dfa/diaspora_android/ui/CustomWebViewClient.java index 42b5fd4f..0377f64a 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/ui/CustomWebViewClient.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/ui/CustomWebViewClient.java @@ -11,7 +11,7 @@ import android.webkit.WebViewClient; import com.github.dfa.diaspora_android.App; /** - * Created by Gregor Santner (gsantner) on 04.06.16. + * Created by Gregor Santner (sangre) on 04.06.16. */ public class CustomWebViewClient extends WebViewClient { private App app; diff --git a/app/src/main/java/com/github/dfa/diaspora_android/util/AvatarImageLoader.java b/app/src/main/java/com/github/dfa/diaspora_android/util/AvatarImageLoader.java index e65c173a..e7201df7 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/util/AvatarImageLoader.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/util/AvatarImageLoader.java @@ -10,7 +10,7 @@ import com.github.dfa.diaspora_android.task.ImageDownloadTask; import java.io.File; /** - * Created by Gregor Santner (gsantner) on 24.03.16. + * Created by Gregor Santner (sangre) on 24.03.16. */ public class AvatarImageLoader { private File avatarFile; diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 18643d09..c6162c05 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -121,11 +121,9 @@ <b>Sonderzeichen</b><br> Du kannst Symbole und Sonderzeichen nutzen, indem du bestimmte Zeichenfolgen verwendest. Z.B.:<br> (c) = © ; (r) = ® ; x^2 = x²" - <b>Beteiligte:</b><br> + <b>Maintainer:</b><br> - • gsantner https://gsantner.github.io<br> - • martinchodev https://github.com/martinchodev<br> - • scoute-dich https://github.com/scoute-dich<br> <br> + • sangre https://sangre.gitlab.io<br> • vanitasvitae https://github.com/vanitasvitae<br> <br> This program is free software: you can redistribute it and/or modify @@ -157,7 +155,7 @@ along with this program. If not, see http://www.gnu.org/licenses.<br> <br Linkadresse kopiert … Teilen… Warnung: Proxy konnte nicht aktiviert werden… - + Mobil-/Desktopansicht umschalten diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index da1c1469..13e2e3be 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -116,11 +116,9 @@ Vous pouvez créez les symboles et autres caractères spéciaux suivants en utilisant une combinaison de caractères :<br> (c) = © ; (r) = ® ; x^2 = x²" - <b>Principaux contributeurs :</b><br> + <b>Mainteneur :</b><br> - • gsantner https://gsantner.github.io<br> - • martinchodev https://github.com/martinchodev<br> - • scoute-dich https://github.com/scoute-dich<br> <br> + • sangre https://sangre.gitlab.io<br> • vanitasvitae https://github.com/vanitasvitae<br> <br> This program is free software: you can redistribute it and/or modify diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index eb1cf7a4..c4b87b82 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -131,11 +131,9 @@ (c) = © ; (r) = ® ; x^2 = x²" Copyright © 2015–2016 - <b>Main Contributors:</b><br> + <b>Maintainers:</b><br> - • gsantner https://gsantner.github.io<br> - • martinchodev https://github.com/martinchodev<br> - • scoute-dich https://github.com/scoute-dich<br> <br> + • sangre https://sangre.gitlab.io<br> • vanitasvitae https://github.com/vanitasvitae<br> <br> This program is free software: you can redistribute it and/or modify