Merge branch 'master' into develop

This commit is contained in:
ByteHamster 2021-03-01 11:24:39 +01:00
commit ddd6a12354
4 changed files with 12 additions and 27 deletions

View File

@ -66,7 +66,7 @@ workflows:
build-steps:
- run:
name: Build free (for F-Droid)
command: ./gradlew assembleFreeRelease -PdisablePreDex -PfreeBuild
command: ./gradlew assembleFreeRelease -PdisablePreDex
static-analysis:
jobs:

View File

@ -22,8 +22,8 @@ android {
// "1.2.3-SNAPSHOT" -> 1020300
// "1.2.3-RC4" -> 1020304
// "1.2.3" -> 1020395
versionCode 2010395
versionName "2.1.3"
versionCode 2010495
versionName "2.1.4"
multiDexEnabled false
vectorDrawables.useSupportLibrary true
@ -156,14 +156,7 @@ android {
}
dependencies {
freeImplementation project(":core")
// free build hack: skip some dependencies
if (!doFreeBuild()) {
playImplementation project(":core")
implementation 'com.google.android.play:core:1.8.0'
} else {
System.out.println("app: free build hack, skipping some dependencies")
}
implementation project(":core")
implementation project(':ui:app-start-intent')
implementation project(':ui:common')
@ -200,6 +193,8 @@ dependencies {
implementation 'com.github.ByteHamster:SearchPreference:v2.0.0'
implementation 'com.github.skydoves:balloon:1.1.5'
// Non-free dependencies:
playImplementation 'com.google.android.play:core:1.8.0'
compileOnly "com.google.android.wearable:wearable:$wearableSupportVersion"
androidTestImplementation "org.awaitility:awaitility:$awaitilityVersion"

View File

@ -86,11 +86,6 @@ wrapper {
gradleVersion = "6.3"
}
// free build hack: common functions
def doFreeBuild() {
return hasProperty("freeBuild")
}
apply plugin: "checkstyle"
checkstyle {
toolVersion '8.24'

View File

@ -99,17 +99,12 @@ dependencies {
implementation 'com.google.android.exoplayer:exoplayer:2.11.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:2.9.1'
api 'androidx.mediarouter:mediarouter:1.0.0'
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 {
System.out.println("core: free build hack, skipping some dependencies")
}
// Non-free dependencies:
playApi 'com.google.android.libraries.cast.companionlibrary:ccl:2.9.1'
playApi 'androidx.mediarouter:mediarouter:1.0.0'
playApi 'com.google.android.gms:play-services-cast:8.4.0'
playApi "com.google.android.support:wearable:$wearableSupportVersion"
compileOnly "com.google.android.wearable:wearable:$wearableSupportVersion"
// bundle conscrypt with free builds
freeImplementation "org.conscrypt:conscrypt-android:$conscryptVersion"