diff --git a/build.gradle b/build.gradle index d7057ac5..74a10758 100644 --- a/build.gradle +++ b/build.gradle @@ -30,6 +30,7 @@ buildscript { allprojects { apply plugin: 'idea' ext.androidBuildVersionTools = "29.0.2" + ext.supportLibraryVersion = "28.0.0" } def androidCompileSdk() { return 29 } diff --git a/play-services-basement/build.gradle b/play-services-basement/build.gradle index 70dbc9f8..8a81acc0 100644 --- a/play-services-basement/build.gradle +++ b/play-services-basement/build.gradle @@ -60,7 +60,7 @@ android { } dependencies { - api 'com.android.support:support-v4:25.3.1' + api "com.android.support:support-v4:$supportLibraryVersion" api 'org.microg:safe-parcel:1.5.0' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" } diff --git a/play-services-basement/src/main/java/com/google/android/gms/common/data/DataHolder.java b/play-services-basement/src/main/java/com/google/android/gms/common/data/DataHolder.java index 8765c56c..2867e413 100644 --- a/play-services-basement/src/main/java/com/google/android/gms/common/data/DataHolder.java +++ b/play-services-basement/src/main/java/com/google/android/gms/common/data/DataHolder.java @@ -153,7 +153,7 @@ public class DataHolder extends AutoSafeParcelable implements Closeable { } @SuppressWarnings("deprecation") - @SuppressLint("NewApi") + @SuppressLint({"NewApi", "ObsoleteSdkInt"}) static int getCursorType(Cursor cursor, int i) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { return cursor.getType(i); diff --git a/play-services-basement/src/main/java/com/google/android/gms/common/images/WebImage.java b/play-services-basement/src/main/java/com/google/android/gms/common/images/WebImage.java index 662c9721..c8f8f2a2 100644 --- a/play-services-basement/src/main/java/com/google/android/gms/common/images/WebImage.java +++ b/play-services-basement/src/main/java/com/google/android/gms/common/images/WebImage.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013-2017 microG Project Team + * Copyright (C) 2013-2019 microG Project Team * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,6 +16,8 @@ package com.google.android.gms.common.images; +import java.util.Locale; + import android.net.Uri; import org.microg.safeparcel.AutoSafeParcelable; @@ -57,6 +59,6 @@ public class WebImage extends AutoSafeParcelable { } public String toString() { - return String.format("Image %dx%d %s", new Object[]{Integer.valueOf(width), Integer.valueOf(height), uri.toString()}); + return String.format(Locale.getDefault(), "Image %dx%d %s", new Object[]{Integer.valueOf(width), Integer.valueOf(height), uri.toString()}); } }