diff --git a/app/build.gradle.kts b/app/build.gradle.kts index d69919225..5b4feaa61 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -212,7 +212,7 @@ dependencies { implementation("com.etebase:client:2.3.2") implementation("com.github.QuadFlask:colorpicker:0.0.15") implementation("androidx.security:security-crypto:1.1.0-alpha02") - implementation("net.openid:appauth:0.7.1") + implementation("com.github.openid:AppAuth-Android:27b62d5") // https://github.com/mapbox/mapbox-gl-native-android/issues/316 genericImplementation("com.mapbox.mapboxsdk:mapbox-android-sdk:7.4.1") diff --git a/app/licenses.yml b/app/licenses.yml index 6a0b70d1b..badb65e01 100644 --- a/app/licenses.yml +++ b/app/licenses.yml @@ -823,60 +823,12 @@ name: commonmark copyrightHolder: Atlassian and others license: BSD 2-Clause -- artifact: net.openid:appauth:+ - name: appauth - copyrightHolder: The AppAuth for Android Authors - license: The Apache Software License, Version 2.0 - licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt - url: https://github.com/openid/AppAuth-Android - artifact: androidx.browser:browser:+ name: browser 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 -- artifact: androidx.legacy:legacy-support-core-ui:+ - name: legacy-support-core-ui - 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 -- artifact: androidx.legacy:legacy-support-core-utils:+ - name: legacy-support-core-utils - 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 -- artifact: androidx.slidingpanelayout:slidingpanelayout:+ - name: slidingpanelayout - 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 -- artifact: androidx.asynclayoutinflater:asynclayoutinflater:+ - name: asynclayoutinflater - 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 -- artifact: androidx.documentfile:documentfile:+ - name: documentfile - 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 -- artifact: androidx.localbroadcastmanager:localbroadcastmanager:+ - name: localbroadcastmanager - 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 -- artifact: androidx.print:print:+ - name: print - 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 - artifact: androidx.security:security-crypto:+ name: security-crypto copyrightHolder: Android Open Source Project @@ -895,3 +847,15 @@ license: LGPL-3.0-only licenseUrl: https://spdx.org/licenses/LGPL-3.0-only.html url: https://www.etebase.com +- artifact: com.github.openid:AppAuth-Android:+ + name: AppAuth-Android + copyrightHolder: The AppAuth for Android Authors + license: The Apache Software License, Version 2.0 + licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt + url: https://github.com/openid/AppAuth-Android +- artifact: androidx.concurrent:concurrent-futures:+ + name: concurrent-futures + copyrightHolder: Android Open Source Project + 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 diff --git a/app/src/main/assets/licenses.json b/app/src/main/assets/licenses.json index 61c0924b0..1281d86c5 100644 --- a/app/src/main/assets/licenses.json +++ b/app/src/main/assets/licenses.json @@ -1963,20 +1963,6 @@ "normalizedLicense": "bsd_2_clauses", "libraryName": "commonmark" }, - { - "artifactId": { - "name": "appauth", - "group": "net.openid", - "version": "+" - }, - "copyrightHolder": "The AppAuth for Android Authors", - "copyrightStatement": "Copyright © The AppAuth for Android Authors. 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/openid/AppAuth-Android", - "libraryName": "appauth" - }, { "artifactId": { "name": "browser", @@ -1991,104 +1977,6 @@ "url": "http://developer.android.com/tools/extras/support-library.html", "libraryName": "browser" }, - { - "artifactId": { - "name": "legacy-support-core-ui", - "group": "androidx.legacy", - "version": "+" - }, - "copyrightHolder": "Android Open Source Project", - "copyrightStatement": "Copyright © Android Open Source Project. 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://developer.android.com/tools/extras/support-library.html", - "libraryName": "legacy-support-core-ui" - }, - { - "artifactId": { - "name": "legacy-support-core-utils", - "group": "androidx.legacy", - "version": "+" - }, - "copyrightHolder": "Android Open Source Project", - "copyrightStatement": "Copyright © Android Open Source Project. 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://developer.android.com/tools/extras/support-library.html", - "libraryName": "legacy-support-core-utils" - }, - { - "artifactId": { - "name": "slidingpanelayout", - "group": "androidx.slidingpanelayout", - "version": "+" - }, - "copyrightHolder": "Android Open Source Project", - "copyrightStatement": "Copyright © Android Open Source Project. 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://developer.android.com/tools/extras/support-library.html", - "libraryName": "slidingpanelayout" - }, - { - "artifactId": { - "name": "asynclayoutinflater", - "group": "androidx.asynclayoutinflater", - "version": "+" - }, - "copyrightHolder": "Android Open Source Project", - "copyrightStatement": "Copyright © Android Open Source Project. 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://developer.android.com/tools/extras/support-library.html", - "libraryName": "asynclayoutinflater" - }, - { - "artifactId": { - "name": "documentfile", - "group": "androidx.documentfile", - "version": "+" - }, - "copyrightHolder": "Android Open Source Project", - "copyrightStatement": "Copyright © Android Open Source Project. 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://developer.android.com/tools/extras/support-library.html", - "libraryName": "documentfile" - }, - { - "artifactId": { - "name": "localbroadcastmanager", - "group": "androidx.localbroadcastmanager", - "version": "+" - }, - "copyrightHolder": "Android Open Source Project", - "copyrightStatement": "Copyright © Android Open Source Project. 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://developer.android.com/tools/extras/support-library.html", - "libraryName": "localbroadcastmanager" - }, - { - "artifactId": { - "name": "print", - "group": "androidx.print", - "version": "+" - }, - "copyrightHolder": "Android Open Source Project", - "copyrightStatement": "Copyright © Android Open Source Project. 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://developer.android.com/tools/extras/support-library.html", - "libraryName": "print" - }, { "artifactId": { "name": "security-crypto", @@ -2130,6 +2018,34 @@ "normalizedLicense": "lgpl3", "url": "https://www.etebase.com", "libraryName": "client" + }, + { + "artifactId": { + "name": "AppAuth-Android", + "group": "com.github.openid", + "version": "+" + }, + "copyrightHolder": "The AppAuth for Android Authors", + "copyrightStatement": "Copyright © The AppAuth for Android Authors. 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/openid/AppAuth-Android", + "libraryName": "AppAuth-Android" + }, + { + "artifactId": { + "name": "concurrent-futures", + "group": "androidx.concurrent", + "version": "+" + }, + "copyrightHolder": "Android Open Source Project", + "copyrightStatement": "Copyright © Android Open Source Project. 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://developer.android.com/topic/libraries/architecture/index.html", + "libraryName": "concurrent-futures" } ] } \ No newline at end of file diff --git a/deps_fdroid.txt b/deps_fdroid.txt index 4aa62d7e9..49ef87f7c 100644 --- a/deps_fdroid.txt +++ b/deps_fdroid.txt @@ -394,27 +394,14 @@ +| +--- androidx.annotation:annotation:1.1.0 +| +--- com.google.crypto.tink:tink-android:1.4.0 +| \--- androidx.collection:collection:1.1.0 (*) -+\--- net.openid:appauth:0.7.1 -+ \--- androidx.browser:browser:1.0.0 -+ +--- androidx.core:core:1.0.0 -> 1.3.2 (*) -+ +--- androidx.annotation:annotation:1.0.0 -> 1.1.0 -+ +--- androidx.interpolator:interpolator:1.0.0 (*) -+ +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) -+ \--- androidx.legacy:legacy-support-core-ui:1.0.0 -+ +--- androidx.annotation:annotation:1.0.0 -> 1.1.0 -+ +--- androidx.core:core:1.0.0 -> 1.3.2 (*) -+ +--- androidx.legacy:legacy-support-core-utils:1.0.0 (*) -+ +--- androidx.customview:customview:1.0.0 (*) -+ +--- androidx.viewpager:viewpager:1.0.0 (*) -+ +--- androidx.coordinatorlayout:coordinatorlayout:1.0.0 -> 1.1.0 (*) -+ +--- androidx.drawerlayout:drawerlayout:1.0.0 (*) -+ +--- androidx.slidingpanelayout:slidingpanelayout:1.0.0 -+ | +--- androidx.annotation:annotation:1.0.0 -> 1.1.0 -+ | +--- androidx.core:core:1.0.0 -> 1.3.2 (*) -+ | \--- androidx.customview:customview:1.0.0 (*) -+ +--- androidx.interpolator:interpolator:1.0.0 (*) -+ +--- androidx.swiperefreshlayout:swiperefreshlayout:1.0.0 -> 1.1.0 (*) -+ +--- androidx.asynclayoutinflater:asynclayoutinflater:1.0.0 -+ | +--- androidx.annotation:annotation:1.0.0 -> 1.1.0 -+ | \--- androidx.core:core:1.0.0 -> 1.3.2 (*) -+ \--- androidx.cursoradapter:cursoradapter:1.0.0 (*) ++\--- com.github.openid:AppAuth-Android:27b62d5 ++ +--- androidx.browser:browser:1.2.0 ++ | +--- androidx.core:core:1.1.0 -> 1.3.2 (*) ++ | +--- androidx.annotation:annotation:1.1.0 ++ | +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava ++ | +--- androidx.collection:collection:1.1.0 (*) ++ | +--- androidx.concurrent:concurrent-futures:1.0.0 ++ | | +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava ++ | | \--- androidx.annotation:annotation:1.1.0 ++ | \--- androidx.interpolator:interpolator:1.0.0 (*) ++ \--- androidx.annotation:annotation:1.1.0 diff --git a/deps_googleplay.txt b/deps_googleplay.txt index 67a3e9a89..ddcc3595e 100644 --- a/deps_googleplay.txt +++ b/deps_googleplay.txt @@ -506,27 +506,14 @@ +| +--- androidx.annotation:annotation:1.1.0 +| +--- com.google.crypto.tink:tink-android:1.4.0 +| \--- androidx.collection:collection:1.1.0 (*) -+\--- net.openid:appauth:0.7.1 -+ \--- androidx.browser:browser:1.0.0 -+ +--- androidx.core:core:1.0.0 -> 1.3.2 (*) -+ +--- androidx.annotation:annotation:1.0.0 -> 1.1.0 -+ +--- androidx.interpolator:interpolator:1.0.0 (*) -+ +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) -+ \--- androidx.legacy:legacy-support-core-ui:1.0.0 -+ +--- androidx.annotation:annotation:1.0.0 -> 1.1.0 -+ +--- androidx.core:core:1.0.0 -> 1.3.2 (*) -+ +--- androidx.legacy:legacy-support-core-utils:1.0.0 (*) -+ +--- androidx.customview:customview:1.0.0 (*) -+ +--- androidx.viewpager:viewpager:1.0.0 (*) -+ +--- androidx.coordinatorlayout:coordinatorlayout:1.0.0 -> 1.1.0 (*) -+ +--- androidx.drawerlayout:drawerlayout:1.0.0 (*) -+ +--- androidx.slidingpanelayout:slidingpanelayout:1.0.0 -+ | +--- androidx.annotation:annotation:1.0.0 -> 1.1.0 -+ | +--- androidx.core:core:1.0.0 -> 1.3.2 (*) -+ | \--- androidx.customview:customview:1.0.0 (*) -+ +--- androidx.interpolator:interpolator:1.0.0 (*) -+ +--- androidx.swiperefreshlayout:swiperefreshlayout:1.0.0 -> 1.1.0 (*) -+ +--- androidx.asynclayoutinflater:asynclayoutinflater:1.0.0 -+ | +--- androidx.annotation:annotation:1.0.0 -> 1.1.0 -+ | \--- androidx.core:core:1.0.0 -> 1.3.2 (*) -+ \--- androidx.cursoradapter:cursoradapter:1.0.0 (*) ++\--- com.github.openid:AppAuth-Android:27b62d5 ++ +--- androidx.browser:browser:1.2.0 ++ | +--- androidx.core:core:1.1.0 -> 1.3.2 (*) ++ | +--- androidx.annotation:annotation:1.1.0 ++ | +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava ++ | +--- androidx.collection:collection:1.1.0 (*) ++ | +--- androidx.concurrent:concurrent-futures:1.0.0 ++ | | +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava ++ | | \--- androidx.annotation:annotation:1.1.0 ++ | \--- androidx.interpolator:interpolator:1.0.0 (*) ++ \--- androidx.annotation:annotation:1.1.0