Update dependency repositories

pull/1400/head
Alex Baker 5 years ago
parent 42f34c1fab
commit e3b4a29c9a

@ -13,8 +13,22 @@ plugins {
repositories { repositories {
mavenCentral() mavenCentral()
google() google()
maven(url = "https://jitpack.io") maven {
jcenter() url = uri("https://jitpack.io")
content {
includeGroup("com.gitlab.abaker")
includeModule("com.gitlab.bitfireAT", "cert4android")
includeModule("com.github.dmfs.opentasks", "opentasks-provider")
includeModule("com.github.QuadFlask", "colorpicker")
}
}
jcenter {
content {
includeModule("com.twofortyfouram", "android-plugin-api-for-locale")
includeModule("org.jetbrains.kotlinx", "kotlinx-collections-immutable-jvm")
includeModule("com.android.billingclient", "billing")
}
}
} }
android { android {
@ -212,7 +226,7 @@ dependencies {
implementation("com.etesync:journalmanager:1.1.1") implementation("com.etesync:journalmanager:1.1.1")
implementation("com.etebase:client:2.3.2") implementation("com.etebase:client:2.3.2")
implementation("com.github.QuadFlask:colorpicker:0.0.15") implementation("com.github.QuadFlask:colorpicker:0.0.15")
implementation("com.github.openid:AppAuth-Android:0.8.0") implementation("net.openid:appauth:0.8.0")
implementation("org.osmdroid:osmdroid-android:6.1.10@aar") implementation("org.osmdroid:osmdroid-android:6.1.10@aar")
implementation("androidx.compose.ui:ui:${Versions.compose}") implementation("androidx.compose.ui:ui:${Versions.compose}")

@ -757,8 +757,8 @@
license: LGPL-3.0-only license: LGPL-3.0-only
licenseUrl: https://spdx.org/licenses/LGPL-3.0-only.html licenseUrl: https://spdx.org/licenses/LGPL-3.0-only.html
url: https://www.etebase.com url: https://www.etebase.com
- artifact: com.github.openid:AppAuth-Android:+ - artifact: net.openid:appauth:+
name: AppAuth-Android name: appauth
copyrightHolder: The AppAuth for Android Authors copyrightHolder: The AppAuth for Android Authors
license: The Apache Software License, Version 2.0 license: The Apache Software License, Version 2.0
licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt

@ -1815,8 +1815,8 @@
}, },
{ {
"artifactId": { "artifactId": {
"name": "AppAuth-Android", "name": "appauth",
"group": "com.github.openid", "group": "net.openid",
"version": "+" "version": "+"
}, },
"copyrightHolder": "The AppAuth for Android Authors", "copyrightHolder": "The AppAuth for Android Authors",
@ -1825,7 +1825,7 @@
"licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt", "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt",
"normalizedLicense": "apache2", "normalizedLicense": "apache2",
"url": "https://github.com/openid/AppAuth-Android", "url": "https://github.com/openid/AppAuth-Android",
"libraryName": "AppAuth-Android" "libraryName": "appauth"
}, },
{ {
"artifactId": { "artifactId": {

@ -2,13 +2,12 @@ buildscript {
repositories { repositories {
mavenCentral() mavenCentral()
google() google()
jcenter()
} }
dependencies { dependencies {
classpath("com.android.tools.build:gradle:7.0.0-alpha08") classpath("com.android.tools.build:gradle:7.0.0-alpha08")
classpath("com.google.gms:google-services:4.3.5") classpath("com.google.gms:google-services:4.3.5")
classpath("com.google.firebase:firebase-crashlytics-gradle:2.5.0") classpath("com.google.firebase:firebase-crashlytics-gradle:2.5.1")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}")
classpath("com.google.dagger:hilt-android-gradle-plugin:${Versions.hilt}") classpath("com.google.dagger:hilt-android-gradle-plugin:${Versions.hilt}")
} }

@ -10,7 +10,7 @@ object Versions {
const val analytics = "18.0.2" const val analytics = "18.0.2"
const val remote_config = "20.0.3" const val remote_config = "20.0.3"
const val okhttp = "4.8.1" const val okhttp = "4.8.1"
const val flipper = "0.74.0" const val flipper = "0.79.1"
const val mockito = "3.8.0" const val mockito = "3.8.0"
const val androidx_test = "1.3.0" const val androidx_test = "1.3.0"
const val make_it_easy = "4.0.1" const val make_it_easy = "4.0.1"

@ -384,17 +384,17 @@
+| \--- com.squareup.okhttp3:logging-interceptor:3.12.1 (*) +| \--- com.squareup.okhttp3:logging-interceptor:3.12.1 (*)
++--- com.github.QuadFlask:colorpicker:0.0.15 ++--- com.github.QuadFlask:colorpicker:0.0.15
+| \--- androidx.appcompat:appcompat:1.1.0 -> 1.3.0-beta01 (*) +| \--- androidx.appcompat:appcompat:1.1.0 -> 1.3.0-beta01 (*)
++--- com.github.openid:AppAuth-Android:0.8.0 ++--- net.openid:appauth:0.8.0
+| +--- androidx.browser:browser:1.2.0 +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01
+| | +--- androidx.core:core:1.1.0 -> 1.5.0-beta01 (*) +| \--- androidx.browser:browser:1.2.0
+| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| +--- androidx.core:core:1.1.0 -> 1.5.0-beta01 (*)
+| | +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01
+| | +--- androidx.collection:collection:1.1.0 (*) +| +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
+| | +--- androidx.concurrent:concurrent-futures:1.0.0 +| +--- androidx.collection:collection:1.1.0 (*)
+| | | +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava +| +--- androidx.concurrent:concurrent-futures:1.0.0
+| | | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| | +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
+| | \--- androidx.interpolator:interpolator:1.0.0 (*) +| | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01
+| \--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| \--- androidx.interpolator:interpolator:1.0.0 (*)
++--- org.osmdroid:osmdroid-android:6.1.10 ++--- org.osmdroid:osmdroid-android:6.1.10
++--- androidx.compose.ui:ui:1.0.0-beta01 ++--- androidx.compose.ui:ui:1.0.0-beta01
+| +--- androidx.compose.animation:animation-core:1.0.0-beta01 +| +--- androidx.compose.animation:animation-core:1.0.0-beta01

@ -498,17 +498,17 @@
+| \--- com.squareup.okhttp3:logging-interceptor:3.12.1 (*) +| \--- com.squareup.okhttp3:logging-interceptor:3.12.1 (*)
++--- com.github.QuadFlask:colorpicker:0.0.15 ++--- com.github.QuadFlask:colorpicker:0.0.15
+| \--- androidx.appcompat:appcompat:1.1.0 -> 1.3.0-beta01 (*) +| \--- androidx.appcompat:appcompat:1.1.0 -> 1.3.0-beta01 (*)
++--- com.github.openid:AppAuth-Android:0.8.0 ++--- net.openid:appauth:0.8.0
+| +--- androidx.browser:browser:1.2.0 +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01
+| | +--- androidx.core:core:1.1.0 -> 1.5.0-beta01 (*) +| \--- androidx.browser:browser:1.2.0
+| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| +--- androidx.core:core:1.1.0 -> 1.5.0-beta01 (*)
+| | +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01
+| | +--- androidx.collection:collection:1.1.0 (*) +| +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
+| | +--- androidx.concurrent:concurrent-futures:1.0.0 +| +--- androidx.collection:collection:1.1.0 (*)
+| | | +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava +| +--- androidx.concurrent:concurrent-futures:1.0.0
+| | | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| | +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
+| | \--- androidx.interpolator:interpolator:1.0.0 (*) +| | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01
+| \--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| \--- androidx.interpolator:interpolator:1.0.0 (*)
++--- org.osmdroid:osmdroid-android:6.1.10 ++--- org.osmdroid:osmdroid-android:6.1.10
++--- androidx.compose.ui:ui:1.0.0-beta01 ++--- androidx.compose.ui:ui:1.0.0-beta01
+| +--- androidx.compose.animation:animation-core:1.0.0-beta01 +| +--- androidx.compose.animation:animation-core:1.0.0-beta01

Loading…
Cancel
Save