diff --git a/.travis.yml b/.travis.yml index a00309da9293..f9236d44f961 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,7 @@ android: - extra-android-support - platform-tools - tools - - build-tools-27.0.3 + - build-tools-28.0.3 - android-27 env: diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 927280be2f1b..c455b26968b1 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath 'io.fabric.tools:gradle:1.+' + classpath 'io.fabric.tools:gradle:1.27.0' classpath 'com.google.gms:google-services:3.2.0' } } @@ -39,7 +39,7 @@ android { } compileSdkVersion 27 - buildToolsVersion '27.0.3' + buildToolsVersion '28.0.3' defaultConfig { applicationId "org.wordpress.android" @@ -161,7 +161,7 @@ dependencies { implementation 'org.wordpress:graphview:3.4.0' implementation 'org.wordpress:persistentedittext:1.0.2' implementation 'org.wordpress:emailchecker2:1.1.0' - implementation 'com.squareup.okio:okio:1.13.0' + implementation 'com.squareup.okio:okio:1.14.0' implementation 'org.apache.commons:commons-text:1.1' implementation 'com.airbnb.android:lottie:2.0.0-rc2' implementation 'com.facebook.shimmer:shimmer:0.3.0' @@ -185,7 +185,7 @@ dependencies { androidTestImplementation 'org.objenesis:objenesis:2.1' androidTestImplementation 'org.mockito:mockito-core:1.10.19' androidTestImplementation 'com.squareup.okhttp:mockwebserver:2.7.5' - androidTestImplementation 'com.squareup.okio:okio:1.13.0' + androidTestImplementation 'com.squareup.okio:okio:1.14.0' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2', { exclude group: 'com.android.support', module: 'support-annotations' } @@ -250,18 +250,6 @@ configurations.all { exclude group: 'org.wordpress', module: 'analytics' } -task copyGoogleServicesExampleFile(type: Copy) { - from('.') - into('.') - include('google-services.json-example') - rename('google-services.json-example', 'google-services.json') -} - -task copyGoogleServicesBuddybuildFile(type: Copy) { - from(file(System.getenv("BUDDYBUILD_SECURE_FILES") + "/google-services.json")) - into('.') -} - task generateCrashlyticsConfig(group: "generate", description: "Generate Crashlytics config") { def outputFile = new File("${rootDir}/WordPress/crashlytics.properties") def inputFile = checkGradlePropertiesFile() @@ -300,11 +288,11 @@ android.buildTypes.all { buildType -> // If Google services file doesn't exist... if (!file("google-services.json").exists()) { // ... copy example file. - if (!file(System.getenv("BUDDYBUILD_SECURE_FILES") + "/google-services.json").exists()) { - tasks.copyGoogleServicesExampleFile.execute() - // ... copy Buddybuild file. - } else { - tasks.copyGoogleServicesBuddybuildFile.execute() + copy { + from(".") + into(".") + include("google-services.json-example") + rename('google-services.json-example', 'google-services.json') } } @@ -317,11 +305,7 @@ android.buildTypes.all { buildType -> def checkGradlePropertiesFile() { def inputFile = file("${rootDir}/gradle.properties") if (!inputFile.exists()) { - // Try the BuddyBuild provided file if it's there - inputFile = file(System.getenv("BUDDYBUILD_SECURE_FILES") + "/gradle.properties") - if (!inputFile.exists()) { - throw new StopActionException("Build configuration file gradle.properties doesn't exist, follow README instructions") - } + throw new StopActionException("Build configuration file gradle.properties doesn't exist, follow README instructions") } return inputFile } diff --git a/WordPress/lint-baseline.xml b/WordPress/lint-baseline.xml index ecc7d73a71f9..f8e65e572de4 100644 --- a/WordPress/lint-baseline.xml +++ b/WordPress/lint-baseline.xml @@ -1,28 +1,6 @@ - - - - - - - - - - - - - - - - diff --git a/WordPress/src/main/java/org/wordpress/android/util/analytics/service/InstallationReferrerServiceLogic.java b/WordPress/src/main/java/org/wordpress/android/util/analytics/service/InstallationReferrerServiceLogic.java index b94ee88734c2..610ae9c4d546 100644 --- a/WordPress/src/main/java/org/wordpress/android/util/analytics/service/InstallationReferrerServiceLogic.java +++ b/WordPress/src/main/java/org/wordpress/android/util/analytics/service/InstallationReferrerServiceLogic.java @@ -104,6 +104,10 @@ public void onInstallReferrerSetupFinished(int responseCode) { // if this is retried but the error persists AppLog.i(T.UTILS, "installation referrer: service unavailable"); break; + case InstallReferrerResponse.DEVELOPER_ERROR: + break; + case InstallReferrerResponse.SERVICE_DISCONNECTED: + break; } stopService(); diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml index b1e56319fb0e..7485f5b42e84 100644 --- a/WordPress/src/main/res/values/strings.xml +++ b/WordPress/src/main/res/values/strings.xml @@ -1395,7 +1395,7 @@ Posts couldn\'t be refreshed at this time - Pages couldn\'t be refreshed at this time + Pages couldn\'t be refreshed at this time Comments couldn\'t be refreshed at this time Comments couldn\'t be refreshed at this time - showing older comments Stats couldn\'t be refreshed at this time diff --git a/build.gradle b/build.gradle index c142c1485e7f..36b7b3582af7 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.1.3' + classpath 'com.android.tools.build:gradle:3.2.1' classpath 'com.automattic.android:fetchstyle:1.1' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7058d77786cf..34a2bcd1ef78 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Mar 28 12:21:02 CEST 2018 +#Tue Jan 22 14:59:58 GMT 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip diff --git a/libs/analytics/WordPressAnalytics/build.gradle b/libs/analytics/WordPressAnalytics/build.gradle index 5fa51c0ef80d..cc750e767f39 100644 --- a/libs/analytics/WordPressAnalytics/build.gradle +++ b/libs/analytics/WordPressAnalytics/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.2' + classpath 'com.android.tools.build:gradle:3.2.1' classpath 'com.novoda:bintray-release:0.8.1' } } @@ -27,7 +27,7 @@ dependencies { android { compileSdkVersion 27 - buildToolsVersion "27.0.3" + buildToolsVersion "28.0.3" defaultConfig { versionName "1.3.0" diff --git a/libs/editor/.travis.yml b/libs/editor/.travis.yml index d7038f25d17d..919acf7b5345 100644 --- a/libs/editor/.travis.yml +++ b/libs/editor/.travis.yml @@ -7,7 +7,7 @@ android: - extra-android-support - platform-tools - tools - - build-tools-27.0.3 + - build-tools-28.0.3 - android-27 env: diff --git a/libs/editor/WordPressEditor/build.gradle b/libs/editor/WordPressEditor/build.gradle index 56d2aea985e2..d54696387ba7 100644 --- a/libs/editor/WordPressEditor/build.gradle +++ b/libs/editor/WordPressEditor/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.2' + classpath 'com.android.tools.build:gradle:3.2.1' } } @@ -26,7 +26,7 @@ apply from: 'https://gist.githubusercontent.com/hypest/f526fe0775dedce0ce0133f14 android { compileSdkVersion 27 - buildToolsVersion '27.0.3' + buildToolsVersion '28.0.3' defaultConfig { versionCode 13 @@ -66,12 +66,14 @@ dependencies { if (rootProject.ext.buildGutenbergFromSource) { implementation (project(':react-native-gutenberg-bridge')) { exclude group: 'com.squareup.okhttp3' + exclude group: 'com.google.code.findbugs' } } else { implementation (waitJitpack('com.github.wordpress-mobile', 'gutenberg-mobile', submoduleGitHash('../../../', 'libs/gutenberg-mobile'))) { // Inheriting RN's okhttp version can interfere with FluxC SSL handling // See https://github.com/wordpress-mobile/WordPress-Android/issues/9032 and https://github.com/wordpress-mobile/WordPress-FluxC-Android/issues/919 exclude group: 'com.squareup.okhttp3' + exclude group: 'com.google.code.findbugs' } } diff --git a/libs/editor/example/build.gradle b/libs/editor/example/build.gradle index 1de2e3988b0d..64bf72d2271b 100644 --- a/libs/editor/example/build.gradle +++ b/libs/editor/example/build.gradle @@ -4,7 +4,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.2' + classpath 'com.android.tools.build:gradle:3.2.1' } } diff --git a/libs/login/.travis.yml b/libs/login/.travis.yml index 9b4e4590cddb..25718a39ff70 100644 --- a/libs/login/.travis.yml +++ b/libs/login/.travis.yml @@ -7,7 +7,7 @@ android: - extra-android-support - platform-tools - tools - - build-tools-27.0.3 + - build-tools-28.0.3 - android-27 env: diff --git a/libs/login/WordPressLoginFlow/build.gradle b/libs/login/WordPressLoginFlow/build.gradle index 9623d1a447ce..52086cba4d3c 100644 --- a/libs/login/WordPressLoginFlow/build.gradle +++ b/libs/login/WordPressLoginFlow/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.3' + classpath 'com.android.tools.build:gradle:3.2.1' } } @@ -18,7 +18,7 @@ repositories { android { compileSdkVersion 27 - buildToolsVersion "27.0.3" + buildToolsVersion "28.0.3" defaultConfig { minSdkVersion 16 diff --git a/libs/networking/WordPressNetworking/build.gradle b/libs/networking/WordPressNetworking/build.gradle index 802842a44d59..f43203cf6425 100644 --- a/libs/networking/WordPressNetworking/build.gradle +++ b/libs/networking/WordPressNetworking/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.2' + classpath 'com.android.tools.build:gradle:3.2.1' } } @@ -19,7 +19,7 @@ apply plugin: 'maven' android { compileSdkVersion 27 - buildToolsVersion '27.0.3' + buildToolsVersion '28.0.3' defaultConfig { minSdkVersion 14 diff --git a/libs/utils/.travis.yml b/libs/utils/.travis.yml index 50943bf9b3be..6f7cf632ebc6 100644 --- a/libs/utils/.travis.yml +++ b/libs/utils/.travis.yml @@ -7,7 +7,7 @@ android: - extra-android-support - platform-tools - tools - - build-tools-27.0.3 + - build-tools-28.0.3 - android-27 env: diff --git a/libs/utils/WordPressUtils/build.gradle b/libs/utils/WordPressUtils/build.gradle index 1b528cf55718..32ede13bd340 100644 --- a/libs/utils/WordPressUtils/build.gradle +++ b/libs/utils/WordPressUtils/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.2' + classpath 'com.android.tools.build:gradle:3.2.1' classpath 'com.novoda:bintray-release:0.8.1' } } @@ -31,7 +31,7 @@ android { useLibrary 'org.apache.http.legacy' compileSdkVersion 27 - buildToolsVersion '27.0.3' + buildToolsVersion '28.0.3' defaultConfig { versionName "1.22"