diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 80ec513..8f7e6c8 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -7,7 +7,7 @@ import kotlin.String * * YOU are responsible for updating manually the dependency version. */ object Versions { - const val appcompat: String = "1.0.0" + const val appcompat: String = "1.0.2" const val constraintlayout_solver: String = "1.1.3" @@ -25,17 +25,17 @@ object Versions { const val jackson_module_kotlin: String = "2.9.7" - const val shadow: String = "4.0.2" + const val shadow: String = "4.0.3" - const val com_github_johnrengelman_shadow_gradle_plugin: String = "4.0.2" + const val com_github_johnrengelman_shadow_gradle_plugin: String = "4.0.3" //available: "4.0.3" const val material: String = "1.0.0" const val jmfayard_github_io_gradle_kotlin_dsl_libs_gradle_plugin: String = "0.2.6" - const val org_jetbrains_kotlin: String = "1.3.0" + const val org_jetbrains_kotlin: String = "1.3.10" - const val org_junit_jupiter: String = "5.3.1" + const val org_junit_jupiter: String = "5.3.2" /** * @@ -43,12 +43,12 @@ object Versions { * ./gradle/wrapper/gradle-wrapper.properties */ object Gradle { - const val runningVersion: String = "4.10.2" + const val runningVersion: String = "5.0" - const val currentVersion: String = "4.10.2" + const val currentVersion: String = "5.0" - const val nightlyVersion: String = "5.1-20181103000035+0000" + const val nightlyVersion: String = "5.1-20181130102259+0000" - const val releaseCandidate: String = "5.0-rc-1" + const val releaseCandidate: String = "" } } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 5ca3858..29953ea 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e0b3fb8..75b8c7c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index af6708f..cccdd3d 100755 --- a/gradlew +++ b/gradlew @@ -28,7 +28,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='"-Xmx64m"' +DEFAULT_JVM_OPTS="" # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" diff --git a/gradlew.bat b/gradlew.bat index 6d57edc..f955316 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,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="-Xmx64m" +set DEFAULT_JVM_OPTS= @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome