Skip to content

Commit 1a4e31a

Browse files
authored
Merge pull request #210 from maximvoven/master
Migrate to Android X
2 parents f07f9f6 + 3d01987 commit 1a4e31a

File tree

4 files changed

+11
-12
lines changed

4 files changed

+11
-12
lines changed

android/build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ def safeExtGet(prop, fallback) {
1616
}
1717

1818
android {
19-
compileSdkVersion safeExtGet('compileSdkVersion', 23)
20-
buildToolsVersion safeExtGet('buildToolsVersion', "23.0.1")
19+
compileSdkVersion safeExtGet('compileSdkVersion', 28)
2120

2221
defaultConfig {
2322
minSdkVersion safeExtGet('minSdkVersion', 23)

android/src/main/java/io/wazo/callkeep/RNCallKeepModule.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@
3333
import android.os.Build;
3434
import android.os.Bundle;
3535
import android.view.WindowManager;
36-
import android.support.annotation.NonNull;
37-
import android.support.annotation.Nullable;
38-
import android.support.v4.app.ActivityCompat;
39-
import android.support.v4.content.ContextCompat;
40-
import android.support.v4.content.LocalBroadcastManager;
36+
import androidx.annotation.NonNull;
37+
import androidx.annotation.Nullable;
38+
import androidx.core.app.ActivityCompat;
39+
import androidx.core.content.ContextCompat;
40+
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
4141
import android.telecom.CallAudioState;
4242
import android.telecom.Connection;
4343
import android.telecom.DisconnectCause;
@@ -67,7 +67,7 @@
6767
import java.util.Map;
6868
import java.util.ResourceBundle;
6969

70-
import static android.support.v4.app.ActivityCompat.requestPermissions;
70+
import static androidx.core.app.ActivityCompat.requestPermissions;
7171

7272
import static io.wazo.callkeep.Constants.EXTRA_CALLER_NAME;
7373
import static io.wazo.callkeep.Constants.EXTRA_CALL_UUID;

android/src/main/java/io/wazo/callkeep/VoiceConnection.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
import android.os.Build;
2424
import android.os.Bundle;
2525
import android.os.Handler;
26-
import android.support.annotation.Nullable;
27-
import android.support.v4.content.LocalBroadcastManager;
26+
import androidx.annotation.Nullable;
27+
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
2828
import android.telecom.CallAudioState;
2929
import android.telecom.Connection;
3030
import android.telecom.DisconnectCause;

android/src/main/java/io/wazo/callkeep/VoiceConnectionService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
import android.os.Bundle;
2727
import android.os.Handler;
2828
import android.speech.tts.Voice;
29-
import android.support.annotation.Nullable;
30-
import android.support.v4.content.LocalBroadcastManager;
29+
import androidx.annotation.Nullable;
30+
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
3131
import android.telecom.CallAudioState;
3232
import android.telecom.Connection;
3333
import android.telecom.ConnectionRequest;

0 commit comments

Comments
 (0)