Merge pull request #3494 from ByteHamster/free-build-circleci

Executing free build on CircleCI

3 files changed, 46 insertions, 74 deletions

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b6a6ba78e..b5903350f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,33 +1,12 @@
-version: 2
+version: 2.1
 
 jobs:
-  test-debug:
-    docker:
-      - image: circleci/android:api-28
-    working_directory: ~/AntennaPod
-    environment:
-      GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx1536m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError"'
-      _JAVA_OPTIONS: "-Xms256m -Xmx1280m"
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-            - v1-android-{{ checksum "build.gradle" }}
-            - v1-android-
-      - run:
-          name: Build debug
-          command: ./gradlew assembleDebug -PdisablePreDex
-      - run:
-          name: Execute debug unit tests
-          command: ./gradlew :core:testPlayDebugUnitTest -PdisablePreDex
-      - save_cache:
-          paths:
-            - ~/.android
-            - ~/.gradle
-            - ~/android
-          key: v1-android-{{ checksum "build.gradle" }}
-
-  test-release:
+  build:
+    parameters:
+      build-steps:
+        description: "Steps that will be executed for this build"
+        type: steps
+        default: []
     docker:
       - image: circleci/android:api-28
     working_directory: ~/AntennaPod
@@ -43,12 +22,7 @@ jobs:
       - run:
           name: Create temporary release keystore
           command: keytool -noprompt -genkey -v -keystore "app/keystore" -alias alias -storepass password -keypass password -keyalg RSA -validity 10 -dname "CN=antennapod.org, OU=dummy, O=dummy, L=dummy, S=dummy, C=US"
-      - run:
-          name: Build release
-          command: ./gradlew assembleRelease -PdisablePreDex
-      - run:
-          name: Execute release unit tests
-          command: ./gradlew :core:testPlayReleaseUnitTest -PdisablePreDex
+      - steps: << parameters.build-steps >>
       - save_cache:
           paths:
             - ~/.android
@@ -56,48 +30,45 @@ jobs:
             - ~/android
           key: v1-android-{{ checksum "build.gradle" }}
 
-  build-androidtest:
-    docker:
-      - image: circleci/android:api-28
-    working_directory: ~/AntennaPod
-    environment:
-      GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx1536m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError"'
-      _JAVA_OPTIONS: "-Xms256m -Xmx1280m"
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-            - v1-android-{{ checksum "build.gradle" }}
-            - v1-android-
-      - run:
-          name: Build integration tests
-          command: ./gradlew :app:assemblePlayDebugAndroidTest -PdisablePreDex
-      - save_cache:
-          paths:
-            - ~/.android
-            - ~/.gradle
-            - ~/android
-          key: v1-android-{{ checksum "build.gradle" }}
-
-  checkstyle:
-    docker:
-      - image: circleci/android:api-28
-    working_directory: ~/AntennaPod
-    steps:
-      - checkout
-      - run:
-          name: Checkstyle
-          command: ./gradlew checkstyle
-
 workflows:
-  version: 2
-
   unit-tests:
     jobs:
-      - test-debug
-      - test-release
-      - build-androidtest
+      - build:
+          name: Build debug
+          build-steps:
+            - run:
+                name: Build debug
+                command: ./gradlew assembleDebug -PdisablePreDex
+            - run:
+                name: Execute debug unit tests
+                command: ./gradlew :core:testPlayDebugUnitTest -PdisablePreDex
+      - build:
+          name: Build release
+          build-steps:
+            - run:
+                name: Build release
+                command: ./gradlew assembleRelease -PdisablePreDex
+            - run:
+                name: Execute release unit tests
+                command: ./gradlew :core:testPlayReleaseUnitTest -PdisablePreDex
+      - build:
+          name: Build integration tests
+          build-steps:
+            - run:
+                name: Build integration tests
+                command: ./gradlew :app:assemblePlayDebugAndroidTest -PdisablePreDex
+      - build:
+          name: Build free
+          build-steps:
+            - run:
+                name: Build free (for F-Droid)
+                command: ./gradlew assembleFreeRelease -PdisablePreDex -PfreeBuild
 
   static-analysis:
     jobs:
-      - checkstyle
+      - build:
+          name: Checkstyle
+          build-steps:
+            - run:
+                name: Checkstyle
+                command: ./gradlew checkstyle
diff --git a/app/build.gradle b/app/build.gradle
index fa9bfeea8..5f70d285f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -135,6 +135,7 @@ dependencies {
     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"
diff --git a/core/build.gradle b/core/build.gradle
index 8e449a379..fe6ed824a 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -60,7 +60,7 @@ dependencies {
     implementation "androidx.preference:preference:1.1.0"
     annotationProcessor "androidx.annotation:annotation:1.1.0"
     implementation "android.arch.work:work-runtime:$workManagerVersion"
-    
+    implementation "androidx.media:media:1.1.0"
     implementation "org.apache.commons:commons-lang3:$commonslangVersion"
     implementation "org.apache.commons:commons-text:$commonstextVersion"
     implementation "commons-io:commons-io:$commonsioVersion"