diff --git a/Source/Android/app/build.gradle b/Source/Android/app/build.gradle index 996082801f..e88d2e768f 100644 --- a/Source/Android/app/build.gradle +++ b/Source/Android/app/build.gradle @@ -79,22 +79,22 @@ android { } dependencies { - coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.1' + coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' implementation 'androidx.appcompat:appcompat:1.2.0' implementation 'androidx.exifinterface:exifinterface:1.3.2' implementation 'androidx.cardview:cardview:1.0.0' - implementation 'androidx.recyclerview:recyclerview:1.1.0' + implementation 'androidx.recyclerview:recyclerview:1.2.0' implementation 'androidx.constraintlayout:constraintlayout:2.0.4' - implementation 'androidx.lifecycle:lifecycle-viewmodel:2.2.0' - implementation 'com.google.android.material:material:1.2.1' + implementation 'androidx.lifecycle:lifecycle-viewmodel:2.3.1' + implementation 'com.google.android.material:material:1.3.0' // Android TV UI libraries. implementation 'androidx.leanback:leanback:1.0.0' implementation 'androidx.tvprovider:tvprovider:1.0.0' // For REST calls - implementation 'com.android.volley:volley:1.1.1' + implementation 'com.android.volley:volley:1.2.0' // For loading huge screenshots from the disk. implementation 'com.squareup.picasso:picasso:2.71828' @@ -110,7 +110,7 @@ def getVersion() { .trim() .replaceAll(/(-0)?-[^-]+$/, "") } catch (Exception e) { - logger.error('Cannot find git, defaulting to dummy version number') + logger.error(e + ': Cannot find git, defaulting to dummy version number') } return versionNumber @@ -121,10 +121,10 @@ def getBuildVersionCode() { try { def versionNumber = 'git rev-list --first-parent --count HEAD'.execute([], project.rootDir).text .trim() - return Integer.valueOf(versionNumber); + return Integer.valueOf(versionNumber) } catch (Exception e) { - logger.error('Cannot find git, defaulting to dummy version number') + logger.error(e + ': Cannot find git, defaulting to dummy version number') } - return 1; + return 1 } diff --git a/Source/Android/build.gradle b/Source/Android/build.gradle index b314920053..c6b43eea63 100644 --- a/Source/Android/build.gradle +++ b/Source/Android/build.gradle @@ -1,16 +1,16 @@ buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.1.1' + classpath 'com.android.tools.build:gradle:4.2.0' } } allprojects { repositories { google() - jcenter() + mavenCentral() } } diff --git a/Source/Android/gradle/wrapper/gradle-wrapper.properties b/Source/Android/gradle/wrapper/gradle-wrapper.properties index 2e0405a11f..1ca7d8a13b 100644 --- a/Source/Android/gradle/wrapper/gradle-wrapper.properties +++ b/Source/Android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip