Fix various linker warnings

This commit is contained in:
Marvin W 2019-10-15 02:53:05 +02:00
parent 50d788a2b3
commit 7f32119d89
No known key found for this signature in database
GPG Key ID: 072E9235DB996F2A
4 changed files with 7 additions and 4 deletions

View File

@ -30,6 +30,7 @@ buildscript {
allprojects { allprojects {
apply plugin: 'idea' apply plugin: 'idea'
ext.androidBuildVersionTools = "29.0.2" ext.androidBuildVersionTools = "29.0.2"
ext.supportLibraryVersion = "28.0.0"
} }
def androidCompileSdk() { return 29 } def androidCompileSdk() { return 29 }

View File

@ -60,7 +60,7 @@ android {
} }
dependencies { 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' api 'org.microg:safe-parcel:1.5.0'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
} }

View File

@ -153,7 +153,7 @@ public class DataHolder extends AutoSafeParcelable implements Closeable {
} }
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
@SuppressLint("NewApi") @SuppressLint({"NewApi", "ObsoleteSdkInt"})
static int getCursorType(Cursor cursor, int i) { static int getCursorType(Cursor cursor, int i) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
return cursor.getType(i); return cursor.getType(i);

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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; package com.google.android.gms.common.images;
import java.util.Locale;
import android.net.Uri; import android.net.Uri;
import org.microg.safeparcel.AutoSafeParcelable; import org.microg.safeparcel.AutoSafeParcelable;
@ -57,6 +59,6 @@ public class WebImage extends AutoSafeParcelable {
} }
public String toString() { 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()});
} }
} }