Skip to content

Commit 9a95155

Browse files
committed
- Migrating app to androidX
- Updating gradle wrapper & tools version - Updating InstabugSDK to latest version
1 parent f5846bc commit 9a95155

13 files changed

+31
-24
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ For more info, visit [Instabug.com](https://www.instabug.com).
1515
Add this line to your build.gradle file.
1616

1717
```groovy
18-
implementation 'com.instabug.library:instabug:8.7.2'
18+
implementation 'com.instabug.library:instabug:9.0.1'
1919
```
2020

2121
## Usage

app/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,22 +45,22 @@ repositories {
4545

4646
dependencies {
4747
implementation fileTree(dir: 'libs', include: ['*.jar'])
48-
implementation 'com.android.support:multidex:1.0.3'
49-
implementation "com.android.support:design:$rootProject.ext.androidSupport"
50-
implementation "com.android.support:appcompat-v7:$rootProject.ext.androidSupport"
48+
implementation "androidx.multidex:multidex:$rootProject.ext.multidex"
49+
implementation "com.google.android.material:material:$rootProject.ext.material"
50+
implementation "androidx.appcompat:appcompat:$rootProject.ext.androidXAppCompat"
5151

5252
implementation 'com.google.firebase:firebase-core:16.0.0'
5353
implementation 'com.google.firebase:firebase-messaging:17.0.0'
5454

5555
//TODO add the following 2 lines if you exclude io.reactivex from Instabug
5656
//implementation 'io.reactivex:rxjava:1.0.13'
5757
//implementation 'io.reactivex:rxandroid:1.0.1'
58-
implementation('com.instabug.library:instabug:8.7.2') {
58+
implementation("com.instabug.library:instabug:$rootProject.ext.instabugSDK") {
5959
// TODO uncomment this line to exclude RxJava from Instabug and use your own version
6060
// exclude group: 'io.reactivex'
6161

6262
// TODO uncomment next line if you're facing compilation issue in build.gradle about gms different versions
6363
//exclude group: 'com.android.support'
6464
}
65-
implementation 'petrov.kristiyan:colorpicker-library:1.1.8'
65+
implementation "petrov.kristiyan:colorpicker-library:$rootProject.ext.colorPicker"
6666
}

app/src/main/java/com/example/instabug/BaseActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.example.instabug;
22

3-
import android.support.v7.app.AppCompatActivity;
3+
import androidx.appcompat.app.AppCompatActivity;
44
import android.view.MotionEvent;
55

66
import com.instabug.library.InstabugTrackingDelegate;

app/src/main/java/com/example/instabug/SampleApplication.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import android.app.Application;
44
import android.content.Context;
5-
import android.support.multidex.MultiDex;
5+
import androidx.multidex.MultiDex;
66

77
import com.instabug.bug.BugReporting;
88
import com.instabug.library.Instabug;

app/src/main/java/com/example/instabug/fcm/InstabugFCMListenerService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import android.content.Intent;
77
import android.media.RingtoneManager;
88
import android.net.Uri;
9-
import android.support.v4.app.NotificationCompat;
9+
import androidx.core.app.NotificationCompat;
1010
import android.util.Log;
1111

1212
import com.example.instabug.R;

app/src/main/java/com/example/instabug/fcm/RegistrationIntentService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import android.content.Intent;
55
import android.content.SharedPreferences;
66
import android.preference.PreferenceManager;
7-
import android.support.v4.content.LocalBroadcastManager;
7+
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
88
import android.util.Log;
99

1010
import com.google.firebase.iid.FirebaseInstanceId;

app/src/main/java/com/example/instabug/ui/activities/MainActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import android.net.Uri;
77
import android.os.AsyncTask;
88
import android.os.Bundle;
9-
import android.support.v7.widget.Toolbar;
9+
import androidx.appcompat.widget.Toolbar;
1010
import android.util.Log;
1111
import android.view.View;
1212

app/src/main/java/com/example/instabug/ui/activities/SettingsActivity.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import android.content.DialogInterface;
44
import android.os.Bundle;
5-
import android.support.annotation.Nullable;
6-
import android.support.v7.app.AlertDialog;
7-
import android.support.v7.widget.Toolbar;
5+
import androidx.annotation.Nullable;
6+
import androidx.appcompat.app.AlertDialog;
7+
import androidx.appcompat.widget.Toolbar;
88
import android.view.View;
99

1010
import com.example.instabug.BaseActivity;

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.design.widget.CoordinatorLayout
2+
<androidx.coordinatorlayout.widget.CoordinatorLayout
33
xmlns:android="http://schemas.android.com/apk/res/android"
44
xmlns:app="http://schemas.android.com/apk/res-auto"
55
xmlns:tools="http://schemas.android.com/tools"
@@ -11,4 +11,4 @@
1111

1212
<include layout="@layout/content_main"/>
1313

14-
</android.support.design.widget.CoordinatorLayout>
14+
</androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/layout/app_bar.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
<merge xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto">
44

5-
<android.support.design.widget.AppBarLayout
5+
<com.google.android.material.appbar.AppBarLayout
66
android:layout_width="match_parent"
77
android:layout_height="wrap_content"
88
android:fitsSystemWindows="true"
99
android:theme="@style/AppTheme.AppBarOverlay">
1010

11-
<android.support.v7.widget.Toolbar
11+
<androidx.appcompat.widget.Toolbar
1212
android:id="@+id/toolbar"
1313
android:layout_width="match_parent"
1414
android:layout_height="?attr/actionBarSize"
1515
android:background="?attr/colorPrimary"
1616
app:popupTheme="@style/AppTheme.PopupOverlay" />
1717

18-
</android.support.design.widget.AppBarLayout>
18+
</com.google.android.material.appbar.AppBarLayout>
1919
</merge>

build.gradle

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@ buildscript {
66
google()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.3.1'
9+
classpath 'com.android.tools.build:gradle:3.5.1'
1010

1111
}
1212
}
1313

1414
allprojects {
1515
repositories {
1616
jcenter()
17+
google()
1718
}
1819
}
1920

@@ -23,5 +24,9 @@ task clean(type: Delete) {
2324

2425

2526
ext {
26-
androidSupport = "28.0.0"
27+
multidex = "2.0.1"
28+
material = "1.0.0"
29+
androidXAppCompat = "1.1.0"
30+
instabugSDK = "9.0.1"
31+
colorPicker = "1.1.8"
2732
}

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
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Jan 16 11:13:18 EET 2019
1+
#Mon Nov 11 16:52:56 EET 2019
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.10.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

0 commit comments

Comments
 (0)