diff options
| author | ByteHamster <ByteHamster@users.noreply.github.com> | 2021-02-24 15:45:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-24 15:45:21 +0100 |
| commit | 7a37918cc6e25e57fb9fa5423b5f4f04af730675 (patch) | |
| tree | 180e90b5100d41967515115f8c9fc9bb801d1f8f | |
| parent | f7409c08a60a783765b4a6d52a77d3cc1656e1dd (diff) | |
| parent | 2c70db70745566ebc7035a546a241dcb115afc69 (diff) | |
| download | AntennaPod-7a37918cc6e25e57fb9fa5423b5f4f04af730675.zip | |
Merge pull request #4959 from ByteHamster/remove-free-build-hack
Remove free build hack
| -rw-r--r-- | .circleci/config.yml | 2 | ||||
| -rw-r--r-- | app/build.gradle | 11 | ||||
| -rw-r--r-- | build.gradle | 5 | ||||
| -rw-r--r-- | core/build.gradle | 17 |
4 files changed, 10 insertions, 25 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 1a97e73c5..e4ca88046 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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: diff --git a/app/build.gradle b/app/build.gradle index 1fa52b53a..7f082494a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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") annotationProcessor "androidx.annotation:annotation:$annotationVersion" implementation "androidx.appcompat:appcompat:$appcompatVersion" @@ -199,6 +192,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" diff --git a/build.gradle b/build.gradle index b0d59f24c..f4a3d1782 100644 --- a/build.gradle +++ b/build.gradle @@ -85,11 +85,6 @@ wrapper { gradleVersion = "6.3" } -// free build hack: common functions -def doFreeBuild() { - return hasProperty("freeBuild") -} - apply plugin: "checkstyle" checkstyle { toolVersion '8.24' diff --git a/core/build.gradle b/core/build.gradle index f443ebb9b..6948b6c2d 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -96,17 +96,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" |