diff --git a/app/build.gradle b/app/build.gradle index 47e29aa90..2f269033a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -127,7 +127,9 @@ final CRASHLYTICS_VERSION = '2.10.1' final FIREBASE_VERSION = '16.0.9' dependencies { - implementation project(":dav4jvm") + implementation(project(":dav4jvm")) { + exclude group: 'org.ogce', module: 'xpp3' + } implementation project(":ical4android") annotationProcessor "com.google.dagger:dagger-compiler:${DAGGER_VERSION}" diff --git a/app/licenses.yml b/app/licenses.yml index 2b542e821..2add1cf0a 100644 --- a/app/licenses.yml +++ b/app/licenses.yml @@ -715,21 +715,11 @@ licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt url: https://developer.android.com/topic/libraries/architecture/index.html - artifact: org.ogce:xpp3:+ - name: XPP3 - copyrightHolder: Aleksander Slominski - license: The Apache Software License, Version 2.0 - licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt - url: http://www.extreme.indiana.edu/xpp/ + skip: true - artifact: junit:junit:+ - name: JUnit - copyrightHolder: junit-team - license: Common Public License Version 1.0 - licenseUrl: http://www.opensource.org/licenses/cpl1.0.txt - url: http://junit.org + skip: true - artifact: jakarta-regexp:jakarta-regexp:+ - name: jakarta-regexp - copyrightHolder: The Apache Software Foundation - license: The Apache Software License, Version 2.0 + skip: true - artifact: androidx.core:core-ktx:+ name: Core Kotlin Extensions copyrightHolder: The Android Open Source Project diff --git a/app/src/main/assets/licenses.json b/app/src/main/assets/licenses.json index 2c5c08e1f..5ed5f5a10 100644 --- a/app/src/main/assets/licenses.json +++ b/app/src/main/assets/licenses.json @@ -1920,54 +1920,6 @@ "version": "2.1.0" } }, - { - "notice": null, - "copyrightHolder": "Aleksander Slominski", - "copyrightStatement": "Copyright © Aleksander Slominski. All rights reserved.", - "license": "The Apache Software License, Version 2.0", - "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt", - "normalizedLicense": "apache2", - "year": null, - "url": "http://www.extreme.indiana.edu/xpp/", - "libraryName": "XPP3", - "artifactId": { - "name": "xpp3", - "group": "org.ogce", - "version": "1.1.6" - } - }, - { - "notice": null, - "copyrightHolder": "junit-team", - "copyrightStatement": "Copyright © junit-team. All rights reserved.", - "license": "Common Public License Version 1.0", - "licenseUrl": "http://www.opensource.org/licenses/cpl1.0.txt", - "normalizedLicense": "cpl1", - "year": null, - "url": "http://junit.org", - "libraryName": "JUnit", - "artifactId": { - "name": "junit", - "group": "junit", - "version": "4.7" - } - }, - { - "notice": null, - "copyrightHolder": "The Apache Software Foundation", - "copyrightStatement": "Copyright © The Apache Software Foundation. All rights reserved.", - "license": "The Apache Software License, Version 2.0", - "licenseUrl": "", - "normalizedLicense": "apache2", - "year": null, - "url": "", - "libraryName": "jakarta-regexp", - "artifactId": { - "name": "jakarta-regexp", - "group": "jakarta-regexp", - "version": "1.4" - } - }, { "notice": null, "copyrightHolder": "The Android Open Source Project",