From 3442f018e93de122caf57f059e875026a2bb878e Mon Sep 17 00:00:00 2001 From: Gregor Santner Date: Tue, 6 Feb 2018 23:11:18 +0100 Subject: [PATCH] Update buildscript --- .github/PULL_REQUEST_TEMPLATE | 13 ++------ .gitignore | 1 + .../activity/DiasporaStreamFragment.java | 10 +++++- build.gradle | 33 ++++++++++++------- 4 files changed, 34 insertions(+), 23 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE b/.github/PULL_REQUEST_TEMPLATE index c9066316..4028d569 100644 --- a/.github/PULL_REQUEST_TEMPLATE +++ b/.github/PULL_REQUEST_TEMPLATE @@ -1,17 +1,11 @@ - - -Fixes issue # - -Proposed changes in this pull request: - -- -- - diff --git a/.gitignore b/.gitignore index 199f51ef..6aa6839b 100644 --- a/.gitignore +++ b/.gitignore @@ -96,6 +96,7 @@ app/src/main/res/raw/changelog.* app/src/main/res/raw/license.* app/src/main/res/raw/readme.* app/src/main/res/raw/contributors.* +app/flavor* # Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) !gradle-wrapper.jar diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/DiasporaStreamFragment.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/DiasporaStreamFragment.java index 8bee4277..08882d5d 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/activity/DiasporaStreamFragment.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/DiasporaStreamFragment.java @@ -325,8 +325,16 @@ public class DiasporaStreamFragment extends BrowserFragment { @SuppressWarnings("unused") @JavascriptInterface public void setUserProfile(final String webMessage) throws JSONException { - final DiasporaUserProfile pup = ((App) getActivity().getApplication()).getDiasporaUserProfile(); + App app = ((App) getActivity().getApplication()); + final DiasporaUserProfile pup = app.getDiasporaUserProfile(); if (pup.isRefreshNeeded()) { + try { + // Try to very fail-safe check if user information gets really loaded from correct pod + if (!webView.getUrl().startsWith(app.getSettings().getPod().getPodUrl().getBaseUrl())) { + return; + } + } catch (Exception ignored) { + } AppLog.v(this, "DiasporaUserProfile needs refresh; Try to parse JSON"); pup.parseJson(webMessage); getActivity().runOnUiThread(new Runnable() { diff --git a/build.gradle b/build.gradle index 9d32794b..39719601 100644 --- a/build.gradle +++ b/build.gradle @@ -4,18 +4,20 @@ buildscript { ext.version_setup_compileSdk = 27 ext.version_setup_minSdk = 17 ext.version_setup_targetSdk = ext.version_setup_compileSdk - ext.version_setup_buildTools = "27.0.1" // Specifying optional + ext.version_setup_buildTools = "27.0.3" // Specifying optional + // https://developer.android.com/studio/releases/gradle-plugin.html + ext.version_gradle_tools = "3.0.1" // https://developer.android.com/topic/libraries/support-library/revisions.html - ext.version_library_appcompat = "27.0.1" + ext.version_library_appcompat = "27.0.2" // https://github.com/JakeWharton/butterknife/releases ext.version_library_butterknife = "8.8.1" // https://github.com/atlassian/commonmark-java/releases ext.version_library_commonmark = "0.10.0" // https://github.com/guardianproject/NetCipher/releases ext.version_library_netcipher = "2.0.0-alpha1" - // https://github.com/JetBrains/kotlin/blob/master/ReadMe.md - ext.version_plugin_kotlin = "1.1.60" + // https://mvnrepository.com/artifact/org.jetbrains.kotlin/kotlin-gradle-plugin#LookAtCentral + ext.version_plugin_kotlin = "1.2.10" ext.enable_plugin_kotlin = false repositories { @@ -23,7 +25,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' + classpath "com.android.tools.build:gradle:$version_gradle_tools" classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' if (project.enable_plugin_kotlin) { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$version_plugin_kotlin" @@ -41,18 +43,22 @@ allprojects { mavenCentral() maven { url "https://jitpack.io" } } + + tasks.matching { task -> task.name.matches('.*generate.*Resources') }.all { + task -> task.dependsOn copyRepoFiles + } } task clean(type: Delete) { delete rootProject.buildDir } -final String[] ROOT_TO_RAW_COPYFILES = ["README.md", "CHANGELOG.md", "CONTRIBUTORS.md","LICENSE.txt","LICENSE.md","LICENSE"] +final String[] ROOT_TO_RAW_COPYFILES = ["README.md", "CHANGELOG.md", "CONTRIBUTORS.md", "LICENSE.txt", "LICENSE.md", "LICENSE"] task copyRepoFiles(type: Copy) { from rootProject.files(ROOT_TO_RAW_COPYFILES) into "app/src/main/res/raw" rename { String fileName -> fileName.replace(fileName, fileName.toLowerCase()) } -}; tasks.copyRepoFiles.execute() +} @SuppressWarnings(["UnnecessaryQualifiedReference", "SpellCheckingInspection", "GroovyUnusedDeclaration"]) @@ -73,10 +79,13 @@ static String getUsedAndroidLanguages() { } ext.getGitHash = { -> - def stdout = new ByteArrayOutputStream() - exec { - commandLine 'git', 'rev-parse', 'HEAD' - standardOutput = stdout + try { + def stdout = new ByteArrayOutputStream() exec { + commandLine 'git', 'rev-parse', 'HEAD' + standardOutput = stdout + } + return stdout.toString().trim() + } catch (Exception e) { + return '???' } - return stdout.toString().trim() }