From 116026a7d91f84c33cbd84e74cfc7268530793e1 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Tue, 4 Feb 2020 16:07:08 -0600 Subject: [PATCH] Update licenses --- app/licenses.yml | 22 ++++++++++- app/src/main/assets/licenses.json | 66 ++++++++++++++++++++++++++----- 2 files changed, 77 insertions(+), 11 deletions(-) diff --git a/app/licenses.yml b/app/licenses.yml index f808577b3..f6e43887f 100644 --- a/app/licenses.yml +++ b/app/licenses.yml @@ -752,13 +752,13 @@ - artifact: org.conscrypt:conscrypt-android:+ name: org.conscrypt:conscrypt-android copyrightHolder: Android Open Source Project - license: Apache 2 + license: The Apache Software License, Version 2.0 licenseUrl: https://www.apache.org/licenses/LICENSE-2.0 url: https://conscrypt.org/ - artifact: org.jetbrains.kotlin:kotlin-stdlib-jdk8:+ name: org.jetbrains.kotlin:kotlin-stdlib-jdk8 copyrightHolder: JetBrains s.r.o. - license: The Apache License, Version 2.0 + license: The Apache Software License, Version 2.0 licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt url: https://kotlinlang.org/ - artifact: org.jetbrains.kotlinx:kotlinx-coroutines-android:+ @@ -811,3 +811,21 @@ copyrightHolder: Android Open Source Project license: The Apache Software License, Version 2.0 licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt +- artifact: com.madgag.spongycastle:core:+ + name: Spongy Castle Core + copyrightHolder: The Legion of the Bouncy Castle Inc. + license: Bouncy Castle Licence + licenseUrl: http://www.bouncycastle.org/licence.html + url: http://rtyley.github.io/spongycastle/ +- artifact: com.etesync:journalmanager:+ + name: EteSync JVM + copyrightHolder: Tom Hacohen + license: LGPL-3.0-only + licenseUrl: https://spdx.org/licenses/LGPL-3.0-only.html + url: https://www.etesync.com +- artifact: com.madgag.spongycastle:prov:+ + name: Spongy Castle + copyrightHolder: The Legion of the Bouncy Castle Inc. + license: Bouncy Castle Licence + licenseUrl: http://www.bouncycastle.org/licence.html + url: http://rtyley.github.io/spongycastle/ diff --git a/app/src/main/assets/licenses.json b/app/src/main/assets/licenses.json index 427fc7f2a..e13a6c8f6 100644 --- a/app/src/main/assets/licenses.json +++ b/app/src/main/assets/licenses.json @@ -557,7 +557,7 @@ "artifactId": { "name": "dagger", "group": "com.google.dagger", - "version": "2.25.4" + "version": "2.26" } }, { @@ -1149,7 +1149,7 @@ "artifactId": { "name": "work-runtime", "group": "androidx.work", - "version": "2.2.0" + "version": "2.3.0" } }, { @@ -1709,7 +1709,7 @@ "artifactId": { "name": "logging-interceptor", "group": "com.squareup.okhttp3", - "version": "3.11.0" + "version": "3.12.1" } }, { @@ -2020,7 +2020,7 @@ "notice": null, "copyrightHolder": "Android Open Source Project", "copyrightStatement": "Copyright © Android Open Source Project. All rights reserved.", - "license": "Apache 2", + "license": "The Apache Software License, Version 2.0", "licenseUrl": "https://www.apache.org/licenses/LICENSE-2.0", "normalizedLicense": "apache2", "year": null, @@ -2036,7 +2036,7 @@ "notice": null, "copyrightHolder": "JetBrains s.r.o.", "copyrightStatement": "Copyright © JetBrains s.r.o. All rights reserved.", - "license": "The Apache License, Version 2.0", + "license": "The Apache Software License, Version 2.0", "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt", "normalizedLicense": "apache2", "year": null, @@ -2077,7 +2077,7 @@ "artifactId": { "name": "databinding-adapters", "group": "androidx.databinding", - "version": "3.6.0-rc01" + "version": "3.6.0-rc02" } }, { @@ -2141,7 +2141,7 @@ "artifactId": { "name": "databinding-common", "group": "androidx.databinding", - "version": "3.6.0-rc01" + "version": "3.6.0-rc02" } }, { @@ -2157,7 +2157,7 @@ "artifactId": { "name": "databinding-runtime", "group": "androidx.databinding", - "version": "3.6.0-rc01" + "version": "3.6.0-rc02" } }, { @@ -2189,7 +2189,55 @@ "artifactId": { "name": "viewbinding", "group": "androidx.databinding", - "version": "3.6.0-rc01" + "version": "3.6.0-rc02" + } + }, + { + "notice": null, + "copyrightHolder": "The Legion of the Bouncy Castle Inc.", + "copyrightStatement": "Copyright © The Legion of the Bouncy Castle Inc. All rights reserved.", + "license": "Bouncy Castle Licence", + "licenseUrl": "http://www.bouncycastle.org/licence.html", + "normalizedLicense": "Bouncy Castle Licence", + "year": null, + "url": "http://rtyley.github.io/spongycastle/", + "libraryName": "Spongy Castle Core", + "artifactId": { + "name": "core", + "group": "com.madgag.spongycastle", + "version": "1.54.0.0" + } + }, + { + "notice": null, + "copyrightHolder": "Tom Hacohen", + "copyrightStatement": "Copyright © Tom Hacohen. All rights reserved.", + "license": "LGPL-3.0-only", + "licenseUrl": "https://spdx.org/licenses/LGPL-3.0-only.html", + "normalizedLicense": "lgpl3", + "year": null, + "url": "https://www.etesync.com", + "libraryName": "EteSync JVM", + "artifactId": { + "name": "journalmanager", + "group": "com.etesync", + "version": "1.0.2-SNAPSHOT" + } + }, + { + "notice": null, + "copyrightHolder": "The Legion of the Bouncy Castle Inc.", + "copyrightStatement": "Copyright © The Legion of the Bouncy Castle Inc. All rights reserved.", + "license": "Bouncy Castle Licence", + "licenseUrl": "http://www.bouncycastle.org/licence.html", + "normalizedLicense": "Bouncy Castle Licence", + "year": null, + "url": "http://rtyley.github.io/spongycastle/", + "libraryName": "Spongy Castle", + "artifactId": { + "name": "prov", + "group": "com.madgag.spongycastle", + "version": "1.54.0.0" } } ]