Updated Gradle wrapper and dependencies

build.gradle

@@ -1,17 +1,17 @@
 buildscript {
  ext {
  //version here to share between build script and projects
- verKotlin = '1.2.71'
+ verKotlin = '1.3.50'
  }
  repositories {
  google()
  jcenter()
  }
  dependencies {
- classpath 'com.android.tools.build:gradle:3.2.1'
+ classpath 'com.android.tools.build:gradle:3.5.0'
  classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$verKotlin"
  classpath "org.jetbrains.kotlin:kotlin-android-extensions:$verKotlin"
- classpath 'com.github.ben-manes:gradle-versions-plugin:0.20.0'
+ classpath 'com.github.ben-manes:gradle-versions-plugin:0.25.0'
  classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
  }
 }
@@ -36,12 +36,12 @@ ext {
  targetCompatibilityVersion = JavaVersion.VERSION_1_7
 
  // Define all dependencies in the base project, to unify & make it easy to update
- rxJava = 'io.reactivex.rxjava2:rxjava:2.2.3'
- rxAndroid = 'io.reactivex.rxjava2:rxandroid:2.1.0'
+ rxJava = 'io.reactivex.rxjava2:rxjava:2.2.12'
+ rxAndroid = 'io.reactivex.rxjava2:rxandroid:2.1.1'
  navi = 'com.trello.navi2:navi:2.1.0'
- lifecycle = "android.arch.lifecycle:runtime:$lifecycleRuntimeVersion"
- lifecycleProcessor = "android.arch.lifecycle:compiler:$lifecycleVersion"
- lifecycleExtensions = "android.arch.lifecycle:extensions:$lifecycleVersion"
+ lifecycle = "androidx.lifecycle:lifecycle-runtime:$lifecycleRuntimeVersion"
+ lifecycleProcessor = "androidx.lifecycle:lifecycle-compiler:$lifecycleVersion"
+ lifecycleExtensions = "androidx.lifecycle:lifecycle-extensions:$lifecycleVersion"
  kotlinStdlib = "org.jetbrains.kotlin:kotlin-stdlib:$verKotlin"
  appCompat = "androidx.appcompat:appcompat:$supportLibVersion"
  preferenceCompat = "androidx.preference:preference:$supportLibVersion"

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\:https://services.gradle.org/distributions/gradle-4.10.2-all.zip
+distributionUrl=https\:https://services.gradle.org/distributions/gradle-5.6.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ## Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -109,8 +125,8 @@ if $darwin; then
  GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
  APP_HOME=`cygpath --path --mixed "$APP_HOME"`
  CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
  JAVACMD=`cygpath --unix "$JAVACMD"`

gradlew.bat

@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

rxlifecycle-android-lifecycle/build.gradle

@@ -20,12 +20,12 @@ dependencies {
 
  implementation rootProject.ext.rxAndroid
  implementation rootProject.ext.supportAnnotations
- api 'androidx.lifecycle:lifecycle-runtime:2.0.0'
- annotationProcessor 'androidx.lifecycle:lifecycle-compiler:2.0.0'
+ api rootProject.ext.lifecycle
+ annotationProcessor rootProject.ext.lifecycleProcessor
 
  testImplementation rootProject.ext.junit
  testImplementation rootProject.ext.robolectric
- testImplementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
+ testImplementation rootProject.ext.lifecycleExtensions
 }
 
 apply from: "$rootDir/gradle/artifacts.gradle"