From d53f3f0df611dcca1ba6aad0185cab4851909363 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Wed, 18 Sep 2019 15:58:07 -0500 Subject: [PATCH] Update licenses --- app/licenses.yml | 12 +------ app/src/main/assets/licenses.json | 52 +++++++++++-------------------- 2 files changed, 19 insertions(+), 45 deletions(-) diff --git a/app/licenses.yml b/app/licenses.yml index 140abe2d5..0f90e992d 100644 --- a/app/licenses.yml +++ b/app/licenses.yml @@ -586,11 +586,6 @@ copyrightHolder: Square, Inc. license: The Apache Software License, Version 2.0 licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt -- artifact: com.squareup.okio:okio:+ - name: Okio - copyrightHolder: Square, Inc. - license: The Apache Software License, Version 2.0 - licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt - artifact: com.squareup.retrofit2:retrofit:+ name: Retrofit copyrightHolder: Square, Inc. @@ -653,11 +648,6 @@ license: The Apache Software License, Version 2.0 licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt url: https://github.com/JakeWharton/ProcessPhoenix/ -- artifact: com.squareup.okio:okio:+ - name: Okio - copyrightHolder: Square, Inc. - license: The Apache Software License, Version 2.0 - licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt - artifact: io.grpc:grpc-context:+ name: io.grpc:grpc-context copyrightHolder: The gRPC Authors @@ -749,4 +739,4 @@ copyrightHolder: Android Open Source Project 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 \ No newline at end of file + url: http://developer.android.com/tools/extras/support-library.html diff --git a/app/src/main/assets/licenses.json b/app/src/main/assets/licenses.json index 33a1a51eb..b4e60e640 100644 --- a/app/src/main/assets/licenses.json +++ b/app/src/main/assets/licenses.json @@ -61,7 +61,7 @@ "artifactId": { "name": "constraintlayout", "group": "androidx.constraintlayout", - "version": "2.0.0-beta1" + "version": "2.0.0-beta2" } }, { @@ -157,7 +157,7 @@ "artifactId": { "name": "core", "group": "androidx.core", - "version": "1.1.0-rc02" + "version": "1.1.0-rc03" } }, { @@ -173,7 +173,7 @@ "artifactId": { "name": "core-common", "group": "androidx.arch.core", - "version": "2.0.0" + "version": "2.1.0" } }, { @@ -285,7 +285,7 @@ "artifactId": { "name": "lifecycle-runtime", "group": "androidx.lifecycle", - "version": "2.0.0" + "version": "2.1.0" } }, { @@ -365,7 +365,7 @@ "artifactId": { "name": "lifecycle-livedata", "group": "androidx.lifecycle", - "version": "2.0.0" + "version": "2.1.0" } }, { @@ -509,7 +509,7 @@ "artifactId": { "name": "lifecycle-viewmodel", "group": "androidx.lifecycle", - "version": "2.1.0-rc01" + "version": "2.1.0" } }, { @@ -717,7 +717,7 @@ "artifactId": { "name": "lifecycle-livedata-core", "group": "androidx.lifecycle", - "version": "2.0.0" + "version": "2.1.0" } }, { @@ -829,7 +829,7 @@ "artifactId": { "name": "lifecycle-extensions", "group": "androidx.lifecycle", - "version": "2.0.0" + "version": "2.1.0" } }, { @@ -877,7 +877,7 @@ "artifactId": { "name": "core-runtime", "group": "androidx.arch.core", - "version": "2.0.1" + "version": "2.1.0" } }, { @@ -1053,7 +1053,7 @@ "artifactId": { "name": "material", "group": "com.google.android.material", - "version": "1.1.0-alpha09" + "version": "1.1.0-alpha10" } }, { @@ -1165,7 +1165,7 @@ "artifactId": { "name": "lifecycle-common", "group": "androidx.lifecycle", - "version": "2.0.0" + "version": "2.1.0" } }, { @@ -1261,7 +1261,7 @@ "artifactId": { "name": "lifecycle-process", "group": "androidx.lifecycle", - "version": "2.0.0" + "version": "2.1.0" } }, { @@ -1277,7 +1277,7 @@ "artifactId": { "name": "lifecycle-service", "group": "androidx.lifecycle", - "version": "2.0.0" + "version": "2.1.0" } }, { @@ -1469,7 +1469,7 @@ "artifactId": { "name": "constraintlayout-solver", "group": "androidx.constraintlayout", - "version": "2.0.0-beta1" + "version": "2.0.0-beta2" } }, { @@ -1501,7 +1501,7 @@ "artifactId": { "name": "kotlin-stdlib", "group": "org.jetbrains.kotlin", - "version": "1.3.41" + "version": "1.3.50" } }, { @@ -1533,7 +1533,7 @@ "artifactId": { "name": "slf4j-jdk14", "group": "org.slf4j", - "version": "1.7.25" + "version": "1.7.26" } }, { @@ -1568,22 +1568,6 @@ "version": "3.12.3" } }, - { - "notice": null, - "copyrightHolder": "Square, Inc.", - "copyrightStatement": "Copyright © Square, Inc. 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": "https://github.com/square/okio/", - "libraryName": "Okio", - "artifactId": { - "name": "okio", - "group": "com.squareup.okio", - "version": "2.3.0" - } - }, { "notice": null, "copyrightHolder": "Square, Inc.", @@ -1725,7 +1709,7 @@ "artifactId": { "name": "kotlin-stdlib-jdk7", "group": "org.jetbrains.kotlin", - "version": "1.3.41" + "version": "1.3.50" } }, { @@ -1965,7 +1949,7 @@ "artifactId": { "name": "viewpager2", "group": "androidx.viewpager2", - "version": "1.0.0-beta02" + "version": "1.0.0-beta03" } }, {