From 3e70603d598e917d52602b72fd69dd5871799b4a Mon Sep 17 00:00:00 2001 From: Marvin W Date: Sun, 14 Jun 2020 23:14:47 +0200 Subject: [PATCH] Update for use with androidx --- .../com/google/android/gms/maps/model/LatLng.aidl | 3 --- .../android/gms/maps/model/LatLngBounds.aidl | 3 --- play-services-basement/build.gradle | 15 ++++++++------- .../android/gms/common/api/CommonStatusCodes.java | 2 +- .../google/android/gms/dynamic/ObjectWrapper.java | 3 ++- play-services-location-api/build.gradle | 3 ++- .../internal/IGoogleLocationManagerService.aidl | 3 +++ 7 files changed, 16 insertions(+), 16 deletions(-) delete mode 100644 play-services-api/src/main/aidl/com/google/android/gms/maps/model/LatLng.aidl delete mode 100644 play-services-api/src/main/aidl/com/google/android/gms/maps/model/LatLngBounds.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/maps/model/LatLng.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/model/LatLng.aidl deleted file mode 100644 index 42df9312..00000000 --- a/play-services-api/src/main/aidl/com/google/android/gms/maps/model/LatLng.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package com.google.android.gms.maps.model; - -parcelable LatLng; diff --git a/play-services-api/src/main/aidl/com/google/android/gms/maps/model/LatLngBounds.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/model/LatLngBounds.aidl deleted file mode 100644 index 22bf17b4..00000000 --- a/play-services-api/src/main/aidl/com/google/android/gms/maps/model/LatLngBounds.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package com.google.android.gms.maps.model; - -parcelable LatLngBounds; diff --git a/play-services-basement/build.gradle b/play-services-basement/build.gradle index 8a81acc0..6b815a35 100644 --- a/play-services-basement/build.gradle +++ b/play-services-basement/build.gradle @@ -15,8 +15,15 @@ */ apply plugin: 'com.android.library' -apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-android' +apply plugin: 'kotlin-android-extensions' + +dependencies { + api "org.microg:safe-parcel:$safeParcelVersion" + + implementation "androidx.annotation:annotation:$annotationVersion" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion" +} String getMyVersionName() { def stdout = new ByteArrayOutputStream() @@ -58,9 +65,3 @@ android { targetCompatibility JavaVersion.VERSION_1_8 } } - -dependencies { - 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/api/CommonStatusCodes.java b/play-services-basement/src/main/java/com/google/android/gms/common/api/CommonStatusCodes.java index 3a703e68..6a2cbb51 100644 --- a/play-services-basement/src/main/java/com/google/android/gms/common/api/CommonStatusCodes.java +++ b/play-services-basement/src/main/java/com/google/android/gms/common/api/CommonStatusCodes.java @@ -16,7 +16,7 @@ package com.google.android.gms.common.api; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.microg.gms.common.PublicApi; diff --git a/play-services-basement/src/main/java/com/google/android/gms/dynamic/ObjectWrapper.java b/play-services-basement/src/main/java/com/google/android/gms/dynamic/ObjectWrapper.java index 310804e7..6f26194b 100644 --- a/play-services-basement/src/main/java/com/google/android/gms/dynamic/ObjectWrapper.java +++ b/play-services-basement/src/main/java/com/google/android/gms/dynamic/ObjectWrapper.java @@ -17,7 +17,8 @@ package com.google.android.gms.dynamic; import android.os.IBinder; -import android.support.annotation.Nullable; + +import androidx.annotation.Nullable; import java.lang.reflect.Field; diff --git a/play-services-location-api/build.gradle b/play-services-location-api/build.gradle index 763e01b6..afe3e406 100644 --- a/play-services-location-api/build.gradle +++ b/play-services-location-api/build.gradle @@ -45,5 +45,6 @@ android { } dependencies { - api project(':play-services-basement') + implementation project(':play-services-basement') + implementation "org.microg:safe-parcel:$safeParcelVersion" } diff --git a/play-services-location-api/src/main/aidl/com/google/android/gms/location/internal/IGoogleLocationManagerService.aidl b/play-services-location-api/src/main/aidl/com/google/android/gms/location/internal/IGoogleLocationManagerService.aidl index 605bbf1d..8e78a899 100644 --- a/play-services-location-api/src/main/aidl/com/google/android/gms/location/internal/IGoogleLocationManagerService.aidl +++ b/play-services-location-api/src/main/aidl/com/google/android/gms/location/internal/IGoogleLocationManagerService.aidl @@ -55,6 +55,7 @@ interface IGoogleLocationManagerService { void removeLocationUpdatesWithListener(ILocationListener listener) = 9; void removeLocationUpdatesWithIntent(in PendingIntent callbackIntent) = 10; void updateLocationRequest(in LocationRequestUpdateData locationRequestUpdateData) = 58; + //void flushLocations(IFusedLocationProviderCallback callback = 66; void setMockMode(boolean mockMode) = 11; void setMockLocation(in Location mockLocation) = 12; @@ -82,4 +83,6 @@ interface IGoogleLocationManagerService { IBinder iglms54() = 53; void iglms55(String var1, in LatLngBounds var2, in AutocompleteFilter var3, in PlacesParams var4, IPlacesCallbacks var5) = 54; void iglms58(in List var1, in PlacesParams var2, IPlacesCallbacks var3) = 57; + + //void updateDeviceOrientationRequest(in DeviceOrientationRequestUpdateData request) = 74; }