diff --git a/app/build.gradle b/app/build.gradle index b352036..80fae7a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -37,22 +37,22 @@ dependencies { implementation project(':client') implementation fileTree(dir: 'libs', include: ['*.jar']) implementation 'androidx.appcompat:appcompat:1.1.0' - implementation 'com.google.android.material:material:1.0.0' - implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta3' + implementation 'com.google.android.material:material:1.1.0' + implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta5' implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation 'androidx.vectordrawable:vectordrawable:1.1.0' - testImplementation 'junit:junit:4.12' + testImplementation 'junit:junit:4.13' androidTestImplementation 'androidx.test:runner:1.2.0' androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' - implementation 'com.jakewharton:butterknife:10.2.0' - annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.0' + implementation 'com.jakewharton:butterknife:10.2.1' + annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.1' implementation 'com.hypertrack:hyperlog:0.0.10' implementation 'com.squareup.picasso:picasso:2.71828' - implementation 'io.noties.markwon:core:4.2.0' - implementation 'io.noties.markwon:image-picasso:4.2.0' - implementation 'io.noties.markwon:image:4.2.0' - implementation 'io.noties.markwon:ext-tables:4.2.0' + implementation 'io.noties.markwon:core:4.3.1' + implementation 'io.noties.markwon:image-picasso:4.3.1' + implementation 'io.noties.markwon:image:4.3.1' + implementation 'io.noties.markwon:ext-tables:4.3.1' } configurations { diff --git a/build.gradle b/build.gradle index db7dee2..b0cb412 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.2' + classpath 'com.android.tools.build:gradle:3.6.3' // NOTE: Do not place your application dependencies here; they belong diff --git a/client/build.gradle b/client/build.gradle index 6e8726a..409ba3d 100644 --- a/client/build.gradle +++ b/client/build.gradle @@ -6,10 +6,11 @@ version = '1.0.0' buildscript { repositories { + google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.+' + classpath 'com.android.tools.build:gradle:3.6.3' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' } } @@ -65,7 +66,7 @@ if(hasProperty('target') && target == 'android') { task sourcesJar(type: Jar) { from android.sourceSets.main.java.srcDirs - classifier = 'sources' + archiveClassifier = 'sources' } artifacts { @@ -96,9 +97,9 @@ ext { oltu_version = "1.0.2" retrofit_version = "2.5.0" swagger_annotations_version = "1.5.15" - junit_version = "4.12" - threetenbp_version = "1.3.5" - json_fire_version = "1.8.0" + junit_version = "4.13" + threetenbp_version = "1.4.4" + json_fire_version = "1.8.4" } dependencies { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 330a009..551967a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Oct 27 11:22:02 CEST 2018 +#Fri May 08 13:09:14 CEST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip