diff options
| author | Julian Kast <julian@livio.com> | 2020-08-11 09:16:43 -0400 |
|---|---|---|
| committer | Julian Kast <julian@livio.com> | 2020-08-11 09:16:43 -0400 |
| commit | 1d1eed1d485c4dbcd96b6d8cb117d7390b99117c (patch) | |
| tree | 274412fd087f04a3dc3d18bbce42d7037492738b /android/sdl_android/build.gradle | |
| parent | 0daac7bbd72685ffdff656561676b8bddc481b91 (diff) | |
| download | sdl_android-1d1eed1d485c4dbcd96b6d8cb117d7390b99117c.tar.gz | |
convert sdl_android gradle to androidX
Diffstat (limited to 'android/sdl_android/build.gradle')
| -rw-r--r-- | android/sdl_android/build.gradle | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/android/sdl_android/build.gradle b/android/sdl_android/build.gradle index c600dd6dd..7fc5a4891 100644 --- a/android/sdl_android/build.gradle +++ b/android/sdl_android/build.gradle @@ -9,7 +9,7 @@ android { targetSdkVersion 29 versionCode 14 versionName new File(projectDir.path, ('/../../VERSION')).text.trim() - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' resValue "string", "SDL_LIB_VERSION", '\"' + versionName + '\"' } buildTypes { @@ -57,16 +57,17 @@ dependencies { api fileTree(dir: 'libs', include: ['*.jar']) api 'com.smartdevicelink:bson_java_port:1.2.0' api 'com.livio.taskmaster:taskmaster:0.3.0' - 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' }) testImplementation 'junit:junit:4.12' testImplementation 'org.mockito:mockito-core:2.9.0' + androidTestImplementation 'androidx.test.ext:junit:1.1.1' androidTestImplementation 'org.mockito:mockito-core:2.9.0' androidTestImplementation 'org.mockito:mockito-android:2.9.0' - api 'com.android.support:support-annotations:28.0.0' - api "android.arch.lifecycle:extensions:1.1.1" - annotationProcessor "android.arch.lifecycle:compiler:1.1.1" + api 'androidx.annotation:annotation:1.0.0' + api 'androidx.lifecycle:lifecycle-extensions:2.0.0' + annotationProcessor 'androidx.lifecycle:lifecycle-compiler:2.0.0' } buildscript { |