Skip to content

Commit f034986

Browse files
author
dongxl
committed
升级到Androidx
1 parent 414d100 commit f034986

10 files changed

Lines changed: 31 additions & 32 deletions

File tree

‎app/build.gradle‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ android {
1212
versionName "1.0"
1313

1414
multiDexEnabled true
15-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
15+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1616
}
1717

1818
buildTypes {
@@ -26,13 +26,13 @@ android {
2626

2727
dependencies {
2828
implementation fileTree(dir: 'libs', include: ['*.jar'])
29-
implementation 'com.android.support:multidex:1.0.3'
30-
implementation 'com.android.support:appcompat-v7:28.0.0'
31-
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
29+
implementation 'androidx.multidex:multidex:2.0.1'
30+
implementation 'androidx.appcompat:appcompat:1.1.0'
31+
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
3232
testImplementation 'junit:junit:4.12'
33-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
34-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
35-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
33+
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
34+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
35+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
3636
implementation 'com.github.commonprogress:PushAll:v1.2.1'
3737
// implementation project(path: ':dongxlpush')
38-
}
38+
}

‎app/src/androidTest/java/com/dongxl/push/ExampleInstrumentedTest.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.dongxl.push;
22

33
import android.content.Context;
4-
import android.support.test.InstrumentationRegistry;
5-
import android.support.test.runner.AndroidJUnit4;
4+
import androidx.test.platform.app.InstrumentationRegistry;
5+
import androidx.test.ext.junit.runners.AndroidJUnit4;
66

77
import org.junit.Test;
88
import org.junit.runner.RunWith;
@@ -19,8 +19,7 @@ public class ExampleInstrumentedTest {
1919
@Test
2020
public void useAppContext() {
2121
// Context of the app under test.
22-
Context appContext = InstrumentationRegistry.getTargetContext();
23-
22+
Context appContext = InstrumentationRegistry.getInstrumentation().getContext();
2423
assertEquals("com.dongxl.push", appContext.getPackageName());
2524
}
2625
}

‎app/src/main/java/com/dongxl/push/DongApplication.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
package com.dongxl.push;
22

33
import android.app.ActivityManager;
4-
import android.app.Application;
54
import android.content.Context;
6-
import android.support.multidex.MultiDexApplication;
5+
import androidx.multidex.MultiDexApplication;
76

87
import com.dongxl.pushdeme.PushRegisterSet;
98

‎app/src/main/java/com/dongxl/push/MainActivity.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
11
package com.dongxl.push;
22

3-
import android.app.ActivityManager;
43
import android.app.job.JobInfo;
54
import android.app.job.JobScheduler;
65
import android.content.ComponentName;
76
import android.content.Context;
87
import android.content.pm.PackageManager;
98
import android.os.Build;
10-
import android.support.v7.app.AppCompatActivity;
9+
import androidx.appcompat.app.AppCompatActivity;
1110
import android.os.Bundle;
1211
import android.util.Log;
1312
import android.view.View;
1413

1514
import com.dongxl.push.service.MyJobService;
1615
import com.dongxl.push.uitls.UWhiteListSetting;
17-
import com.dongxl.push.uitls.ZiqiManager;
1816
import com.dongxl.pushdeme.PushRegisterSet;
1917

2018
public class MainActivity extends AppCompatActivity {
@@ -77,7 +75,7 @@ public void onRequestPermissionsResult(int requestCode,
7775
Log.w("PermissionActivity", "Permissions granted:");
7876
// PushRegisterSet.registerInitPush(MainActivity.this);
7977
}
80-
finish();
78+
// finish();
8179
}
8280
}
8381
private int mJobId = 0;

‎app/src/main/java/com/dongxl/push/service/MyJobIntentService.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.dongxl.push.service;
22

33
import android.content.Intent;
4-
import android.support.annotation.NonNull;
5-
import android.support.v4.app.JobIntentService;
4+
import androidx.annotation.NonNull;
5+
import androidx.core.app.JobIntentService;
66

77
import com.dongxl.pushdeme.utils.LogUtils;
88

‎app/src/main/java/com/dongxl/push/service/TestJobIntentService.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
import android.content.ComponentName;
2121
import android.content.Context;
2222
import android.content.Intent;
23-
import android.support.annotation.NonNull;
24-
import android.support.v4.app.JobIntentService;
23+
import androidx.annotation.NonNull;
24+
import androidx.core.app.JobIntentService;
2525
import android.text.TextUtils;
2626

2727
import com.dongxl.pushdeme.PushConstants;

‎app/src/main/res/layout/activity_main.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
2+
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto"
44
xmlns:tools="http://schemas.android.com/tools"
55
android:layout_width="match_parent"
@@ -31,4 +31,4 @@
3131
app:layout_constraintTop_toBottomOf="@+id/bottom1" />
3232

3333

34-
</android.support.constraint.ConstraintLayout>
34+
</androidx.constraintlayout.widget.ConstraintLayout>

‎dongxlpush/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@ android {
6262

6363
dependencies {
6464
implementation fileTree(include: ['*.jar'], dir: 'libs')
65-
implementation 'com.android.support:appcompat-v7:28.0.0'
65+
implementation 'androidx.appcompat:appcompat:1.1.0'
6666
testImplementation 'junit:junit:4.12'
67-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
68-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
67+
androidTestImplementation 'androidx.test:core:1.2.0'
68+
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
6969
/*华为推送引用*/
7070
implementation 'com.huawei.hms:push:3.0.2.300'
7171
implementation 'com.huawei.hms:opendevice:3.0.2.300'

‎dongxlpush/src/androidTest/java/com/dongxl/pushdeme/ExampleInstrumentedTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.dongxl.pushdeme;
22

33
import android.content.Context;
4-
import android.support.test.InstrumentationRegistry;
5-
import android.support.test.runner.AndroidJUnit4;
4+
import androidx.test.platform.app.InstrumentationRegistry;
5+
import androidx.test.ext.junit.runners.AndroidJUnit4;
66

77
import org.junit.Test;
88
import org.junit.runner.RunWith;
@@ -19,7 +19,7 @@ public class ExampleInstrumentedTest {
1919
@Test
2020
public void useAppContext() {
2121
// Context of the app under test.
22-
Context appContext = InstrumentationRegistry.getTargetContext();
22+
Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
2323

2424
assertEquals("com.dongxl.pushdeme.test", appContext.getPackageName());
2525
}

‎gradle.properties‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,15 @@ org.gradle.parallel=true
1414
org.gradle.daemon=true
1515
org.gradle.configureondemand=true
1616
#android.enableAapt2=false
17-
#android.useAndroidX=true
18-
#android.enableJetifier=true
17+
android.useAndroidX=true
18+
android.enableJetifier=true
19+
#表示将依赖包也迁移到AndroidX 。如果取值为 false ,表示不迁移依赖包到AndroidX，但在使用依赖包中的内容时可能会出现问题，当然了，如果你的项目中没有使用任何三方依赖，那么，此项可以设置为 false
20+
1921

2022
# When configured, Gradle will run in incubating parallel mode.
2123
# This option should only be used with decoupled projects. More details, visit
2224
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
2325
# org.gradle.parallel=true
2426
# Kotlin code style for this project: "official" or "obsolete":
2527
kotlin.code.style=official
28+
#android.jetifier.blacklist=^(?!.*[\\\\/]com\\.github\\.bumptech\\.glide[\\\\/]).*(shapeless).*$

0 commit comments

Comments
 (0)