diff --git a/android-example/build.gradle.kts b/android-example/build.gradle.kts index 6182560..b269466 100644 --- a/android-example/build.gradle.kts +++ b/android-example/build.gradle.kts @@ -5,9 +5,10 @@ buildscript { } plugins { - id("com.android.application") version "3.3.0" - kotlin("android") version "1.3.21" - kotlin("android.extensions") version "1.3.21" + id("com.android.application") version "3.4.0" + kotlin("android") version "1.3.30" + kotlin("android.extensions") version "1.3.30" + id("com.github.ben-manes.versions") version "0.21.0" } android { @@ -30,8 +31,8 @@ dependencies { implementation("org.rewedigital.katana:katana-androidx-viewmodel:1.6.0") implementation("androidx.appcompat:appcompat:1.0.2") implementation("androidx.constraintlayout:constraintlayout:1.1.3") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.1") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.1.1") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.2.0") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.2.0") implementation("org.jetbrains.anko:anko-coroutines:0.10.8") implementation("com.squareup.retrofit2:retrofit:2.5.0") implementation("com.squareup.retrofit2:converter-moshi:2.5.0") @@ -51,3 +52,19 @@ repositories { google() jcenter() } + +tasks.named("dependencyUpdates") { + resolutionStrategy { + componentSelection { + all { + val rejected = listOf("alpha", "beta", "rc", "cr", "m", "preview", "b", "ea") + .map { qualifier -> Regex("(?i).*[.-]$qualifier[.\\d-+]*") } + .any { it.matches(candidate.version) } + if (rejected) { + reject("Release candidate") + } + } + } + } +} + diff --git a/android-example/gradle/wrapper/gradle-wrapper.jar b/android-example/gradle/wrapper/gradle-wrapper.jar index 94336fc..5c2d1cf 100644 Binary files a/android-example/gradle/wrapper/gradle-wrapper.jar and b/android-example/gradle/wrapper/gradle-wrapper.jar differ diff --git a/android-example/gradle/wrapper/gradle-wrapper.properties b/android-example/gradle/wrapper/gradle-wrapper.properties index 51fb1c4..ed5aaee 100644 --- a/android-example/gradle/wrapper/gradle-wrapper.properties +++ b/android-example/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/android-example/gradlew b/android-example/gradlew index cccdd3d..b0d6d0a 100755 --- a/android-example/gradlew +++ b/android-example/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 +# +# http://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" diff --git a/android-example/gradlew.bat b/android-example/gradlew.bat index f955316..9991c50 100644 --- a/android-example/gradlew.bat +++ b/android-example/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 http://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 diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index 8f9785d..486da3e 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -1,7 +1,7 @@ object Versions { - const val androidJunit5GradlePlugin = "1.4.0.0" + const val androidJunit5GradlePlugin = "1.4.2.0" const val androidMavenPublishPlugin = "3.6.2" - const val androidPlugin = "3.3.2" + const val androidPlugin = "3.4.0" const val androidXCollection = "1.0.0" const val androidXFragment = "1.0.0" const val androidXLifecycleExtensions = "2.0.0" @@ -10,8 +10,8 @@ object Versions { const val dokkaPlugin = "0.9.18" const val gradleVersionsPlugin = "0.21.0" const val kluent = "1.49" - const val kotlin = "1.3.21" - const val spek = "2.0.0" + const val kotlin = "1.3.30" + const val spek = "2.0.2" } object Dependencies { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 94336fc..5c2d1cf 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 51fb1c4..ed5aaee 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-5.3.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index cccdd3d..b0d6d0a 100755 --- a/gradlew +++ b/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 +# +# http://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" diff --git a/gradlew.bat b/gradlew.bat index f955316..9991c50 100644 --- a/gradlew.bat +++ b/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 http://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