Skip to content
This repository was archived by the owner on Oct 31, 2022. It is now read-only.

Commit dba3815

Browse files
author
Mukesh Solanki
committed
Updated libs to AndroidX
1 parent 6866485 commit dba3815

File tree

8 files changed

+24
-18
lines changed

8 files changed

+24
-18
lines changed

app/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 28
4+
compileSdkVersion 29
55

66
defaultConfig {
77
applicationId "com.mukesh.permissionsexample"
88
minSdkVersion 23
9-
targetSdkVersion 28
9+
targetSdkVersion 29
1010
versionCode 1
1111
versionName "1.0"
1212
}
@@ -20,6 +20,6 @@ android {
2020

2121
dependencies {
2222
implementation fileTree(include: ['*.jar'], dir: 'libs')
23-
implementation 'com.android.support:appcompat-v7:28.0.0'
23+
implementation 'androidx.appcompat:appcompat:1.2.0'
2424
implementation project(':library')
2525
}

app/src/main/java/com/mukesh/permissionsexample/MainActivity.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@
22

33
import android.Manifest;
44
import android.os.Bundle;
5-
import android.support.annotation.NonNull;
6-
import android.support.v7.app.AppCompatActivity;
75
import android.view.View;
86
import android.widget.Button;
97
import android.widget.Toast;
8+
9+
import androidx.annotation.NonNull;
10+
import androidx.appcompat.app.AppCompatActivity;
11+
1012
import com.mukesh.permissions.EasyPermissions;
1113
import com.mukesh.permissions.OnPermissionListener;
1214
import java.util.List;

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
google()
55
}
66
dependencies {
7-
classpath 'com.android.tools.build:gradle:3.2.1'
7+
classpath 'com.android.tools.build:gradle:4.0.1'
88
}
99
}
1010

gradle.properties

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,5 @@
1515
# When configured, Gradle will run in incubating parallel mode.
1616
# This option should only be used with decoupled projects. More details, visit
1717
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
18-
# org.gradle.parallel=true
18+
# org.gradle.parallel=true
19+
android.useAndroidX=true
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Thu Sep 06 19:17:21 IST 2018
1+
#Wed Aug 12 11:47:56 EDT 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.9-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

library/build.gradle

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ apply plugin: 'com.android.library'
33
group='com.github.mukeshsolanki'
44

55
android {
6-
compileSdkVersion 28
6+
compileSdkVersion 29
77

88
defaultConfig {
99
minSdkVersion 14
10-
targetSdkVersion 28
11-
versionCode 7
12-
versionName "2.0.1"
10+
targetSdkVersion 29
11+
versionCode 8
12+
versionName "2.0.2"
1313
}
1414
buildTypes {
1515
release {
@@ -21,6 +21,6 @@ android {
2121

2222
dependencies {
2323
implementation fileTree(dir: 'libs', include: ['*.jar'])
24-
implementation 'com.android.support:appcompat-v7:28.0.0'
25-
implementation 'com.android.support:support-annotations:28.0.0'
24+
implementation 'androidx.appcompat:appcompat:1.2.0'
25+
implementation 'androidx.annotation:annotation:1.1.0'
2626
}

library/src/main/java/com/mukesh/permissions/EasyPermissions.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22

33
import android.app.Activity;
44
import android.content.pm.PackageManager;
5-
import android.support.annotation.NonNull;
6-
import android.support.v4.app.ActivityCompat;
5+
6+
import androidx.annotation.NonNull;
7+
import androidx.core.app.ActivityCompat;
8+
79
import java.util.ArrayList;
810
import java.util.Arrays;
911
import java.util.List;

library/src/main/java/com/mukesh/permissions/OnPermissionListener.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.mukesh.permissions;
22

3-
import android.support.annotation.NonNull;
3+
import androidx.annotation.NonNull;
4+
45
import java.util.List;
56

67
public interface OnPermissionListener {

0 commit comments

Comments
 (0)