Skip to content
This repository has been archived by the owner on Jan 13, 2022. It is now read-only.

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
svenjacobs committed Feb 8, 2021
1 parent bcf2a50 commit a15cba3
Show file tree
Hide file tree
Showing 9 changed files with 35 additions and 38 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
## Version 1.14.1

_2021-02-08_

This is a maintenance release, just updating a few dependencies:

* Kotlin 1.4.30
* Android Gradle Plugin 4.1.2
* Android build tools 30.0.3

## Version 1.14.0

_2020-09-11_

This is a maintenance release, just updating a few dependencies:

* Kotlin 1.4.0
Expand Down
14 changes: 7 additions & 7 deletions android-example/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -46,20 +46,20 @@ dependencies {
implementation(project(":androidx-fragment"))
implementation(project(":androidx-viewmodel-savedstate"))
implementation("androidx.appcompat:appcompat:1.2.0")
implementation("androidx.constraintlayout:constraintlayout:2.0.1")
implementation("org.jetbrains.kotlin:kotlin-reflect:1.4.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9")
implementation("androidx.constraintlayout:constraintlayout:2.0.4")
implementation("org.jetbrains.kotlin:kotlin-reflect:1.4.30")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.2")
implementation("org.jetbrains.anko:anko-coroutines:0.10.8")
implementation("com.squareup.retrofit2:retrofit:2.9.0")
implementation("com.squareup.retrofit2:converter-moshi:2.9.0")
implementation("com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2")
implementation("com.squareup.moshi:moshi:1.10.0")
implementation("com.squareup.moshi:moshi-kotlin:1.10.0") {
implementation("com.squareup.moshi:moshi:1.11.0")
implementation("com.squareup.moshi:moshi-kotlin:1.11.0") {
exclude(group = "org.jetbrains.kotlin")
}

debugImplementation("com.squareup.leakcanary:leakcanary-android:2.4")
debugImplementation("com.squareup.leakcanary:leakcanary-android:2.6")

androidTestImplementation("androidx.test.espresso:espresso-core:3.3.0")
androidTestImplementation("androidx.test:runner:1.3.0")
Expand Down
6 changes: 3 additions & 3 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ repositories {
}

dependencies {
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.0")
implementation("com.android.tools.build:gradle:4.0.1")
implementation("de.mannodermaus.gradle.plugins:android-junit5:1.6.2.0")
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.30")
implementation("com.android.tools.build:gradle:4.1.2")
implementation("de.mannodermaus.gradle.plugins:android-junit5:1.7.0.0")
implementation("org.jetbrains.dokka:dokka-gradle-plugin:0.9.18")
implementation("digital.wup:android-maven-publish:3.6.3")
implementation("de.marcphilipp.gradle:nexus-publish-plugin:0.4.0")
Expand Down
14 changes: 7 additions & 7 deletions buildSrc/src/main/kotlin/Dependencies.kt
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
object Versions {
const val androidJunit5GradlePlugin = "1.6.2.0"
const val androidPlugin = "4.0.1"
const val androidJunit5GradlePlugin = "1.7.0.0"
const val androidPlugin = "4.1.2"
const val androidXCollection = "1.1.0"
const val androidXFragment = "1.2.5"
const val androidXLifecycle = "2.2.0"
const val gradleVersionsPlugin = "0.31.0"
const val kluent = "1.61"
const val kotlin = "1.4.0"
const val spek = "2.0.12"
const val gradleVersionsPlugin = "0.36.0"
const val kluent = "1.65"
const val kotlin = "1.4.30"
const val spek = "2.0.15"
}

object Dependencies {
Expand All @@ -29,5 +29,5 @@ object Android {
const val compileSdkVersion = 30
const val targetSdkVersion = 30
const val minSdkVersion = 14
const val buildToolsVersion = "30.0.2"
const val buildToolsVersion = "30.0.3"
}
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/Version.kt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
object Version {
const val version = "1.14.0"
const val version = "1.14.1"
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ fi
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`

JAVACMD=`cygpath --unix "$JAVACMD"`

# We build the pattern for arguments to be converted via cygpath
Expand Down
21 changes: 3 additions & 18 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome

set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto init
if "%ERRORLEVEL%" == "0" goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Expand All @@ -54,7 +54,7 @@ goto fail
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto init
if exist "%JAVA_EXE%" goto execute

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
Expand All @@ -64,29 +64,14 @@ echo location of your Java installation.

goto fail

:init
@rem Get command-line arguments, handling Windows variants

if not "%OS%" == "Windows_NT" goto win9xME_args

:win9xME_args
@rem Slurp the command line arguments.
set CMD_LINE_ARGS=
set _SKIP=2

:win9xME_args_slurp
if "x%~1" == "x" goto execute

set CMD_LINE_ARGS=%*

:execute
@rem Setup the command line

set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar


@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*

:end
@rem End local scope for the variables with windows NT shell
Expand Down

0 comments on commit a15cba3

Please sign in to comment.