diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 0000000..40a0a5b
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,22 @@
+version: 2
+
+jobs:
+  build:
+    docker:
+      - image: circleci/android:api-28
+    environment:
+      TERM: dumb
+      GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx1024m -XX:+HeapDumpOnOutOfMemoryError" -Dorg.gradle.daemon=false'
+    steps:
+      - checkout
+      - restore_cache:
+          key: jars-{{ checksum "build.gradle" }}
+      - run:
+          name: test
+          command: |
+            ./gradlew check
+            ./gradlew ribbonize
+      - save_cache:
+          paths:
+            - ~/.gradle
+          key: jars-{{ checksum "build.gradle" }}
diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index d8854ed..0000000
--- a/circle.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-machine:
-  java:
-    version: oraclejdk8
-  environment:
-    TERM: dumb
-    GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx1024m -XX:+HeapDumpOnOutOfMemoryError" -Dorg.gradle.daemon=false'
-dependencies:
-  pre:
-    - echo y | android -s update sdk -u -a -t "tools" # update Android SDK that includes sdkmanager(1)
-    - mkdir -p "$ANDROID_HOME"/licenses
-    - echo "8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME"/licenses/android-sdk-license
-    - $ANDROID_HOME/tools/bin/sdkmanager "platform-tools" "extras;android;m2repository"
-test:
-  override:
-    - TERM=dumb ./gradlew check
-    - TERM=dumb ./gradlew ribbonize