diff options
| author | Stefan Niedermann <info@niedermann.it> | 2021-03-25 22:01:25 +0300 |
|---|---|---|
| committer | Stefan Niedermann <info@niedermann.it> | 2021-03-25 22:01:25 +0300 |
| commit | 7ae471d95d832d0f6f3460666ae7be76a9d714bc (patch) | |
| tree | 656406b1dd1c8eeb7cf420fa87414f73f7c89d10 /build.gradle | |
| parent | 24360b8116a95d4a1e9bf49fa39b27a0ebf032bc (diff) | |
| parent | dcd3f7140c15634330f7284e096f9de6ef467cd6 (diff) | |
Merge branch 'master' into 587-compress-images
# Conflicts:
# app/build.gradle
# app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentsFragment.java
# build.gradle
Diffstat (limited to 'build.gradle')
| -rw-r--r-- | build.gradle | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/build.gradle b/build.gradle index 7d2855fb7..4d91f8ce9 100644 --- a/build.gradle +++ b/build.gradle @@ -1,14 +1,14 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - + ext.materialVersion = "1.3.0" repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.1.1' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.10" + classpath 'com.android.tools.build:gradle:4.1.3' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.31" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -27,9 +27,3 @@ allprojects { task clean(type: Delete) { delete rootProject.buildDir } - -ext { - roomVersion = '2.2.5' - retrofitVersion = '2.7.1' - archLifecycleVersion = '2.2.0' -}
\ No newline at end of file |