diff --git a/app/build.gradle b/app/build.gradle index 537b075..fa7b1e3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,15 +4,15 @@ apply plugin: 'kotlin-kapt' apply plugin: 'realm-android' android { - compileSdkVersion 27 + compileSdkVersion 29 buildToolsVersion '28.0.3' defaultConfig { applicationId "eu.droogers.smsmatrix" minSdkVersion 23 - targetSdkVersion 27 + targetSdkVersion 29 versionCode 12 versionName "0.0.12" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { release { @@ -34,13 +34,14 @@ android { } dependencies { - implementation 'com.android.support:appcompat-v7:27.1.1' + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.preference:preference:1.1.0' implementation fileTree(dir: 'libs', include: ['*.jar']) - androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { + androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { exclude group: 'com.android.support', module: 'support-annotations' }) - implementation 'com.android.support.constraint:constraint-layout:1.1.3' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' testImplementation 'junit:junit:4.12' implementation(name: 'matrix-sdk', ext: 'aar') @@ -49,10 +50,10 @@ dependencies { implementation(name: 'olm-sdk', ext: 'aar') implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'com.squareup.retrofit2:retrofit:2.4.0' + implementation 'com.squareup.retrofit2:retrofit:2.6.0' implementation 'com.squareup.retrofit2:converter-gson:2.4.0' - implementation 'com.google.code.gson:gson:2.8.2' - implementation 'com.squareup.okhttp3:okhttp:3.10.0' + implementation 'com.google.code.gson:gson:2.8.5' + implementation 'com.squareup.okhttp3:okhttp:3.12.3' implementation 'com.squareup.okhttp3:logging-interceptor:3.10.0' implementation 'com.facebook.stetho:stetho:1.5.0' implementation 'com.facebook.stetho:stetho-okhttp3:1.5.0' diff --git a/app/src/androidTest/java/eu/droogers/smsmatrix/ExampleInstrumentedTest.java b/app/src/androidTest/java/eu/droogers/smsmatrix/ExampleInstrumentedTest.java index c3704ae..3288948 100644 --- a/app/src/androidTest/java/eu/droogers/smsmatrix/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/eu/droogers/smsmatrix/ExampleInstrumentedTest.java @@ -1,8 +1,8 @@ package eu.droogers.smsmatrix; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.platform.app.InstrumentationRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/app/src/main/java/eu/droogers/smsmatrix/MainActivity.java b/app/src/main/java/eu/droogers/smsmatrix/MainActivity.java index 8c2334e..de21cfd 100644 --- a/app/src/main/java/eu/droogers/smsmatrix/MainActivity.java +++ b/app/src/main/java/eu/droogers/smsmatrix/MainActivity.java @@ -1,6 +1,5 @@ package eu.droogers.smsmatrix; -import android.Manifest; import android.app.Activity; import android.content.Context; import android.content.Intent; @@ -12,8 +11,8 @@ import android.view.View; import android.widget.Button; import android.widget.EditText; -import android.support.v4.app.ActivityCompat; -import android.support.v4.content.ContextCompat; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; import static android.Manifest.permission.READ_CONTACTS; import static android.Manifest.permission.READ_EXTERNAL_STORAGE; diff --git a/gradle.properties b/gradle.properties index aac7c9b..9e6fce1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,6 +9,8 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. +android.enableJetifier=true +android.useAndroidX=true org.gradle.jvmargs=-Xmx1536m # When configured, Gradle will run in incubating parallel mode.