Merge pull request #25 from speekha/develop

Publish 1.1.2
speekha · Jun 28, 2019 · 3ff270c · 3ff270c
2 parents a044cf4 + 37cd0cf
commit 3ff270c
Show file tree

Hide file tree

Showing 48 changed files with 1,220 additions and 315 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,8 +1,36 @@
-version: 2
+version: 2.1
+commands:
+  build-module:
+    description: "Builds a specific module"
+    parameters:
+      module:
+        type: string
+    steps:
+      - restore_cache:
+          keys:
+            - source-{{ .Branch }}-{{ .Revision }}
+            - source-{{ .Branch }}-
+            - source-
+      - checkout
+      - restore_cache:
+          key: gradle-wrapper-{{ checksum "gradle/wrapper/gradle-wrapper.properties" }}
+      - restore_cache:
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "demo/build.gradle" }}-{{ checksum  "mocker/build.gradle" }}-{{ checksum  "jackson-adapter/build.gradle" }}-{{ checksum  "gson-adapter/build.gradle" }}-{{ checksum  "moshi-adapter/build.gradle" }}-{{ checksum  "custom-adapter/build.gradle" }}
+      - restore_cache:
+          keys:
+            - build-mocker-{{ .Branch }}-{{ .Revision }}
+      - run:
+          name: Build
+          command: ./gradlew << parameters.module >>:clean << parameters.module >>:assemble << parameters.module >>:sourcesJar << parameters.module >>:dokkaJar --stacktrace
+      - save_cache:
+          key: build-<< parameters.module >>-{{ .Branch }}-{{ .Revision }}
+          paths:
+            - << parameters.module >>/build
+
 jobs:
   prepare_dependencies:
     docker:
-      - image: circleci/android:api-28-alpha
+      - image: circleci/android:api-28
     environment:
       JVM_OPTS: -Xmx3200m
       #TERM: dumb
@@ -11,28 +39,72 @@ jobs:
       - restore_cache:
           keys:
             - source-{{ .Branch }}-{{ .Revision }}
-            - source-{{ .Branch }}-
-            - source-
       - checkout
       - restore_cache:
           key: jars-{{ checksum "build.gradle" }}-{{ checksum  "demo/build.gradle" }}-{{ checksum  "mocker/build.gradle" }}-{{ checksum  "jackson-adapter/build.gradle" }}-{{ checksum  "gson-adapter/build.gradle" }}-{{ checksum  "moshi-adapter/build.gradle" }}-{{ checksum  "custom-adapter/build.gradle" }}
+      - restore_cache:
+          key: gradle-wrapper-{{ checksum "gradle/wrapper/gradle-wrapper.properties" }}
       - run:
           name: Download Dependencies
           command: ./gradlew androidDependencies --stacktrace
       - save_cache:
           paths:
             - ~/.gradle
           key: jars-{{ checksum "build.gradle" }}-{{ checksum  "demo/build.gradle" }}-{{ checksum  "mocker/build.gradle" }}-{{ checksum  "jackson-adapter/build.gradle" }}-{{ checksum  "gson-adapter/build.gradle" }}-{{ checksum  "moshi-adapter/build.gradle" }}-{{ checksum  "custom-adapter/build.gradle" }}
+      - save_cache:
+          paths:
+            - ~/.gradle/wrapper
+          key: gradle-wrapper-{{ checksum "gradle/wrapper/gradle-wrapper.properties" }}
       - run:
           name: Clean git
           command: git gc
       - save_cache:
           key: source-{{ .Branch }}-{{ .Revision }}
           paths:
             - "."
-  build:
+  build_core:
     docker:
-      - image: circleci/android:api-28-alpha
+      - image: circleci/android:api-28
+    environment:
+      JVM_OPTS: -Xmx3200m
+    steps:
+      - build-module:
+          module: "mocker"
+  build_jackson:
+    docker:
+      - image: circleci/android:api-28
+    environment:
+      JVM_OPTS: -Xmx3200m
+    steps:
+      - build-module:
+          module: "jackson-adapter"
+  build_gson:
+    docker:
+      - image: circleci/android:api-28
+    environment:
+      JVM_OPTS: -Xmx3200m
+    steps:
+      - build-module:
+          module: "gson-adapter"
+  build_moshi:
+    docker:
+      - image: circleci/android:api-28
+    environment:
+      JVM_OPTS: -Xmx3200m
+    steps:
+      - build-module:
+          module: "moshi-adapter"
+  build_custom:
+    docker:
+      - image: circleci/android:api-28
+    environment:
+      JVM_OPTS: -Xmx3200m
+    steps:
+      - build-module:
+          module: "custom-adapter"
+  build_demo:
+    docker:
+      - image: circleci/android:api-28
     environment:
       JVM_OPTS: -Xmx3200m
     steps:
@@ -44,37 +116,91 @@ jobs:
       - checkout
       - restore_cache:
           key: gradle-wrapper-{{ checksum "gradle/wrapper/gradle-wrapper.properties" }}
