Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(dependencies): Upgrade gradle and dependencies #243

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

chore(dependencies): Upgrade gradle and dependencies #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ dependencies {
implementation supportDependencies.preference
implementation 'com.afollestad.material-dialogs:core:0.9.6.0'
implementation 'com.afollestad.material-dialogs:commons:0.9.6.0'
implementation('com.mikepenz:materialdrawer:6.0.8@aar') {
implementation('com.mikepenz:materialdrawer:6.0.8') {
transitive = true
}
implementation 'com.pnikosis:materialish-progress:1.7'
Expand All @@ -96,27 +96,27 @@ dependencies {
exclude group: 'com.android.support', module: 'appcompat-v7'
exclude group: 'com.android.support', module: 'design'
}
implementation 'com.github.florent37:expansionpanel:1.1.1'
implementation 'commons-io:commons-io:2.6'
implementation 'com.github.florent37:expansionpanel:1.2.4'
implementation 'commons-io:commons-io:2.11.0'
implementation 'androidx.multidex:multidex:2.0.1'
implementation 'androidx.activity:activity:1.2.0-alpha08'
implementation 'androidx.fragment:fragment:1.3.0-alpha08'
implementation 'net.lingala.zip4j:zip4j:1.3.2'
implementation 'com.github.daniel-stoneuk:material-about-library:2.2.4'
implementation 'androidx.activity:activity:1.2.4'
implementation 'androidx.fragment:fragment:1.3.6'
implementation 'net.lingala.zip4j:zip4j:1.3.3'
implementation 'com.github.daniel-stoneuk:material-about-library:3.1.2'
implementation 'com.github.apl-devs:appintro:v4.2.3'
implementation 'com.andrognito.pinlockview:pinlockview:2.1.0'
implementation 'com.andrognito.patternlockview:patternlockview:1.0.0'
implementation 'com.multidots:fingerprint-auth:1.0.1'
implementation 'com.github.PhilJay:MPAndroidChart:v3.0.3'
implementation 'com.github.ronaldsmartin:Material-ViewPagerIndicator:1.0.4'
implementation 'com.jaredrummler:material-spinner:1.2.5'
implementation 'org.dmfs:lib-recur:0.11.1'
implementation 'com.opencsv:opencsv:4.4'
implementation 'com.jaredrummler:material-spinner:1.3.1'
implementation 'org.dmfs:lib-recur:0.12.2'
implementation 'com.opencsv:opencsv:4.6'
implementation 'net.sourceforge.jexcelapi:jxl:2.6.12'
implementation 'com.itextpdf:itextpdf:5.5.13'
implementation 'me.weishu:free_reflection:2.2.0'
implementation 'com.github.bumptech.glide:glide:4.8.0'
annotationProcessor 'com.github.bumptech.glide:compiler:4.8.0'
implementation 'com.itextpdf:itextpdf:5.5.13.3'
implementation 'me.weishu:free_reflection:3.0.1'
implementation 'com.github.bumptech.glide:glide:4.13.2'
annotationProcessor 'com.github.bumptech.glide:compiler:4.13.2'
// google play dependencies
proprietaryImplementation('com.dropbox.core:dropbox-core-sdk:3.0.8')
proprietaryImplementation googlePlayServices.auth
Expand All @@ -127,12 +127,12 @@ dependencies {
// floss dependencies
osmImplementation 'org.osmdroid:osmdroid-android:6.1.1'
// test dependencies (local tests)
testImplementation 'junit:junit:4.12'
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.mockito:mockito-core:3.6.28'
// android test dependencies (on-device tests)
androidTestImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test:core:1.2.0'
androidTestImplementation 'androidx.test:runner:1.2.0'
androidTestImplementation 'androidx.test:rules:1.2.0'
androidTestUtil "androidx.test:orchestrator:1.2.0"
androidTestImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test:core:1.4.0'
androidTestImplementation 'androidx.test:runner:1.4.0'
androidTestImplementation 'androidx.test:rules:1.4.0'
androidTestUtil "androidx.test:orchestrator:1.4.1"
}
24 changes: 12 additions & 12 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.0.1'
classpath 'com.android.tools.build:gradle:7.3.0'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
Expand All @@ -45,20 +45,20 @@ ext {
supportLib: "27.1.1"
]
supportDependencies = [
appcompat : 'androidx.appcompat:appcompat:1.0.0',
recyclerview : 'androidx.recyclerview:recyclerview:1.0.0',
appcompat : 'androidx.appcompat:appcompat:1.3.1',
recyclerview : 'androidx.recyclerview:recyclerview:1.2.1',
cardview: 'androidx.cardview:cardview:1.0.0',
annotations : 'androidx.annotation:annotation:1.0.0',
design : 'com.google.android.material:material:1.0.0',
preference: 'androidx.preference:preference:1.0.0',
constraintlayout : 'androidx.constraintlayout:constraintlayout:1.1.3'
annotations : 'androidx.annotation:annotation:1.4.0',
design : 'com.google.android.material:material:1.4.0',
preference: 'androidx.preference:preference:1.1.1',
constraintlayout : 'androidx.constraintlayout:constraintlayout:2.1.4'
]
googlePlayServices = [
auth: "com.google.android.gms:play-services-auth:15.0.1",
signin: "com.google.android.gms:play-services-identity:15.0.1",
location: "com.google.android.gms:play-services-location:15.0.1",
places: "com.google.android.gms:play-services-places:15.0.1",
drive: "com.google.android.gms:play-services-drive:15.0.1"
auth: "com.google.android.gms:play-services-auth:20.3.0",
signin: "com.google.android.gms:play-services-identity:18.0.1",
location: "com.google.android.gms:play-services-location:20.0.0",
places: "com.google.android.gms:play-services-places:17.0.0",
drive: "com.google.android.gms:play-services-drive:17.0.0"
]
}

Expand Down
6 changes: 3 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Sun Sep 20 15:59:35 CEST 2020
#Sun Sep 18 18:40:59 EEST 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
zipStoreBase=GRADLE_USER_HOME