diff --git a/app/build.gradle.kts b/app/build.gradle.kts index bb55eb0e5..a16b74280 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -121,6 +121,10 @@ configurations.all { exclude(group = "com.google.guava", module = "guava-jdk5") exclude(group = "org.apache.httpcomponents", module = "httpclient") exclude(group = "com.google.http-client", module = "google-http-client-apache") + exclude(group = "org.checkerframework") + exclude(group = "com.google.code.findbugs") + exclude(group = "com.google.errorprone") + exclude(group = "com.google.j2objc") resolutionStrategy { force("com.squareup.okhttp3:okhttp:" + Versions.okhttp) } @@ -163,10 +167,11 @@ dependencies { implementation("androidx.preference:preference:1.1.1") implementation("com.jakewharton.timber:timber:4.7.1") implementation("com.jakewharton.threetenabp:threetenabp:1.2.3") - implementation("com.google.guava:guava:27.1-android") implementation("com.jakewharton:process-phoenix:2.0.0") implementation("com.google.android.apps.dashclock:dashclock-api:2.0.0") - implementation("com.twofortyfouram:android-plugin-api-for-locale:1.0.2") + implementation("com.twofortyfouram:android-plugin-api-for-locale:1.0.2") { + isTransitive = false + } implementation("com.rubiconproject.oss:jchronic:0.2.6") { isTransitive = false } diff --git a/app/licenses.yml b/app/licenses.yml index 71fb8fd19..cade95f45 100644 --- a/app/licenses.yml +++ b/app/licenses.yml @@ -67,12 +67,6 @@ license: The Apache Software License, Version 2.0 licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt url: https://developer.android.com/topic/libraries/architecture/index.html -- artifact: com.google.j2objc:j2objc-annotations:+ - name: J2ObjC Annotations - copyrightHolder: Google Inc. - license: The Apache Software License, Version 2.0 - licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt - url: https://github.com/google/j2objc/ - artifact: androidx.room:room-common:+ name: Android Room-Common copyrightHolder: Android Open Source Project @@ -85,13 +79,6 @@ license: The Apache Software License, Version 2.0 licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt url: https://developer.android.com/topic/libraries/architecture/index.html -- artifact: com.google.code.findbugs:jsr305:+ - name: FindBugs-jsr305 - copyrightHolder: FindBugs Project - license: BSD 2-Clause - licenseUrl: https://opensource.org/licenses/BSD-2-Clause - url: http://findbugs.sourceforge.net/ - forceGenerate: true - artifact: com.google.code.gson:gson:+ name: Gson copyrightHolder: Google Inc. @@ -322,12 +309,6 @@ license: The Apache Software License, Version 2.0 licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt url: http://developer.android.com/tools/extras/support-library.html -- artifact: net.jcip:jcip-annotations:+ - name: Java Concurrency in Practice book annotations - copyrightHolder: Stephen Connolly - license: The Apache Software License, Version 2.0 - licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt - url: http://jcip.net/ - artifact: androidx.collection:collection:+ name: Android Support Library collections copyrightHolder: Android Open Source Project @@ -595,11 +576,6 @@ copyrightHolder: The Guava Authors license: The Apache Software License, Version 2.0 licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt -- artifact: com.google.errorprone:error_prone_annotations:+ - name: error-prone annotations - copyrightHolder: The Error Prone Authors - license: The Apache Software License, Version 2.0 - licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt - artifact: io.opencensus:opencensus-api:+ name: OpenCensus API copyrightHolder: OpenCensus Authors @@ -611,12 +587,6 @@ copyrightHolder: The Guava Authors license: The Apache Software License, Version 2.0 licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt -- artifact: org.checkerframework:checker-compat-qual:+ - name: Checker Qual - copyrightHolder: The Checker Framework Developers - license: GNU General Public License, Version 2.0 + classpath exception - licenseUrl: http://www.gnu.org/software/classpath/license.html - url: https://checkerframework.org - artifact: io.opencensus:opencensus-contrib-http-util:+ name: OpenCensus contrib-http-util copyrightHolder: OpenCensus Authors diff --git a/app/src/main/assets/licenses.json b/app/src/main/assets/licenses.json index e04cf63f3..7da260ace 100644 --- a/app/src/main/assets/licenses.json +++ b/app/src/main/assets/licenses.json @@ -164,20 +164,6 @@ "url": "https://developer.android.com/topic/libraries/architecture/index.html", "libraryName": "Android Arch-Common" }, - { - "artifactId": { - "name": "j2objc-annotations", - "group": "com.google.j2objc", - "version": "+" - }, - "copyrightHolder": "Google Inc.", - "copyrightStatement": "Copyright © Google Inc. All rights reserved.", - "license": "The Apache Software License, Version 2.0", - "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt", - "normalizedLicense": "apache2", - "url": "https://github.com/google/j2objc/", - "libraryName": "J2ObjC Annotations" - }, { "artifactId": { "name": "room-common", @@ -206,20 +192,6 @@ "url": "https://developer.android.com/topic/libraries/architecture/index.html", "libraryName": "Android Room-Runtime" }, - { - "artifactId": { - "name": "jsr305", - "group": "com.google.code.findbugs", - "version": "+" - }, - "copyrightHolder": "FindBugs Project", - "copyrightStatement": "Copyright © FindBugs Project. All rights reserved.", - "license": "BSD 2-Clause", - "licenseUrl": "https://opensource.org/licenses/BSD-2-Clause", - "normalizedLicense": "bsd_2_clauses", - "url": "http://findbugs.sourceforge.net/", - "libraryName": "FindBugs-jsr305" - }, { "artifactId": { "name": "gson", @@ -748,20 +720,6 @@ "url": "http://developer.android.com/tools/extras/support-library.html", "libraryName": "Android Support RecyclerView v7" }, - { - "artifactId": { - "name": "jcip-annotations", - "group": "net.jcip", - "version": "+" - }, - "copyrightHolder": "Stephen Connolly", - "copyrightStatement": "Copyright © Stephen Connolly. All rights reserved.", - "license": "The Apache Software License, Version 2.0", - "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt", - "normalizedLicense": "apache2", - "url": "http://jcip.net/", - "libraryName": "Java Concurrency in Practice book annotations" - }, { "artifactId": { "name": "collection", @@ -1395,19 +1353,6 @@ "normalizedLicense": "apache2", "libraryName": "Guava ListenableFuture only" }, - { - "artifactId": { - "name": "error_prone_annotations", - "group": "com.google.errorprone", - "version": "+" - }, - "copyrightHolder": "The Error Prone Authors", - "copyrightStatement": "Copyright © The Error Prone Authors. All rights reserved.", - "license": "The Apache Software License, Version 2.0", - "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt", - "normalizedLicense": "apache2", - "libraryName": "error-prone annotations" - }, { "artifactId": { "name": "opencensus-api", @@ -1435,20 +1380,6 @@ "normalizedLicense": "apache2", "libraryName": "Guava InternalFutureFailureAccess and InternalFutures" }, - { - "artifactId": { - "name": "checker-compat-qual", - "group": "org.checkerframework", - "version": "+" - }, - "copyrightHolder": "The Checker Framework Developers", - "copyrightStatement": "Copyright © The Checker Framework Developers. All rights reserved.", - "license": "GNU General Public License, Version 2.0 + classpath exception", - "licenseUrl": "http://www.gnu.org/software/classpath/license.html", - "normalizedLicense": "gpl2", - "url": "https://checkerframework.org", - "libraryName": "Checker Qual" - }, { "artifactId": { "name": "opencensus-contrib-http-util",