Skip to content

Commit 0a0a95b

Browse files
committedApr 4, 2020
bump to AndroidX and upgrade SDK version
1 parent 8d2a7e9 commit 0a0a95b

File tree

5 files changed

+15
-13
lines changed

5 files changed

+15
-13
lines changed
 

‎app/build.gradle

+6-7
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,15 @@ android {
1818
}
1919

2020
ext {
21-
permissionDispatcherVersion = "3.2.0"
22-
supportLibVersion = "28.0.0"
23-
googlePlayVersion = "15.0.0"
21+
permissionDispatcherVersion = "4.7.0"
22+
supportLibVersion = "1.0.0"
23+
googlePlayVersion = "17.0.0"
2424
}
2525

2626
dependencies {
27-
implementation "com.android.support:appcompat-v7:$supportLibVersion"
28-
implementation "com.android.support:support-v13:$supportLibVersion" // to remove lint error, found in .idea/libraries
27+
implementation "androidx.appcompat:appcompat:1.1.0"
2928
implementation "com.google.android.gms:play-services-maps:$googlePlayVersion"
3029
implementation "com.google.android.gms:play-services-location:$googlePlayVersion"
31-
implementation "com.github.hotchemi:permissionsdispatcher:$permissionDispatcherVersion"
32-
annotationProcessor "com.github.hotchemi:permissionsdispatcher-processor:$permissionDispatcherVersion"
30+
implementation "org.permissionsdispatcher:permissionsdispatcher:$permissionDispatcherVersion"
31+
annotationProcessor "org.permissionsdispatcher:permissionsdispatcher-processor:$permissionDispatcherVersion"
3332
}

‎app/src/main/java/com/example/mapdemo/MapDemoActivity.java

+5-3
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@
55
import android.location.Location;
66
import android.os.Bundle;
77
import android.os.Looper;
8-
import android.support.annotation.NonNull;
9-
import android.support.v7.app.AppCompatActivity;
108
import android.text.TextUtils;
119
import android.util.Log;
1210
import android.widget.Toast;
1311

12+
import androidx.annotation.NonNull;
13+
import androidx.appcompat.app.AppCompatActivity;
14+
import androidx.fragment.app.DialogFragment;
15+
1416
import com.google.android.gms.common.ConnectionResult;
1517
import com.google.android.gms.common.GooglePlayServicesUtil;
1618
import com.google.android.gms.location.FusedLocationProviderClient;
@@ -225,7 +227,7 @@ public void onSaveInstanceState(Bundle savedInstanceState) {
225227
}
226228

227229
// Define a DialogFragment that displays the error dialog
228-
public static class ErrorDialogFragment extends android.support.v4.app.DialogFragment {
230+
public static class ErrorDialogFragment extends DialogFragment {
229231

230232
// Global field to contain the error dialog
231233
private Dialog mDialog;

‎build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:3.2.0'
8+
classpath 'com.android.tools.build:gradle:3.6.2'
99
}
1010
}
1111

‎gradle.properties

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
android.useAndroidX=true
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue Dec 04 23:49:07 PST 2018
1+
#Sat Apr 04 13:17:28 PDT 2020
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

0 commit comments

Comments
 (0)
Please sign in to comment.