diff options
Diffstat (limited to 'gradle.properties')
| -rw-r--r-- | gradle.properties | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/gradle.properties b/gradle.properties index 3e449ebc..c080daa0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,7 +14,11 @@ 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 @@ -56,7 +60,13 @@ MATERIAL_DRAWER_KT=2.0.1 # https://github.com/square/okhttp/releases 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 |