Skip to content

Commit 4ce6665

Browse files
Haozi0456Haozi0456
committed
1. 升级到androidx
1 parent 152722b commit 4ce6665

File tree

13 files changed

+164
-33
lines changed

13 files changed

+164
-33
lines changed

‎.idea/caches/build_file_checksums.ser

594 Bytes
Binary file not shown.

‎.idea/caches/gradle_models.ser

141 KB
Binary file not shown.

‎.idea/codeStyles/Project.xml

+116
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/gradle.xml

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/misc.xml

+17-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/modules.xml

-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/build.gradle

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

33
android {
4-
compileSdkVersion 26
4+
compileSdkVersion 29
55
defaultConfig {
66
applicationId "com.zwh.easy.permissions"
77
minSdkVersion 19
8-
targetSdkVersion 26
8+
targetSdkVersion 29
99
versionCode 1
1010
versionName "1.0"
1111
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -20,11 +20,13 @@ android {
2020

2121
dependencies {
2222
implementation fileTree(dir: 'libs', include: ['*.jar'])
23-
implementation 'com.android.support:appcompat-v7:26.1.0'
24-
implementation 'com.android.support.constraint:constraint-layout:1.1.2'
23+
implementation 'androidx.appcompat:appcompat:1.1.0'
24+
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
25+
api 'androidx.annotation:annotation:1.1.0'
26+
api "com.google.android.material:material:1.1.0"
2527
testImplementation 'junit:junit:4.12'
26-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
27-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
28+
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
29+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
2830

2931
compile project(':library')
3032
}

‎app/src/main/java/com/zwh/easy/permissions/demo/MainActivity.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
import android.Manifest;
44
import android.os.Bundle;
5-
import android.support.v4.content.res.ResourcesCompat;
6-
import android.support.v7.app.AppCompatActivity;
75
import android.util.Log;
86
import android.view.View;
97
import android.widget.Toast;
@@ -15,6 +13,9 @@
1513
import java.util.ArrayList;
1614
import java.util.List;
1715

16+
import androidx.appcompat.app.AppCompatActivity;
17+
import androidx.core.content.res.ResourcesCompat;
18+
1819
public class MainActivity extends AppCompatActivity implements View.OnClickListener {
1920

2021
private static final String TAG = "MainActivity";

‎build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
jcenter()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:3.0.1'
10+
classpath 'com.android.tools.build:gradle:3.5.3'
1111
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
1212

1313
// NOTE: Do not place your application dependencies here; they belong

‎gradle/wrapper/gradle-wrapper.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Mon Aug 13 10:32:00 CST 2018
1+
#Tue Apr 14 17:10:16 CST 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.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

‎library/build.gradle

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
apply plugin: 'com.android.library'
22
apply plugin: 'com.github.dcendents.android-maven'
33
android {
4-
compileSdkVersion 26
5-
6-
4+
compileSdkVersion 29
75

86
defaultConfig {
97
minSdkVersion 19
10-
targetSdkVersion 26
8+
targetSdkVersion 29
119
versionCode 1
1210
versionName "1.0"
1311

@@ -27,8 +25,10 @@ android {
2725
dependencies {
2826
implementation fileTree(dir: 'libs', include: ['*.jar'])
2927

30-
implementation 'com.android.support:appcompat-v7:26.1.0'
28+
implementation 'androidx.appcompat:appcompat:1.1.0'
29+
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
30+
3131
testImplementation 'junit:junit:4.12'
32-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
33-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
32+
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
33+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
3434
}

‎library/src/main/java/com/zwh/easy/permissions/EasyPermission.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@
44
import android.content.Intent;
55
import android.content.pm.PackageManager;
66
import android.os.Build;
7-
import android.support.v4.content.ContextCompat;
87

98
import java.io.Serializable;
109
import java.util.ArrayList;
1110
import java.util.Iterator;
1211
import java.util.List;
1312

13+
import androidx.core.content.ContextCompat;
14+
1415
import static android.Manifest.permission.ACCESS_FINE_LOCATION;
1516
import static android.Manifest.permission.CAMERA;
1617
import static android.Manifest.permission.WRITE_EXTERNAL_STORAGE;

‎library/src/main/java/com/zwh/easy/permissions/PermissionActivity.java

+7-6
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,6 @@
99
import android.net.Uri;
1010
import android.os.Bundle;
1111
import android.provider.Settings;
12-
import android.support.annotation.NonNull;
13-
import android.support.annotation.Nullable;
14-
import android.support.v4.app.ActivityCompat;
15-
import android.support.v4.content.ContextCompat;
16-
import android.support.v7.app.AlertDialog;
17-
import android.support.v7.app.AppCompatActivity;
1812
import android.text.TextUtils;
1913
import android.util.Log;
2014
import android.view.View;
@@ -23,6 +17,13 @@
2317
import java.util.List;
2418
import java.util.ListIterator;
2519

20+
import androidx.annotation.NonNull;
21+
import androidx.annotation.Nullable;
22+
import androidx.appcompat.app.AlertDialog;
23+
import androidx.appcompat.app.AppCompatActivity;
24+
import androidx.core.app.ActivityCompat;
25+
import androidx.core.content.ContextCompat;
26+
2627

2728
/**
2829
* Created by Administrator on 2017/5/10 0010.

0 commit comments

Comments
 (0)