diff options
author | Ricki Hirner <hirner@bitfire.at> | 2022-08-23 22:31:55 +0300 |
---|---|---|
committer | Ricki Hirner <hirner@bitfire.at> | 2022-08-23 22:31:55 +0300 |
commit | ce6d454862a69c7078d2d4c419bf68da63f5ad25 (patch) | |
tree | 0bb1002c199b861ea7346a048b39c388b1ef0d39 | |
parent | ccea6cbd487b0872d7e399f290fd00ffbb08f37f (diff) |
Update dependencies and exclude JSON module (caused JSONObject exception in DAVx5 release versions)
-rw-r--r-- | build.gradle | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/build.gradle b/build.gradle index a45d059..169b324 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,3 @@ - /*************************************************************************************************** * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details. **************************************************************************************************/ @@ -7,7 +6,7 @@ buildscript { ext.versions = [ kotlin: '1.7.0', dokka: '1.5.0', - ical4j: '3.2.4', + ical4j: '3.2.5', // latest Apache Commons versions that don't require Java 8 (Android 7) commonsIO: '2.6' ] @@ -18,7 +17,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.2.1' + classpath 'com.android.tools.build:gradle:7.2.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}" classpath "org.jetbrains.dokka:dokka-gradle-plugin:${versions.dokka}" } @@ -84,7 +83,10 @@ dependencies { coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.6' api("org.mnode.ical4j:ical4j:${versions.ical4j}") { + // exclude modules which are in conflict with system libraries exclude group: 'commons-logging' + exclude group: 'org.json', module: 'json' + // exclude groovy because we don't need it exclude group: 'org.codehaus.groovy', module: 'groovy' exclude group: 'org.codehaus.groovy', module: 'groovy-dateutil' } |