AtaraxiaDev/cryptomator-android
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge branch 'main' into develop

Browse Source
This commit is contained in:
Julian Raufelder 2021-11-29 17:49:39 +01:00
commit 571a57b1fe
No known key found for this signature in database
GPG Key ID: 17EE71F6634E381D
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@ -2,7 +2,7 @@ apply from: 'buildsystem/dependencies.gradle'
apply plugin: "com.vanniktech.android.junit.jacoco" apply plugin: "com.vanniktech.android.junit.jacoco"
buildscript { buildscript {
ext.kotlin_version = '1.5.31' ext.kotlin_version = '1.6.0'
repositories { repositories {
mavenCentral() mavenCentral()
google() google()
@ -39,7 +39,7 @@ allprojects {
ext { ext {
androidApplicationId = 'org.cryptomator' androidApplicationId = 'org.cryptomator'
androidVersionCode = getVersionCode() androidVersionCode = getVersionCode()
androidVersionName = '1.7.0-SNAPSHOT' androidVersionName = '1.6.0-SNAPSHOT'
} }
repositories { repositories {
mavenCentral() mavenCentral()

10
buildsystem/dependencies.gradle
View File

@ -29,12 +29,12 @@ ext {
rxAndroidVersion = '2.1.1' rxAndroidVersion = '2.1.1'
rxBindingVersion = '2.2.0' rxBindingVersion = '2.2.0'
daggerVersion = '2.40' daggerVersion = '2.40.2'
gsonVersion = '2.8.8' gsonVersion = '2.8.9'
okHttpVersion = '4.9.2' okHttpVersion = '4.9.2'
okHttpDigestVersion = '2.5' okHttpDigestVersion = '2.6'
velocityVersion = '2.3' velocityVersion = '2.3'
@ -74,9 +74,9 @@ ext {
// testing dependencies // testing dependencies
jUnitVersion = '5.8.1' jUnitVersion = '5.8.2'
assertJVersion = '1.7.1' assertJVersion = '1.7.1'
mockitoVersion = '4.0.0' mockitoVersion = '4.1.0'
mockitoKotlinVersion = '4.0.0' mockitoKotlinVersion = '4.0.0'
hamcrestVersion = '1.3' hamcrestVersion = '1.3'
dexmakerVersion = '1.0' dexmakerVersion = '1.0'