diff options
| author | Allan Wang <me@allanwang.ca> | 2019-04-21 20:22:11 -0400 |
|---|---|---|
| committer | Allan Wang <me@allanwang.ca> | 2019-04-21 20:22:11 -0400 |
| commit | bbafb7b65ce655c1fdda8badd3098d2a0e1f7f08 (patch) | |
| tree | 354b0bb6f021af54d1e3586e3e9bda064ad4ef02 /gradle.properties | |
| parent | e5eb928feacba8d1c634ad8e5d85259ae161cabd (diff) | |
| parent | f0f95295bdb2b853aa6262ec4bed2353ce326eee (diff) | |
| download | frost-bbafb7b65ce655c1fdda8badd3098d2a0e1f7f08.tar.gz frost-bbafb7b65ce655c1fdda8badd3098d2a0e1f7f08.tar.bz2 frost-bbafb7b65ce655c1fdda8badd3098d2a0e1f7f08.zip | |
Merge dev
Diffstat (limited to 'gradle.properties')
| -rw-r--r-- | gradle.properties | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/gradle.properties b/gradle.properties index 146591bb..c080daa0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,23 +14,27 @@ org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryErro APP_ID=Frost APP_GROUP=com.pitchedapps +<<<<<<< HEAD KAU=4.0.0-alpha02 +======= +KAU=4.0.0 +>>>>>>> dev KOTLIN=1.3.21 # https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google ANDROID_GRADLE=3.3.2 # https://github.com/diffplug/spotless/blob/master/plugin-gradle/CHANGES.md -SPOTLESS=3.17.0 +SPOTLESS=3.21.1 # https://github.com/bugsnag/bugsnag-android/releases -BUGSNAG=4.9.3 +BUGSNAG=4.12.0 # https://github.com/bugsnag/bugsnag-android-gradle-plugin/releases -BUGSNAG_PLUGIN=3.6.0 +BUGSNAG_PLUGIN=4.1.1 # https://github.com/KeepSafe/dexcount-gradle-plugin/releases DEX_PLUGIN=0.8.5 # https://github.com/gladed/gradle-android-git-version/releases -GIT_PLUGIN=0.4.7 +GIT_PLUGIN=0.4.9 # https://mvnrepository.com/artifact/org.apache.commons/commons-text # Updates blocked due to javax.script dependency COMMONS_TEXT=1.4 @@ -41,7 +45,7 @@ EXOMEDIA=4.3.0 # https://github.com/InsertKoinIO/koin/blob/master/CHANGELOG.md KOIN=1.0.2 # https://github.com/mockk/mockk/releases -MOCKK=1.8.13.kotlin13 +MOCKK=1.9.3 # https://mvnrepository.com/artifact/androidx.core/core-ktx?repo=google KTX=1.0.1 @@ -54,11 +58,15 @@ LEAK_CANARY=1.6.2 # https://github.com/zsmb13/MaterialDrawerKt/releases MATERIAL_DRAWER_KT=2.0.1 # https://github.com/square/okhttp/releases -OKHTTP=3.12.1 +OKHTTP=3.14.0 # http://robolectric.org/getting-started/ +<<<<<<< HEAD ROBOELECTRIC=4.1 # https://developer.android.com/jetpack/androidx/releases/room ROOM=2.1.0-alpha04 +======= +ROBOELECTRIC=4.2 +>>>>>>> dev # https://github.com/davemorrissey/subsampling-scale-image-view#quick-start SCALE_IMAGE_VIEW=3.10.0 # https://github.com/umano/AndroidSlidingUpPanel#importing-the-library |