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

Verified Commit 4373972b authored by Marvin W.'s avatar Marvin W. 🐿️
Browse files

Update for use with androidx

parent 15cd4491

play-services-base/build.gradle

+2 −0
Original line number Diff line number Diff line
@@ -44,4 +44,6 @@ android { 
dependencies {

    api project(':play-services-basement')

    api project(':play-services-tasks')



    implementation "androidx.fragment:fragment:$fragmentVersion"

}

play-services-base/src/main/java/com/google/android/gms/common/GoogleApiAvailability.java

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import android.app.PendingIntent; 
import android.content.Context;

import android.content.DialogInterface;

import android.os.Bundle;

import android.support.v4.app.FragmentActivity;

import androidx.fragment.app.FragmentActivity;

import android.util.Log;



import com.google.android.gms.common.api.GoogleApiClient.OnConnectionFailedListener;

play-services-base/src/main/java/com/google/android/gms/common/api/GoogleApiClient.java

+2 −1
Original line number Diff line number Diff line
@@ -21,9 +21,10 @@ import android.content.Context; 
import android.os.Bundle;

import android.os.Handler;

import android.os.Looper;

import android.support.v4.app.FragmentActivity;

import android.view.View;



import androidx.fragment.app.FragmentActivity;



import com.google.android.gms.common.ConnectionResult;



import org.microg.gms.auth.AuthConstants;

play-services-base/src/main/java/org/microg/gms/common/api/GoogleApiClientImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import android.content.Context; 
import android.os.Bundle;

import android.os.Looper;

import android.os.Message;

import android.support.v4.app.FragmentActivity;

import androidx.fragment.app.FragmentActivity;

import android.util.Log;



import com.google.android.gms.common.ConnectionResult;