From 4478447bec5e03aa0aec3be3f753e1dd9db59f1b Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Thu, 7 May 2020 11:38:01 -0400 Subject: Clean up version locations and order --- app/build.gradle | 39 ++++++++++++++++++++------------------- build.gradle | 35 ++++++++++++++++++++--------------- core/build.gradle | 26 +++++++++++++------------- 3 files changed, 53 insertions(+), 47 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 5763af10c..a2e85317c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,17 +10,19 @@ android { defaultConfig { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - multiDexEnabled false - vectorDrawables.useSupportLibrary true // Version code schema: // "1.2.3-SNAPSHOT" -> 1020300 // "1.2.3-RC4" -> 1020304 // "1.2.3" -> 1020395 versionCode 2000002 versionName "2.0.0-alpha2" + + multiDexEnabled false + vectorDrawables.useSupportLibrary true + vectorDrawables.generatedDensities = [] + testApplicationId "de.test.antennapod" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - vectorDrawables.generatedDensities = [] def commit = "Unknown commit" try { @@ -62,16 +64,14 @@ android { } buildTypes { - def STRING = "String" - debug { applicationIdSuffix ".debug" resValue "string", "provider_authority", "de.danoeh.antennapod.debug.provider" - // debug build has method count over 64k single-dex threshold. - // For building debug build to use on Android < 21 (pre-Android 5) devices, + // debug build has method count over 64k single-dex threshold. + // For building debug build to use on Android < 21 (pre-Android 5) devices, // you need to manually change class - // de.danoeh.antennapod.PodcastApp to extend MultiDexApplication . + // de.danoeh.antennapod.PodcastApp to extend MultiDexApplication . // See Issue #2813 multiDexEnabled true @@ -138,18 +138,17 @@ dependencies { System.out.println("app: free build hack, skipping some dependencies") } - annotationProcessor 'androidx.annotation:annotation:1.1.0' - implementation 'androidx.appcompat:appcompat:1.1.0' + annotationProcessor "androidx.annotation:annotation:$annotationVersion" + implementation "androidx.appcompat:appcompat:$appcompatVersion" implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0' implementation 'androidx.gridlayout:gridlayout:1.0.0' - implementation 'androidx.media:media:1.1.0' - implementation 'androidx.preference:preference:1.1.1' + implementation "androidx.media:media:$mediaVersion" + implementation "androidx.preference:preference:$preferenceVersion" implementation 'androidx.recyclerview:recyclerview:1.1.0' implementation 'androidx.viewpager2:viewpager2:1.0.0' implementation "androidx.work:work-runtime:$workManagerVersion" - implementation 'com.google.android.material:material:1.1.0' + implementation "com.google.android.material:material:$googleMaterialVersion" - 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" @@ -165,13 +164,15 @@ dependencies { implementation "com.joanzapata.iconify:android-iconify-fontawesome:$iconifyVersion" implementation "com.joanzapata.iconify:android-iconify-material:$iconifyVersion" - implementation "com.yqritc:recyclerview-flexibledivider:$recyclerviewFlexibledividerVersion" - implementation "com.github.shts:TriangleLabelView:$triangleLabelViewVersion" + implementation 'com.yqritc:recyclerview-flexibledivider:1.4.0' + implementation 'com.github.shts:TriangleLabelView:1.1.2' implementation 'com.leinardi.android:speed-dial:3.1.1' implementation "com.github.AntennaPod:AntennaPod-AudioPlayer:$audioPlayerVersion" implementation 'com.github.mfietz:fyydlin:v0.5.0' implementation 'com.github.ByteHamster:SearchPreference:v2.0.0' - implementation "com.github.skydoves:balloon:1.1.5" + implementation 'com.github.skydoves:balloon:1.1.5' + + compileOnly "com.google.android.wearable:wearable:$wearableSupportVersion" androidTestImplementation "org.awaitility:awaitility:$awaitilityVersion" androidTestImplementation 'com.nanohttpd:nanohttpd:2.1.1' @@ -179,8 +180,8 @@ dependencies { 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' + androidTestImplementation "androidx.test:runner:$runnerVersion" + androidTestImplementation "androidx.test:rules:$rulesVersion" } if (project.hasProperty("antennaPodPlayPublisherCredentials")) { diff --git a/build.gradle b/build.gradle index 82cec73ce..9774fc3c8 100644 --- a/build.gradle +++ b/build.gradle @@ -46,31 +46,36 @@ project.ext { minSdkVersion = 16 targetSdkVersion = 28 + // AndroidX + annotationVersion = "1.1.0" + appcompatVersion = "1.1.0" + mediaVersion = "1.1.0" + preferenceVersion = "1.1.1" workManagerVersion = "2.3.4" - espressoVersion = "3.2.0" - awaitilityVersion = "3.1.6" - commonsioVersion = "2.5" + googleMaterialVersion = "1.1.0" + + // Third-party commonslangVersion = "3.6" - eventbusVersion = "3.2.0" - glideVersion = "4.8.0" - glideOkhttpIntegrationVersion = "4.8.0" - iconifyVersion = "2.2.2" + commonsioVersion = "2.5" jsoupVersion = "1.11.2" + glideVersion = "4.8.0" okhttpVersion = "3.12.10" okioVersion = "1.17.5" - recyclerviewFlexibledividerVersion = "1.4.0" - robotiumSoloVersion = "5.6.3" + eventbusVersion = "3.2.0" rxAndroidVersion = "2.1.1" rxJavaVersion = "2.2.2" - rxJavaRulesVersion = "1.3.3.0" - triangleLabelViewVersion = "1.1.2" - - exoPlayerVersion = "2.10.8" + iconifyVersion = "2.2.2" audioPlayerVersion = "v1.0.17" - castCompanionLibVer = "2.9.1" - playServicesVersion = "8.4.0" + // Google Play build wearableSupportVersion = "2.6.0" + + //Tests + awaitilityVersion = "3.1.6" + robotiumSoloVersion = "5.6.3" + espressoVersion = "3.2.0" + runnerVersion = "1.2.0" + rulesVersion = "1.2.0" } wrapper { diff --git a/core/build.gradle b/core/build.gradle index 9189f1d8e..4c7ef5a0a 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -6,9 +6,9 @@ android { defaultConfig { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion + multiDexEnabled false - versionCode 1 - versionName "1.0" + testApplicationId "de.danoeh.antennapod.core.tests" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -55,19 +55,19 @@ android { } dependencies { - annotationProcessor 'androidx.annotation:annotation:1.1.0' - implementation 'androidx.appcompat:appcompat:1.1.0' - implementation 'androidx.media:media:1.1.0' - implementation 'androidx.preference:preference:1.1.1' + annotationProcessor "androidx.annotation:annotation:$annotationVersion" + implementation "androidx.appcompat:appcompat:$appcompatVersion" + implementation "androidx.media:media:$mediaVersion" + implementation "androidx.preference:preference:$preferenceVersion" implementation "androidx.work:work-runtime:$workManagerVersion" - implementation 'com.google.android.material:material:1.1.0' + implementation "com.google.android.material:material:$googleMaterialVersion" implementation "org.apache.commons:commons-lang3:$commonslangVersion" implementation "commons-io:commons-io:$commonsioVersion" implementation "org.jsoup:jsoup:$jsoupVersion" implementation "com.github.bumptech.glide:glide:$glideVersion" annotationProcessor "com.github.bumptech.glide:compiler:$glideVersion" - implementation "com.github.bumptech.glide:okhttp3-integration:$glideOkhttpIntegrationVersion@aar" + implementation "com.github.bumptech.glide:okhttp3-integration:$glideVersion@aar" implementation "com.squareup.okhttp3:okhttp:$okhttpVersion" implementation "com.squareup.okhttp3:okhttp-urlconnection:$okhttpVersion" implementation "com.squareup.okio:okio:$okioVersion" @@ -76,15 +76,15 @@ dependencies { implementation "io.reactivex.rxjava2:rxandroid:$rxAndroidVersion" implementation "io.reactivex.rxjava2:rxjava:$rxJavaVersion" - implementation "com.google.android.exoplayer:exoplayer:$exoPlayerVersion" + implementation 'com.google.android.exoplayer:exoplayer:2.10.8' implementation "com.github.AntennaPod:AntennaPod-AudioPlayer:$audioPlayerVersion" // Add casting features // free build hack: skip some dependencies if (!doFreeBuild()) { - playApi "com.google.android.libraries.cast.companionlibrary:ccl:$castCompanionLibVer" + playApi 'com.google.android.libraries.cast.companionlibrary:ccl:2.9.1' api 'androidx.mediarouter:mediarouter:1.0.0' - playApi "com.google.android.gms:play-services-cast:$playServicesVersion" + playApi 'com.google.android.gms:play-services-cast:8.4.0' api "com.google.android.support:wearable:$wearableSupportVersion" compileOnly "com.google.android.wearable:wearable:$wearableSupportVersion" } else { @@ -96,8 +96,8 @@ dependencies { testImplementation 'org.mockito:mockito-core:1.10.19' androidTestImplementation "com.jayway.android.robotium:robotium-solo:$robotiumSoloVersion" androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion" - androidTestImplementation 'androidx.test:runner:1.2.0' - androidTestImplementation 'androidx.test:rules:1.2.0' + androidTestImplementation "androidx.test:runner:$runnerVersion" + androidTestImplementation "androidx.test:rules:$rulesVersion" } tasks.withType(Test) { -- cgit v1.2.3