+      - restore_cache:
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "demo/build.gradle" }}-{{ checksum  "mocker/build.gradle" }}-{{ checksum  "jackson-adapter/build.gradle" }}-{{ checksum  "gson-adapter/build.gradle" }}-{{ checksum  "moshi-adapter/build.gradle" }}-{{ checksum  "custom-adapter/build.gradle" }}
+      - restore_cache:
+          keys:
+            - build-mocker-{{ .Branch }}-{{ .Revision }}
+      - restore_cache:
+          keys:
+            - build-jackson-adapter-{{ .Branch }}-{{ .Revision }}
       - run:
           name: Build
-          command: ./gradlew clean assemble sourcesJar dokkaJar --stacktrace
+          command: ./gradlew demo:clean demo:assemble --stacktrace
       - save_cache:
+          key: build-demo-{{ .Branch }}-{{ .Revision }}
           paths:
-            - ~/.gradle/wrapper
+            - demo/build
+  store_artifacts:
+    docker:
+      - image: circleci/android:api-28
+    environment:
+      JVM_OPTS: -Xmx3200m
+    steps:
+      - restore_cache:
+          keys:
+            - source-{{ .Branch }}-{{ .Revision }}
+            - source-{{ .Branch }}-
+            - source-
+      - restore_cache:
           key: gradle-wrapper-{{ checksum "gradle/wrapper/gradle-wrapper.properties" }}
-      - save_cache:
-          key: build-{{ .Branch }}-{{ .Revision }}
-          paths:
-            - "."
+      - checkout
+      - restore_cache:
+          keys:
+            - build-mocker-{{ .Branch }}-{{ .Revision }}
+      - restore_cache:
+          keys:
+            - build-jackson-adapter-{{ .Branch }}-{{ .Revision }}
+      - restore_cache:
+          keys:
+            - build-gson-adapter-{{ .Branch }}-{{ .Revision }}
+      - restore_cache:
+          keys:
+            - build-moshi-adapter-{{ .Branch }}-{{ .Revision }}
+      - restore_cache:
+          keys:
+            - build-custom-adapter-{{ .Branch }}-{{ .Revision }}
+      - restore_cache:
+          keys:
+            - build-demo-{{ .Branch }}-{{ .Revision }}
       - run:
           name: Gather libs
           command: ./prepareArtifacts.sh
       - store_artifacts:
           path: build/libs
           destination: libs
+      - store_artifacts:
+          path: demo/build/outputs/apk/
+          destination: apks
   test:
     docker:
-      - image: circleci/android:api-28-alpha
+      - image: circleci/android:api-28
     environment:
       JVM_OPTS: -Xmx3200m
     steps:
       - restore_cache:
           keys:
-            - build-{{ .Branch }}-{{ .Revision }}
-            - build-{{ .Branch }}-
-            - build-
-      - checkout
+            - source-{{ .Branch }}-{{ .Revision }}
+            - source-{{ .Branch }}-
+            - source-
       - restore_cache:
           key: gradle-wrapper-{{ checksum "gradle/wrapper/gradle-wrapper.properties" }}
+      - checkout
+      - restore_cache:
+          keys:
+            - build-mocker-{{ .Branch }}-{{ .Revision }}
+      - restore_cache:
+          keys:
+            - build-jackson-adapter-{{ .Branch }}-{{ .Revision }}
+      - restore_cache:
+          keys:
+            - build-gson-adapter-{{ .Branch }}-{{ .Revision }}
+      - restore_cache:
+          keys:
+            - build-moshi-adapter-{{ .Branch }}-{{ .Revision }}
+      - restore_cache:
+          keys:
+            - build-custom-adapter-{{ .Branch }}-{{ .Revision }}
       - run:
           name: Tests
           command: ./gradlew tests:test --stacktrace
@@ -85,7 +211,7 @@ jobs:
           path: tests/build/test-results
   publish_snapshot:
     docker:
-      - image: circleci/android:api-28-alpha
+      - image: circleci/android:api-28
     steps:
       - restore_cache:
           key: build-{{ .Branch }}-{{ .Revision }}
@@ -95,7 +221,7 @@ jobs:
           command: ./publishSnapshot.sh ${BINTRAY_USER} ${BINTRAY_APIKEY}
   publish_release:
     docker:
-      - image: circleci/android:api-28-alpha
+      - image: circleci/android:api-28
     steps:
       - restore_cache:
           key: build-{{ .Branch }}-{{ .Revision }}
@@ -109,12 +235,37 @@ workflows:
   build_and_publish:
     jobs:
       - prepare_dependencies
-      - build:
+      - build_core:
           requires:
             - prepare_dependencies
+      - build_jackson:
+          requires:
+            - build_core
+      - build_gson:
+          requires:
+            - build_core
+      - build_moshi:
+          requires:
+            - build_core
+      - build_custom:
+          requires:
+            - build_core
+      - build_demo:
+          requires:
+            - build_jackson
+      - store_artifacts:
+          requires:
+            - build_jackson
+            - build_gson
+            - build_moshi
+            - build_custom
+            - build_demo
       - test:
           requires:
-            - build
+            - build_jackson
+            - build_gson
+            - build_moshi
+            - build_custom
       - publish_snapshot:
           requires:
             - test
@@ -126,4 +277,4 @@ workflows:
             - test
           filters:
             branches:
-              only: master
+              only: master