diff options
Diffstat (limited to 'app/build.gradle')
| -rw-r--r-- | app/build.gradle | 64 |
1 files changed, 25 insertions, 39 deletions
diff --git a/app/build.gradle b/app/build.gradle index 3996d7ba5..5f70d285f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ android { versionCode 1070396 versionName "1.7.3b" testApplicationId "de.test.antennapod" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" generatedDensities = [] javaCompileOptions { @@ -131,18 +131,14 @@ dependencies { } else { System.out.println("app: free build hack, skipping some dependencies") } - implementation "com.android.support:support-v4:$supportVersion" - implementation "com.android.support:appcompat-v7:$supportVersion" - implementation "com.android.support:design:$supportVersion" - implementation "com.android.support:preference-v14:$supportVersion" - implementation "com.android.support:gridlayout-v7:$supportVersion" - implementation "com.android.support:recyclerview-v7:$supportVersion" - compileOnly 'com.google.android.wearable:wearable:2.2.0' - - // ViewModel and LiveData - implementation "android.arch.lifecycle:extensions:$lifecycle_version" - annotationProcessor "android.arch.lifecycle:compiler:$lifecycle_version" - + 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 "androidx.media:media:1.1.0" + implementation "com.google.android.material:material:1.0.0" + annotationProcessor "androidx.annotation:annotation:1.1.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" @@ -162,26 +158,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 'com.android.support.test.espresso:espresso-core:3.0.2' - androidTestImplementation 'com.android.support.test.espresso:espresso-contrib:3.0.2' - androidTestImplementation 'com.android.support.test.espresso:espresso-intents:3.0.2' - androidTestImplementation 'com.android.support.test:runner:1.0.2' - androidTestImplementation 'com.android.support.test:rules:1.0.2' + 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")) { @@ -193,20 +184,14 @@ if (project.hasProperty("antennaPodServiceAccountEmail")) { } } -// about.html is templatized so that we can automatically insert -// our version string in to it at build time. -task filterAbout { - inputs.files files(["src/main/templates/about.html", - "src/main/AndroidManifest.xml"]) - outputs.file "src/main/assets/about.html" -} doLast { - copy { - from "src/main/templates/about.html" - into "src/main/assets" - filter(ReplaceTokens, tokens: [versionname: android.defaultConfig.versionName, - commit : "git rev-parse --short HEAD".execute().text, - year : new Date().format('yyyy')]) - } +task filterAbout(type: Copy) { + from "src/main/templates/about.html" + into "src/main/assets" + filter(ReplaceTokens, tokens: [ + versionname: android.defaultConfig.versionName, + commit : "git rev-parse --short HEAD".execute().text, + year : new Date().format('yyyy')]) + outputs.upToDateWhen { false } } task copyTextFiles(type: Copy) { @@ -216,6 +201,7 @@ task copyTextFiles(type: Copy) { rename { String fileName -> fileName + ".txt" } + outputs.upToDateWhen { false } } preBuild.dependsOn filterAbout, copyTextFiles |