Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Verified Commit 3e70603d authored by Marvin W.'s avatar Marvin W. 🐿️
Browse files

Update for use with androidx

parent 2a43448e

play-services-api/src/main/aidl/com/google/android/gms/maps/model/LatLng.aidl

deleted100644 → 0
+0 −3
Original line number Original line Diff line number Diff line 
package com.google.android.gms.maps.model;



parcelable LatLng;

play-services-api/src/main/aidl/com/google/android/gms/maps/model/LatLngBounds.aidl

deleted100644 → 0
+0 −3
Original line number Original line Diff line number Diff line 
package com.google.android.gms.maps.model;



parcelable LatLngBounds;

play-services-basement/build.gradle

+8 −7
Original line number Original line Diff line number Diff line
@@ -15,8 +15,15 @@ 
 */

 */





apply plugin: 'com.android.library'

apply plugin: 'com.android.library'

apply plugin: 'kotlin-android-extensions'

apply plugin: 'kotlin-android'

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() {

String getMyVersionName() {

    def stdout = new ByteArrayOutputStream()

    def stdout = new ByteArrayOutputStream()
@@ -58,9 +65,3 @@ android { 
        targetCompatibility JavaVersion.VERSION_1_8

        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"

}

play-services-basement/src/main/java/com/google/android/gms/common/api/CommonStatusCodes.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -16,7 +16,7 @@ 




package com.google.android.gms.common.api;

package com.google.android.gms.common.api;





import android.support.annotation.NonNull;

import androidx.annotation.NonNull;





import org.microg.gms.common.PublicApi;

import org.microg.gms.common.PublicApi;

play-services-basement/src/main/java/com/google/android/gms/dynamic/ObjectWrapper.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -17,7 +17,8 @@ 
package com.google.android.gms.dynamic;

package com.google.android.gms.dynamic;





import android.os.IBinder;

import android.os.IBinder;

import android.support.annotation.Nullable;



import androidx.annotation.Nullable;





import java.lang.reflect.Field;

import java.lang.reflect.Field;