Skip to content

Commit 182a3b0

Browse files
TutorialsAndroidTutorialsAndroid
committed
Migrated To AndroidX
1 parent 06bdb9b commit 182a3b0

File tree

10 files changed

+42
-40
lines changed

10 files changed

+42
-40
lines changed

‎gradle.properties‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,6 @@
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.enableJetifier=true
20+
android.useAndroidX=true

‎library/build.gradle‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ apply plugin: 'com.github.dcendents.android-maven'
44
group='com.github.TutorialsAndroid'
55

66
android {
7-
compileSdkVersion 28
7+
compileSdkVersion 29
88
resourcePrefix 'crash_'
99

1010
defaultConfig {
1111
minSdkVersion 15
12-
targetSdkVersion 28
13-
versionCode 4
14-
versionName "1.0.19" //renamed library version properly.
12+
targetSdkVersion 29
13+
versionCode 5
14+
versionName "2.0.19" //renamed library version properly.
1515
}
1616
buildTypes {
1717
release {
@@ -25,10 +25,10 @@ dependencies {
2525
implementation fileTree(include: ['*.jar'], dir: 'libs')
2626

2727
//ANDROID SUPPORT LIBRARIES
28-
implementation 'com.android.support:appcompat-v7:28.0.0'
29-
implementation 'com.android.support:support-v4:28.0.0'
30-
implementation 'com.android.support:recyclerview-v7:28.0.0'
31-
implementation 'com.android.support:design:28.0.0'
32-
implementation "com.android.support:preference-v7:28.0.0"
33-
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
28+
implementation 'androidx.appcompat:appcompat:1.0.0'
29+
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
30+
implementation 'androidx.recyclerview:recyclerview:1.0.0'
31+
implementation 'com.google.android.material:material:1.0.0'
32+
implementation 'androidx.preference:preference:1.0.0'
33+
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
3434
}

‎library/src/main/java/com/kinda/crash/CrashActivity.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
import android.content.pm.ResolveInfo;
1212
import android.os.Build;
1313
import android.os.Bundle;
14-
import android.support.annotation.NonNull;
15-
import android.support.annotation.Nullable;
16-
import android.support.annotation.RestrictTo;
14+
import androidx.annotation.NonNull;
15+
import androidx.annotation.Nullable;
16+
import androidx.annotation.RestrictTo;
1717
import android.util.Log;
1818

1919
import java.io.PrintWriter;

‎library/src/main/java/com/kinda/crash/activity/DefaultErrorActivity.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
import android.content.res.TypedArray;
88
import android.os.Build;
99
import android.os.Bundle;
10-
import android.support.annotation.Nullable;
11-
import android.support.v4.content.res.ResourcesCompat;
12-
import android.support.v7.app.AlertDialog;
13-
import android.support.v7.app.AppCompatActivity;
10+
import androidx.annotation.Nullable;
11+
import androidx.core.content.res.ResourcesCompat;
12+
import androidx.appcompat.app.AlertDialog;
13+
import androidx.appcompat.app.AppCompatActivity;
1414
import android.util.TypedValue;
1515
import android.view.View;
1616
import android.view.Window;

‎library/src/main/java/com/kinda/crash/config/CrashConfig.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.kinda.crash.config;
22

33
import android.app.Activity;
4-
import android.support.annotation.DrawableRes;
5-
import android.support.annotation.IntDef;
6-
import android.support.annotation.NonNull;
7-
import android.support.annotation.Nullable;
4+
import androidx.annotation.DrawableRes;
5+
import androidx.annotation.IntDef;
6+
import androidx.annotation.NonNull;
7+
import androidx.annotation.Nullable;
88

99
import java.io.Serializable;
1010
import java.lang.annotation.Retention;

‎library/src/main/java/com/kinda/crash/provider/CrashInitProvider.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import android.content.ContentValues;
55
import android.database.Cursor;
66
import android.net.Uri;
7-
import android.support.annotation.NonNull;
8-
import android.support.annotation.Nullable;
7+
import androidx.annotation.NonNull;
8+
import androidx.annotation.Nullable;
99

1010
import com.kinda.crash.CrashActivity;
1111

‎library/src/main/res/layout/crash_default_error_activity.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
android:layout_height="match_parent"
66
android:background="#D50000">
77

8-
<android.support.v7.widget.CardView
8+
<androidx.cardview.widget.CardView
99
android:layout_width="match_parent"
1010
android:layout_height="wrap_content"
1111
android:layout_centerInParent="true"
@@ -64,5 +64,5 @@
6464
android:background="#D50000"
6565
android:drawableBottom="@drawable/crash_ic_error"/>
6666
</LinearLayout>
67-
</android.support.v7.widget.CardView>
67+
</androidx.cardview.widget.CardView>
6868
</RelativeLayout>

‎sample/build.gradle‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
apply plugin: 'com.android.application'
22

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

66
defaultConfig {
77
applicationId "com.kinda.crash.sample"
88
minSdkVersion 15
9-
targetSdkVersion 28
10-
versionCode 4
11-
versionName "1.0.19" //renamed library version properly.
9+
targetSdkVersion 29
10+
versionCode 5
11+
versionName "2.0.19" //renamed library version properly.
1212
}
1313
buildTypes {
1414
debug {
@@ -26,12 +26,12 @@ dependencies {
2626
implementation fileTree(include: ['*.jar'], dir: 'libs')
2727

2828
//ANDROID SUPPORT LIBRARIES
29-
implementation 'com.android.support:appcompat-v7:28.0.0'
30-
implementation 'com.android.support:support-v4:28.0.0'
31-
implementation 'com.android.support:recyclerview-v7:28.0.0'
32-
implementation 'com.android.support:design:28.0.0'
33-
implementation "com.android.support:preference-v7:28.0.0"
34-
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
29+
implementation 'androidx.appcompat:appcompat:1.0.0'
30+
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
31+
implementation 'androidx.recyclerview:recyclerview:1.0.0'
32+
implementation 'com.google.android.material:material:1.0.0'
33+
implementation 'androidx.preference:preference:1.0.0'
34+
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
3535

3636
//CrashX library
3737
implementation project(":library")

‎sample/src/main/java/com/kinda/crash/sample/activity/ErrorActivity.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.kinda.crash.sample.activity;
22

33
import android.os.Bundle;
4-
import android.support.annotation.Nullable;
5-
import android.support.v7.app.AppCompatActivity;
4+
import androidx.annotation.Nullable;
5+
import androidx.appcompat.app.AppCompatActivity;
66
import android.view.View;
77
import android.widget.Button;
88
import android.widget.TextView;

‎sample/src/main/java/com/kinda/crash/sample/activity/MainActivity.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import android.annotation.SuppressLint;
44
import android.os.AsyncTask;
55
import android.os.Bundle;
6-
import android.support.annotation.Nullable;
7-
import android.support.v7.app.AppCompatActivity;
6+
import androidx.annotation.Nullable;
7+
import androidx.appcompat.app.AppCompatActivity;
88
import android.view.View;
99
import android.widget.Button;
1010

0 commit comments

Comments
 (0)