[android] update SDK 35 shell tarball to fix GCM crash

CHANGELOG.md

@@ -7,15 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
-### Changed
-- Enforce Java 8 when using turtle-cli.
-
-## [0.12.7] - 2019-10-25
-
-### Changed
-
-- Updated Android shell app for SDK 35 to fix occasional crash in background due to GCM registration service (https://github.com/expo/expo/issues/4207)
-
 ## [0.12.5] - 2019-10-18
 
 ### Changed

package.json

@@ -1,6 +1,6 @@
 {
   "name": "turtle-cli",
-  "version": "0.12.8",
+  "version": "0.12.5",
   "description": "The command-line tool for building standalone Expo apps",
   "preferGlobal": true,
   "scripts": {

shellTarballs/android/sdk35

@@ -1 +1 @@
-s3://exp-artifacts/android-shell-builder-7ce098f40cc82a2f61fed9f1f515d695a83c55b2.tar.gz
+s3://exp-artifacts/android-shell-builder-a9b26e258382dce4c3f73c4f2d16cbb1a93e8a1a.tar.gz

src/bin/setup/android/index.ts

@@ -15,7 +15,6 @@ import { PLATFORMS } from 'turtle/constants';
 import logger from 'turtle/logger';
 
 const which = util.promisify(_which);
-const JAVA_REQUIRED_VERSION = 8;
 const REQUIRED_TOOLS: IToolDefinition[] = [
   {
     command: 'bash',
@@ -23,27 +22,16 @@ const REQUIRED_TOOLS: IToolDefinition[] = [
   },
   {
     command: 'javac',
-    missingDescription: `Please install JDK (version ${JAVA_REQUIRED_VERSION}) - check https://jdk.java.net/`,
+    missingDescription: 'Please install JDK (version 8 or newer) - check https://jdk.java.net/',
     testFn: async () => {
-      const { status, stdout, stderr } = await ExponentTools.spawnAsyncThrowError(
-        'java',
+      const { status, stdout } = await ExponentTools.spawnAsyncThrowError(
+        'javac',
         ['-version'],
         { stdio: 'pipe' },
       );
       if (stdout.match(/no java runtime present/i)) {
         return false;
       }
-
-      const matchResult = stderr.match(/.*version ".*\.(.*)\..*"/);
-      if (matchResult) {
-        const [, currentJavaVersion] = matchResult;
-        if (Number(currentJavaVersion) !== JAVA_REQUIRED_VERSION) {
-          throw new Error(`You're using a wrong Java version, please install version ${JAVA_REQUIRED_VERSION}`);
-        }
-      } else {
-        logger.warn(`Couldn't find Java version number, assuming you're on Java ${JAVA_REQUIRED_VERSION}...`);
-      }
-
       return status === 0;
     },
   },