ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Android: bump gradle & dependencies version 

jecenter() is EOL, so swap that out with mavenCentral()
This commit is contained in:
sspacelynx 2021-05-10 12:27:34 +02:00
parent eb5cd9be78
commit ac77f8207e
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Source/Android/app/build.gradle
View File

@ -79,22 +79,22 @@ android {
} }
dependencies { 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.appcompat:appcompat:1.2.0'
implementation 'androidx.exifinterface:exifinterface:1.3.2' implementation 'androidx.exifinterface:exifinterface:1.3.2'
implementation 'androidx.cardview:cardview:1.0.0' 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.constraintlayout:constraintlayout:2.0.4'
implementation 'androidx.lifecycle:lifecycle-viewmodel:2.2.0' implementation 'androidx.lifecycle:lifecycle-viewmodel:2.3.1'
implementation 'com.google.android.material:material:1.2.1' implementation 'com.google.android.material:material:1.3.0'
// Android TV UI libraries. // Android TV UI libraries.
implementation 'androidx.leanback:leanback:1.0.0' implementation 'androidx.leanback:leanback:1.0.0'
implementation 'androidx.tvprovider:tvprovider:1.0.0' implementation 'androidx.tvprovider:tvprovider:1.0.0'
// For REST calls // 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. // For loading huge screenshots from the disk.
implementation 'com.squareup.picasso:picasso:2.71828' implementation 'com.squareup.picasso:picasso:2.71828'
@ -110,7 +110,7 @@ def getVersion() {
.trim() .trim()
.replaceAll(/(-0)?-[^-]+$/, "") .replaceAll(/(-0)?-[^-]+$/, "")
} catch (Exception e) { } 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 return versionNumber
@ -121,10 +121,10 @@ def getBuildVersionCode() {
try { try {
def versionNumber = 'git rev-list --first-parent --count HEAD'.execute([], project.rootDir).text def versionNumber = 'git rev-list --first-parent --count HEAD'.execute([], project.rootDir).text
.trim() .trim()
return Integer.valueOf(versionNumber); return Integer.valueOf(versionNumber)
} catch (Exception e) { } 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
} }

6
Source/Android/build.gradle
View File

@ -1,16 +1,16 @@
buildscript { buildscript {
repositories { repositories {
google() google()
jcenter() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.1.1' classpath 'com.android.tools.build:gradle:4.2.0'
} }
} }
allprojects { allprojects {
repositories { repositories {
google() google()
jcenter() mavenCentral()
} }
} }

2
Source/Android/gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists 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