Merge pull request #1506 from mozilla/circleci-java11

Bug 1659706 - CI: Use up-to-date CircleCI-provided Android image again
mozilla · Feb 18, 2021 · d3d4085 · d3d4085
2 parents ad581e7 + 091ab85
commit d3d4085
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -436,8 +436,7 @@ jobs:
 
   Lint Android with ktlint and detekt:
     docker:
-      # FIXME(bug 1659706): Use `circleci/android:api-28-ndk` again
-      - image: circleci/android@sha256:467c03465c664de6c915cfd94f4a8fc91cd16d87f704e8323704b2576330bf6e
+      - image: circleci/android:api-28-ndk
     steps:
       - checkout
       - run: ./gradlew --no-daemon lint
@@ -446,8 +445,7 @@ jobs:
 
   Android tests:
     docker:
-      # FIXME(bug 1659706): Use `circleci/android:api-28-ndk` again
-      - image: circleci/android@sha256:467c03465c664de6c915cfd94f4a8fc91cd16d87f704e8323704b2576330bf6e
+      - image: circleci/android:api-28-ndk
     steps:
       - android-setup
       - skip-if-doc-only
@@ -493,8 +491,7 @@ jobs:
 
   Generate Kotlin documentation:
     docker:
-      # FIXME(bug 1659706): Use `circleci/android:api-28-ndk` again
-      - image: circleci/android@sha256:467c03465c664de6c915cfd94f4a8fc91cd16d87f704e8323704b2576330bf6e
+      - image: circleci/android:api-28-ndk
     steps:
       - android-setup
       - run: