From 6c3a6c0d667d4502c6cdce0805f8fcb961a875d7 Mon Sep 17 00:00:00 2001
From: Pascal Hartig <phartig@rdrei.net>
Date: Fri, 5 Oct 2018 07:50:05 -0700
Subject: [PATCH] Upgrade to Circle 2.1 (#289)

Summary:
Use CircleCI 2.1 for common executors and remove the common build step
as this is already done by Travis. Instead, focus on publishing either
snapshots or releases.
Pull Request resolved: https://github.com/facebook/flipper/pull/289

Reviewed By: jknoxville

Differential Revision: D10216413

Pulled By: passy

fbshipit-source-id: cfbc52c43187339ae6cb1c486d81e7c40216e86b
---
 .circleci/config.yml | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 23307abeae2..c67d6037719 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,37 +1,38 @@
-version: 2.0
-jobs:
-  build:
+version: 2.1
+executors:
+  default-executor:
     docker:
       - image: circleci/android:api-28-ndk-r17b
-    steps:
-      - checkout
-      - run:
-          name: build and deploy
-          command: ./gradlew :sample:assembleDebug
 
+    environment:
+      _JAVA_OPTIONS: "-Xmx1500m -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:ParallelGCThreads=2 -XX:ConcGCThreads=2 -XX:ParallelGCThreads=2 -Djava.util.concurrent.ForkJoinPool.common.parallelism=2"
+      TERM: 'dumb'
+
+jobs:
   snapshot:
+    executor: default-executor
     docker:
       - image: circleci/android:api-28-ndk-r17b
     steps:
       - checkout
       - run:
           name: build and deploy
-          command: scripts/publish-android-snapshot.sh
+          command: ./gradlew :android:assembleRelease && scripts/publish-android-snapshot.sh
 
   release:
+    executor: default-executor
     docker:
       - image: circleci/android:api-28-ndk-r17b
     steps:
       - checkout
       - run:
           name: build and deploy
-          command: scripts/publish-android-release.sh
+          command: ./gradlew :android:assembleRelease && scripts/publish-android-release.sh
 
 workflows:
   version: 2
   build-and-deploy:
     jobs:
-      - build
       - snapshot:
           filters:
             branches: