From cd0953b44e6b358bd02824bd43db6f3e52e0db1b Mon Sep 17 00:00:00 2001 From: Marvin W Date: Mon, 10 May 2021 16:25:20 +0200 Subject: [PATCH] Update libraries --- build.gradle | 16 ++++++++-------- firebase-auth-core/build.gradle | 1 - play-services-base-core-ui/build.gradle | 9 +++------ play-services-basement/build.gradle | 1 - .../build.gradle | 2 +- .../common/security/ProviderInstallerImpl.java | 4 ++++ play-services-core/build.gradle | 5 ++--- play-services-droidguard/build.gradle | 1 - play-services-location-core/build.gradle | 1 - play-services-maps-core-mapbox/build.gradle | 1 - play-services-nearby-core-ui/build.gradle | 5 ++--- play-services-nearby-core/build.gradle | 3 +-- play-services-vision-core/build.gradle | 1 - 13 files changed, 21 insertions(+), 29 deletions(-) diff --git a/build.gradle b/build.gradle index 86293c26..14624fa7 100644 --- a/build.gradle +++ b/build.gradle @@ -9,29 +9,29 @@ buildscript { ext.safeParcelVersion = '1.7.0' ext.wearableVersion = '0.1.1' - ext.kotlinVersion = '1.4.10' - ext.coroutineVersion = '1.3.7' + ext.kotlinVersion = '1.4.32' + ext.coroutineVersion = '1.3.8' - ext.annotationVersion = '1.1.0' + ext.annotationVersion = '1.2.0' ext.appcompatVersion = '1.2.0' ext.coreVersion = '1.3.0' ext.fragmentVersion = '1.2.5' - ext.lifecycleVersion = '2.2.0' - ext.mediarouterVersion = '1.2.0' + ext.lifecycleVersion = '2.3.1' + ext.mediarouterVersion = '1.2.2' ext.multidexVersion = '2.0.1' - ext.navigationVersion = '2.3.1' + ext.navigationVersion = '2.3.5' ext.preferenceVersion = '1.1.1' ext.recyclerviewVersion = '1.1.0' ext.webkitVersion = '1.4.0' ext.supportLibraryVersion = '28.0.0' ext.slf4jVersion = '1.7.25' - ext.volleyVersion = '1.1.1' + ext.volleyVersion = '1.2.0' ext.wireVersion = '3.2.2' ext.androidBuildGradleVersion = '4.1.0' - ext.androidBuildVersionTools = '29.0.3' + ext.androidBuildVersionTools = '30.0.2' ext.androidMinSdk = 14 ext.androidTargetSdk = 29 diff --git a/firebase-auth-core/build.gradle b/firebase-auth-core/build.gradle index 4a2e3e46..20597d73 100644 --- a/firebase-auth-core/build.gradle +++ b/firebase-auth-core/build.gradle @@ -5,7 +5,6 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' dependencies { api project(':firebase-auth-api') diff --git a/play-services-base-core-ui/build.gradle b/play-services-base-core-ui/build.gradle index fae9ccf8..e3fbbc79 100644 --- a/play-services-base-core-ui/build.gradle +++ b/play-services-base-core-ui/build.gradle @@ -6,7 +6,6 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' apply plugin: 'kotlin-kapt' -apply plugin: 'kotlin-android-extensions' apply plugin: 'maven-publish' apply plugin: 'signing' @@ -17,11 +16,9 @@ dependencies { implementation "androidx.multidex:multidex:$multidexVersion" implementation "androidx.appcompat:appcompat:$appcompatVersion" implementation "androidx.mediarouter:mediarouter:$mediarouterVersion" - implementation "androidx.preference:preference:$preferenceVersion" + implementation "androidx.preference:preference-ktx:$preferenceVersion" // Navigation - implementation "androidx.navigation:navigation-fragment:$navigationVersion" - implementation "androidx.navigation:navigation-ui:$navigationVersion" implementation "androidx.navigation:navigation-fragment-ktx:$navigationVersion" implementation "androidx.navigation:navigation-ui-ktx:$navigationVersion" @@ -39,8 +36,8 @@ android { targetSdkVersion androidTargetSdk } - dataBinding { - enabled = true + buildFeatures { + dataBinding = true } sourceSets { diff --git a/play-services-basement/build.gradle b/play-services-basement/build.gradle index 8c7ec067..84ebb440 100644 --- a/play-services-basement/build.gradle +++ b/play-services-basement/build.gradle @@ -16,7 +16,6 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' apply plugin: 'maven-publish' apply plugin: 'signing' diff --git a/play-services-conscrypt-provider-core/build.gradle b/play-services-conscrypt-provider-core/build.gradle index 71c785b0..c8a510b7 100644 --- a/play-services-conscrypt-provider-core/build.gradle +++ b/play-services-conscrypt-provider-core/build.gradle @@ -6,7 +6,7 @@ apply plugin: 'com.android.library' dependencies { - implementation "org.microg.gms:conscrypt-gmscore:2.5.1" + implementation "org.microg.gms:conscrypt-gmscore:2.5.2" implementation "androidx.annotation:annotation:$annotationVersion" implementation project(":play-services-base-core") } diff --git a/play-services-conscrypt-provider-core/src/main/java/com/google/android/gms/common/security/ProviderInstallerImpl.java b/play-services-conscrypt-provider-core/src/main/java/com/google/android/gms/common/security/ProviderInstallerImpl.java index 1498f98d..587d8158 100644 --- a/play-services-conscrypt-provider-core/src/main/java/com/google/android/gms/common/security/ProviderInstallerImpl.java +++ b/play-services-conscrypt-provider-core/src/main/java/com/google/android/gms/common/security/ProviderInstallerImpl.java @@ -108,6 +108,10 @@ public class ProviderInstallerImpl { } } + public void reportRequestStats(Context context, long a, long b) { + // Ignore stats + } + private static void initProvider(Context context, String packageName) { Log.d(TAG, "Initializing provider for " + packageName); diff --git a/play-services-core/build.gradle b/play-services-core/build.gradle index fc42818a..7cde3e14 100644 --- a/play-services-core/build.gradle +++ b/play-services-core/build.gradle @@ -17,7 +17,6 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' apply plugin: 'kotlin-kapt' -apply plugin: 'kotlin-android-extensions' configurations { withMapboxImplementation @@ -95,8 +94,8 @@ android { } } - dataBinding { - enabled = true + buildFeatures { + dataBinding = true } sourceSets { diff --git a/play-services-droidguard/build.gradle b/play-services-droidguard/build.gradle index a473f2d5..31f1e865 100644 --- a/play-services-droidguard/build.gradle +++ b/play-services-droidguard/build.gradle @@ -5,7 +5,6 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' apply plugin: 'maven-publish' apply plugin: 'signing' diff --git a/play-services-location-core/build.gradle b/play-services-location-core/build.gradle index de6ced4f..bc36d2af 100644 --- a/play-services-location-core/build.gradle +++ b/play-services-location-core/build.gradle @@ -5,7 +5,6 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' dependencies { api project(':play-services-location-api') diff --git a/play-services-maps-core-mapbox/build.gradle b/play-services-maps-core-mapbox/build.gradle index 331516c9..06470fd2 100644 --- a/play-services-maps-core-mapbox/build.gradle +++ b/play-services-maps-core-mapbox/build.gradle @@ -16,7 +16,6 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' dependencies { implementation project(':play-services-api') diff --git a/play-services-nearby-core-ui/build.gradle b/play-services-nearby-core-ui/build.gradle index 6ad704ad..b274ec75 100644 --- a/play-services-nearby-core-ui/build.gradle +++ b/play-services-nearby-core-ui/build.gradle @@ -6,7 +6,6 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' apply plugin: 'kotlin-kapt' -apply plugin: 'kotlin-android-extensions' apply plugin: 'maven-publish' apply plugin: 'signing' @@ -37,8 +36,8 @@ android { targetSdkVersion androidTargetSdk } - dataBinding { - enabled = true + buildFeatures { + dataBinding = true } sourceSets { diff --git a/play-services-nearby-core/build.gradle b/play-services-nearby-core/build.gradle index d1412163..1f05b4ae 100644 --- a/play-services-nearby-core/build.gradle +++ b/play-services-nearby-core/build.gradle @@ -5,7 +5,6 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' apply plugin: 'maven-publish' apply plugin: 'signing' @@ -26,7 +25,7 @@ dependencies { implementation "com.squareup.wire:wire-runtime:$wireVersion" - testImplementation 'junit:junit:4.12' + testImplementation 'junit:junit:4.13.2' } android { diff --git a/play-services-vision-core/build.gradle b/play-services-vision-core/build.gradle index ac0c876c..c9fa0107 100644 --- a/play-services-vision-core/build.gradle +++ b/play-services-vision-core/build.gradle @@ -5,7 +5,6 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' apply plugin: 'maven-publish' apply plugin: 'signing'