mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-19 15:01:53 +02:00
Code Issues Releases Wiki Activity

upgrade dependencies

Browse Source
This commit is contained in:
oliexdev
2021-08-21 16:24:05 +02:00
parent 67bf8dd13b
commit 49e4cd8867
3 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
android_app/app/build.gradle
View File

@@ -130,18 +130,18 @@ android {
}
dependencies {
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.1'
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
implementation 'com.google.android.material:material:1.3.0-alpha04'
implementation 'com.google.android.material:material:1.5.0-alpha02'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'androidx.recyclerview:recyclerview:1.1.0'
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
implementation 'androidx.appcompat:appcompat:1.3.1'
implementation 'androidx.recyclerview:recyclerview:1.2.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
implementation 'androidx.preference:preference:1.1.1'
implementation 'androidx.navigation:navigation-fragment:2.3.2'
implementation 'androidx.navigation:navigation-ui:2.3.2'
implementation 'androidx.navigation:navigation-fragment:2.3.5'
implementation 'androidx.navigation:navigation-ui:2.3.5'
implementation "android.arch.lifecycle:extensions:1.1.1"
annotationProcessor "android.arch.lifecycle:compiler:1.1.1"
annotationProcessor "androidx.lifecycle:lifecycle-common-java8:2.3.1"
// MPAndroidChart
implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'
@@ -153,21 +153,21 @@ dependencies {
implementation 'cat.ereza:customactivityoncrash:2.3.0'
// AppIntro
implementation 'com.github.AppIntro:AppIntro:6.0.0'
implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.4.10'
implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.4.32'
// Room
implementation 'androidx.room:room-runtime:2.2.5'
annotationProcessor 'androidx.room:room-compiler:2.2.5'
androidTestImplementation 'androidx.room:room-testing:2.2.5'
implementation 'androidx.room:room-runtime:2.3.0'
annotationProcessor 'androidx.room:room-compiler:2.3.0'
androidTestImplementation 'androidx.room:room-testing:2.3.0'
// Timber
implementation 'com.jakewharton.timber:timber:4.7.1'
// Local unit tests
testImplementation 'junit:junit:4.13.1'
// Instrumented unit tests
androidTestImplementation 'androidx.annotation:annotation:1.1.0'
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
androidTestImplementation 'androidx.test:rules:1.3.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.3.0'
androidTestImplementation 'androidx.annotation:annotation:1.2.0'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test:rules:1.4.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.4.0'
}
tasks.withType(Test) {

6
android_app/build.gradle
View File

@@ -2,12 +2,11 @@
buildscript {
repositories {
google()
jcenter()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.1.0'
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.3.1"
classpath 'com.android.tools.build:gradle:7.0.1'
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.3.5"
}
}
@@ -15,7 +14,6 @@ allprojects {
repositories {
maven { url 'https://maven.google.com' }
maven { url 'https://jitpack.io' }
jcenter()
mavenCentral()
}
}

2
android_app/gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -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-7.0.2-bin.zip