diff options
| -rw-r--r-- | app/build.gradle | 33 | ||||
| -rw-r--r-- | build.gradle | 4 | ||||
| -rw-r--r-- | core/build.gradle | 13 |
3 files changed, 21 insertions, 29 deletions
diff --git a/app/build.gradle b/app/build.gradle index a342fbd1e..707ab6188 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -131,14 +131,12 @@ dependencies { } else { System.out.println("app: free build hack, skipping some dependencies") } - implementation "androidx.legacy:legacy-support-v4:1.0.0-beta01" - implementation "androidx.appcompat:appcompat:1.0.0-beta01" - implementation "com.google.android.material:material:1.0.0-beta01" - implementation "androidx.legacy:legacy-preference-v14:1.0.0-beta01" - implementation "androidx.gridlayout:gridlayout:1.0.0-beta01" - implementation "androidx.recyclerview:recyclerview:1.0.0-beta01" - compileOnly 'com.google.android.wearable:wearable:2.2.0' - + implementation "androidx.appcompat:appcompat:1.1.0" + implementation "androidx.preference:preference:1.1.0" + implementation "androidx.gridlayout:gridlayout:1.0.0" + implementation "androidx.recyclerview:recyclerview:1.0.0" + implementation "com.google.android.material:material:1.0.0" + compileOnly "com.google.android.wearable:wearable:$wearableSupportVersion" implementation "org.apache.commons:commons-lang3:$commonslangVersion" implementation "commons-io:commons-io:$commonsioVersion" implementation "org.jsoup:jsoup:$jsoupVersion" @@ -158,26 +156,21 @@ dependencies { transitive = true } implementation "com.yqritc:recyclerview-flexibledivider:$recyclerviewFlexibledividerVersion" - implementation("com.githang:viewpagerindicator:2.5.1@aar") { - exclude module: "support-v4" - } - + implementation "com.githang:viewpagerindicator:2.5.1@aar" implementation "com.github.shts:TriangleLabelView:$triangleLabelViewVersion" - implementation 'com.leinardi.android:speed-dial:1.0.2' // 1.0.2 uses support 27.1.1 ; newer versions use 28.0.0; - + implementation 'com.leinardi.android:speed-dial:3.0.0' implementation "com.github.AntennaPod:AntennaPod-AudioPlayer:$audioPlayerVersion" - implementation 'com.github.mfietz:fyydlin:v0.4.2' implementation 'com.github.ByteHamster:SearchPreference:v1.3.0' androidTestImplementation "org.awaitility:awaitility:$awaitilityVersion" androidTestImplementation 'com.nanohttpd:nanohttpd-webserver:2.1.1' androidTestImplementation "com.jayway.android.robotium:robotium-solo:$robotiumSoloVersion" - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-alpha4' - androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.1.0-alpha4' - androidTestImplementation 'androidx.test.espresso:espresso-intents:3.1.0-alpha4' - androidTestImplementation 'androidx.test:runner:1.1.0-alpha4' - androidTestImplementation 'androidx.test:rules:1.1.0-alpha4' + androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion" + androidTestImplementation "androidx.test.espresso:espresso-contrib:$espressoVersion" + androidTestImplementation "androidx.test.espresso:espresso-intents:$espressoVersion" + androidTestImplementation 'androidx.test:runner:1.2.0' + androidTestImplementation 'androidx.test:rules:1.2.0' } if (project.hasProperty("antennaPodServiceAccountEmail")) { diff --git a/build.gradle b/build.gradle index 5edabc9d2..d8e1a6c32 100644 --- a/build.gradle +++ b/build.gradle @@ -44,8 +44,8 @@ project.ext { minSdkVersion = 14 targetSdkVersion = 28 - supportVersion = "27.1.1" workManagerVersion = "1.0.1" + espressoVersion = "3.2.0" awaitilityVersion = "3.1.2" commonsioVersion = "2.5" commonslangVersion = "3.6" @@ -70,7 +70,7 @@ project.ext { castCompanionLibVer = "2.9.1" playServicesVersion = "8.4.0" - wearableSupportVersion = "2.2.0" + wearableSupportVersion = "2.4.0" } wrapper { diff --git a/core/build.gradle b/core/build.gradle index b70140662..9a724c59f 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -56,9 +56,8 @@ android { } dependencies { - implementation "androidx.legacy:legacy-support-v4:1.0.0-beta01" - implementation "androidx.appcompat:appcompat:1.0.0-beta01" - implementation "androidx.legacy:legacy-preference-v14:1.0.0-beta01" + implementation "androidx.appcompat:appcompat:1.1.0" + implementation "androidx.preference:preference:1.1.0" implementation "android.arch.work:work-runtime:$workManagerVersion" implementation "org.apache.commons:commons-lang3:$commonslangVersion" @@ -84,7 +83,7 @@ dependencies { // free build hack: skip some dependencies if (!doFreeBuild()) { playApi "com.google.android.libraries.cast.companionlibrary:ccl:$castCompanionLibVer" - api "com.android.support:mediarouter-v7:$supportVersion" + api "androidx.mediarouter:mediarouter:1.0.0" playApi "com.google.android.gms:play-services-cast:$playServicesVersion" api "com.google.android.support:wearable:$wearableSupportVersion" } else { @@ -94,9 +93,9 @@ dependencies { testImplementation "org.awaitility:awaitility:$awaitilityVersion" testImplementation 'junit:junit:4.12' testImplementation 'org.mockito:mockito-core:1.10.19' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-alpha4' - androidTestImplementation 'androidx.test:runner:1.1.0-alpha4' - androidTestImplementation 'androidx.test:rules:1.1.0-alpha4' + androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion" + androidTestImplementation 'androidx.test:runner:1.2.0' + androidTestImplementation 'androidx.test:rules:1.2.0' } |