[ci] use sdk 36 for android tests

[ci] update android tests to use sdk 37
[ios][android] drop SDK 33
2026-11-14 19:12:55 -10:00 · 2020-03-31 12:54:41 -07:00 · 2020-03-31 12:30:21 -07:00 · 2020-03-30 21:53:42 -07:00 · 2020-03-30 21:52:41 -07:00 · 2020-03-30 21:51:32 -07:00
27 changed files with 2859 additions and 2288 deletions
@@ -115,7 +115,7 @@ commands:
        default: ios
      sdk_version:
        type: string
-        default: sdk32
+        default: sdk36
    steps:
      - restore_cache:
          key: "workingdir-v1-<< parameters.platform >>-<< parameters.sdk_version >>"
@@ -130,7 +130,7 @@ commands:
        default: ios
      sdk_version:
        type: string
-        default: sdk32
+        default: sdk36
    steps:
      - save_cache:
          key: "workingdir-v1-<< parameters.platform >>-<< parameters.sdk_version >>"
@@ -205,11 +205,11 @@ jobs:
      - run: yarn
      - save_yarn_cache
      - restore_workingdir_cache:
-          sdk_version: sdk32
+          sdk_version: sdk36
          platform: android
      - run:
          name: Fetch Android shell app
-          command: SDK_VERSION=sdk32 ./scripts/android/fetchRemoteAndroidTarball.sh
+          command: SDK_VERSION=sdk36 ./scripts/android/fetchRemoteAndroidTarball.sh
      - run:
          name: Run Android smoke tests
          command: |
@@ -217,7 +217,7 @@ jobs:
              --run "./scripts/tests/runAndroidSmokeTestsCI.sh"
      - save_workingdir_cache:
          workingdir: ~/turtle/workingdir
-          sdk_version: sdk32
+          sdk_version: sdk36
          platform: android

  android_staging_deploy:
@@ -1 +1 @@
-v8.15.1
+v12.16.1
@@ -9,16 +9,40 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

 ### Added

+- Added iOS shell app for SDK 37.
+- Added Android shell app for SDK 37.
+
+### Changed
+
+- Updated iOS client shell app to support SDK 37.
+- Replace `/` with `__` in the artifact filename to fix a strange bug with selecting APK file in Android Studio.
+- Print currently using Java version if it's not 8.
+
+### Removed
+
+- Dropped support for SDK 33.
+
+## [0.13.10] - 2020-03-09
+
+### Added
+
 - Added validation for `--public-url`.

 ### Changed

 - Changed the way of installing NDK - it's installed with `sdkmanager` now.
 - Upgraded NDK to 17.2.4988734.
+- Upgraded Node.js version to 12.16.1.

 ### Fixed

 - A bug where the `platform` field in logs wasn't set correctly when using a shortcut command.
+- Removed all remaining instances of `UIWebView` in iOS app builds.
+
+### Removed
+
+- Dropped support for Node.js versions older than 10.
+- Dropped support for building Expo SDK 31 and 32 apps.

 ## [0.13.9] - 2020-02-13

@@ -1,5 +1,5 @@
 # see docker-base/Dockerfile to learn what's installed in the turtle-android-base image
-FROM gcr.io/exponentjs/turtle-android-base:0.1.2
+FROM gcr.io/exponentjs/turtle-android-base:0.4.0

 ADD . /app/turtle

@@ -0,0 +1 @@
+configureAndroidSdk.sh
@@ -32,7 +32,7 @@ RUN dpkg --add-architecture i386 && \
  apt-get clean

 ENV NPM_CONFIG_LOGLEVEL warn
-ENV NODE_VERSION 8.12.0
+ENV NODE_VERSION 12.16.1

 RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.xz" \
  && tar -xJf "node-v$NODE_VERSION-linux-x64.tar.xz" -C /usr/local --strip-components=1 \
@@ -61,10 +61,27 @@ RUN /tmp/configureAndroidSdk.sh --install-all-platforms
 # Support Gradle
 ENV TERM dumb

-# Install gradle
-RUN wget https://services.gradle.org/distributions/gradle-4.4-all.zip
-RUN unzip -qq gradle-4.4-all.zip
-RUN mv gradle-4.4 /usr/local
-RUN rm gradle-4.4-all.zip
-ENV GRADLE_HOME /usr/local/gradle-4.4
+# Install gradle 5.6.3
+RUN wget https://services.gradle.org/distributions/gradle-5.6.3-all.zip
+RUN unzip -qq gradle-5.6.3-all.zip
+RUN cp -r gradle-5.6.3 /usr/local
+
+RUN mkdir -p /root/.gradle/wrapper/dists/gradle-5.6.3-all/7wpcz6s7ut7bllr9k6e1hazxc
+RUN mv gradle-5.6.3-all.zip /root/.gradle/wrapper/dists/gradle-5.6.3-all/7wpcz6s7ut7bllr9k6e1hazxc
+RUN mv gradle-5.6.3 /root/.gradle/wrapper/dists/gradle-5.6.3-all/7wpcz6s7ut7bllr9k6e1hazxc
+RUN touch /root/.gradle/wrapper/dists/gradle-5.6.3-all/7wpcz6s7ut7bllr9k6e1hazxc/gradle-5.6.3-all.zip.ok
+RUN touch /root/.gradle/wrapper/dists/gradle-5.6.3-all/7wpcz6s7ut7bllr9k6e1hazxc/gradle-5.6.3-all.zip.lck
+RUN chmod 755 /root/.gradle/wrapper/dists/gradle-5.6.3-all/7wpcz6s7ut7bllr9k6e1hazxc/gradle-5.6.3/bin/gradle
+
+ENV GRADLE_HOME /usr/local/gradle-5.6.3
 ENV PATH ${GRADLE_HOME}/bin:$PATH
+
+# Install gradle 4.10.2
+RUN wget https://services.gradle.org/distributions/gradle-4.10.2-all.zip
+RUN mkdir -p /root/.gradle/wrapper/dists/gradle-4.10.2-all/9fahxiiecdb76a5g3aw9oi8rv
+RUN unzip -qq gradle-4.10.2-all.zip
+RUN mv gradle-4.10.2-all.zip /root/.gradle/wrapper/dists/gradle-4.10.2-all/9fahxiiecdb76a5g3aw9oi8rv
+RUN mv gradle-4.10.2 /root/.gradle/wrapper/dists/gradle-4.10.2-all/9fahxiiecdb76a5g3aw9oi8rv
+RUN touch /root/.gradle/wrapper/dists/gradle-4.10.2-all/9fahxiiecdb76a5g3aw9oi8rv/gradle-4.10.2-all.zip.ok
+RUN touch /root/.gradle/wrapper/dists/gradle-4.10.2-all/9fahxiiecdb76a5g3aw9oi8rv/gradle-4.10.2-all.zip.lck
+RUN chmod 755 /root/.gradle/wrapper/dists/gradle-4.10.2-all/9fahxiiecdb76a5g3aw9oi8rv/gradle-4.10.2/bin/gradle
@@ -1,5 +1,5 @@
 self: super:

 {
-  nodejs = super.nodejs-8_x;
+  nodejs = super.nodejs-12_x;
 }
@@ -2,11 +2,78 @@ with (import ./default.nix {});

 let

-   ndk = androidenv.androidndk_17c.override { fullNDK = true; };
-   ndk_root = "${ndk}/libexec/${ndk.name}";
-   sdk_path = if stdenv.isDarwin
-     then "/Library/Android/sdk"
-     else "/Android/Sdk"; # intentional Capital S
+  # These expressions can be deleted when react native depends on version of
+  # ndk present in nixpkgs.
+  os = if stdenv.system == "x86_64-linux" then "linux"
+    else if stdenv.system == "x86_64-darwin" then "macosx" else throw "unsupported system architecture: ${stdenv.system}";
+  ndk_17c_src = if stdenv.isDarwin then fetchurl {
+    url = http://dl.google.com/android/repository/android-ndk-r17c-darwin-x86_64.zip;
+    sha256 = "11iyxgqp017fchn54kkns9mrax73m73xm5wgis266dsq2g36dn73";
+  } else fetchurl {
+    url = https://dl.google.com/android/repository/android-ndk-r17c-linux-x86_64.zip;
+    sha256 = "12b5h5p8b2ia38825dnnacn7b47c0inpys8jp82r42iks3dilm1z";
+  };
+  ndk_runtime_paths = lib.makeBinPath [ coreutils file findutils gawk gnugrep gnused jdk python3 which ]; #+ ":${platform-tools}/platform-tools";
+  ndk = stdenv.mkDerivation {
+    name = "ndk-17c";
+    src = ndk_17c_src;
+    buildInputs = [ unzip autoPatchelfHook makeWrapper python2 ] ++ lib.optional (os == "linux") [ glibc stdenv.cc.cc ncurses5 zlib libcxx.out ];
+    unpackPhase = ''
+      mkdir extractedzip
+      cd extractedzip
+      unpackFile "$src"
+      if [ "$(find . -mindepth 1 -maxdepth 1 -type d | wc -l)" -eq 1 ]
+      then
+          cd "$(find . -mindepth 1 -maxdepth 1 -type d)"
+      fi
+      sourceRoot="$PWD"
+    '';
+
+   installPhase = ''
+     packageBaseDir=$out/libexec/android-sdk/ndk-bundle
+     mkdir -p $packageBaseDir
+     cd $packageBaseDir
+     cp -av $sourceRoot/* .
+   '' + lib.optionalString (os == "linux") ''
+     patchShebangs .
+     wrapProgram $(pwd)/build/tools/make_standalone_toolchain.py --prefix PATH : "${ndk_runtime_paths}"
+     rm -rf docs tests
+     # Patch the executables of the toolchains, but not the libraries -- they are needed for crosscompiling
+     addAutoPatchelfSearchPath $out/libexec/android-sdk/ndk-bundle/toolchains/renderscript/prebuilt/linux-x86_64/lib64
+     find toolchains -type d -name bin | while read dir
+     do
+         autoPatchelf "$dir"
+     done
+     # fix ineffective PROGDIR / MYNDKDIR determination
+     for i in ndk-build
+     do
+         sed -i -e 's|^PROGDIR=`dirname $0`|PROGDIR=`dirname $(readlink -f $(which $0))`|' $i
+     done
+     # Patch executables
+     autoPatchelf prebuilt/linux-x86_64
+     # wrap
+     for i in ndk-build
+     do
+         wrapProgram "$(pwd)/$i" --prefix PATH : "${ndk_runtime_paths}"
+     done
+     # make some executables available in PATH
+     mkdir -p $out/bin
+     for i in ndk-build
+     do
+         ln -sf ../../libexec/android-sdk/ndk-bundle/$i $out/bin/$i
+     done
+   '';
+   dontStrip = true;
+   dontPatchELF = true;
+   dontAutoPatchelf = true;
+   noAuditTmpdir = true;
+  };
+  ndkRoot = "${ndk}/libexec/android-sdk/ndk-bundle";
+
+  sdk = androidenv.androidPkgs_9_0.androidsdk;
+  sdk_path = if stdenv.isDarwin
+    then "/Library/Android/sdk"
+    else "/Android/Sdk"; # intentional Capital S

 in

@@ -23,28 +90,27 @@ mkShell rec {
  nativeBuildInputs = [
    awscli
    curl
+    fastlane
    git
-    nodejs-8_x
+    nodejs
    openjdk8
    yarn
  ];

-  passthru = { inherit ndk; };
+  passthru = { inherit ndk ndkRoot; };

  shellHook = ''
-    ${./install-ndk-17c.sh} ${ndk} ${ndk_root}
-    yes | ${androidenv.androidsdk_9_0}/bin/sdkmanager --licenses --sdk_root="$ANDROID_SDK_ROOT"
-    yes | ${androidenv.androidsdk_9_0}/bin/sdkmanager --sdk_root="$ANDROID_SDK_ROOT" "platforms;android-28" | grep -v =
-    yes | ${androidenv.androidsdk_9_0}/bin/sdkmanager --sdk_root="$ANDROID_SDK_ROOT" "build-tools;28.0.3" | grep -v =
-    ${lib.optionalString stdenv.isLinux ''
-      for dep in lib lib64; do
-        if [ -L /$dep ] || [ ! -e /$dep ]; then
-          echo "Creating /$dep"
-          ln -s ${stdenv.cc.libc}/$dep /$dep
-        else
-          echo "Using existing /$dep"
-        fi
-      done
-    ''}
+    ${./install-ndk-17c.sh} ${ndk} ${ndkRoot}
+    # grep -v = should clean up build logs, see https://stackoverflow.com/a/52464819/1123156
+    yes | ${sdk}/bin/sdkmanager --sdk_root="$ANDROID_SDK_ROOT" "build-tools;28.0.3" | grep -v =
+  '' + lib.optionalString stdenv.isLinux ''
+    for dep in lib lib64; do
+      if [ -L /$dep ] || [ ! -e /$dep ]; then
+        echo "Creating /$dep"
+        ln -s ${stdenv.cc.libc}/$dep /$dep
+      else
+        echo "Using existing /$dep"
+      fi
+    done
  '';
 }
@@ -1,7 +1,7 @@
 {
  "url": "https://github.com/NixOS/nixpkgs-channels.git",
-  "rev": "80738ed9dc0ce48d7796baed5364eef8072c794d",
-  "date": "2018-11-17T11:18:10+01:00",
-  "sha256": "0anmvr6b47gbbyl9v2fn86mfkcwgpbd5lf0yf3drgm8pbv57c1dc",
+  "rev": "42f0be81ae05a8fe6d6e8e7f1c28652e7746e046",
+  "date": "2020-03-01T07:21:40-03:00",
+  "sha256": "1rxb5kmghkzazqcv4d8yczdiv2srs4r7apx4idc276lcikm0hdmf",
  "fetchSubmodules": false
 }
@@ -1,6 +1,6 @@
 {
  "name": "turtle-cli",
-  "version": "0.13.9",
+  "version": "0.13.10",
  "description": "The command-line tool for building standalone Expo apps",
  "preferGlobal": true,
  "scripts": {
@@ -55,7 +55,7 @@
    "react-native"
  ],
  "engines": {
-    "node": ">=8"
+    "node": ">=10"
  },
  "author": "Expo <[email protected]>",
  "license": "MIT",
@@ -86,13 +86,13 @@
    "@types/webpack-dev-server": "^3.1.7",
    "@types/which": "^1.3.1",
    "husky": "^1.3.1",
-    "jest": "^23.6.0",
+    "jest": "^25.1.0",
    "lint-staged": "^8.1.5",
    "nock": "^10.0.1",
-    "nodemon": "^1.18.11",
+    "nodemon": "^2.0.2",
    "release-it": "^12.3.4",
    "rimraf": "^2.6.2",
-    "ts-jest": "^23.10.4",
+    "ts-jest": "^25.2.1",
    "ts-node": "^8.0.3",
    "ts-transformer-imports": "^0.4.1",
    "tsconfig-paths": "^3.8.0",
@@ -103,8 +103,8 @@
  },
  "dependencies": {
    "@expo/spawn-async": "^1.4.2",
-    "@expo/xdl": "57.4.0",
-    "@google-cloud/logging-bunyan": "^0.9.5",
+    "@expo/xdl": "57.5.2",
+    "@google-cloud/logging-bunyan": "^2.0.3",
    "async-retry": "^1.2.1",
    "aws-sdk": "^2.226.1",
    "bunyan": "^1.8.12",
@@ -125,7 +125,7 @@
    "request-progress": "^3.0.0",
    "request-promise": "^4.2.5",
    "semver": "^6.0.0",
-    "sharp": "0.22.1",
+    "sharp": "0.24.1",
    "source-map-support": "^0.5.6",
    "tar": "^4.4.6",
    "uuid": "^3.2.1",
@@ -135,6 +135,7 @@
    "@expo/traveling-fastlane-darwin": "1.11.4"
  },
  "volta": {
-    "node": "8.15.1"
+    "node": "12.16.1",
+    "yarn": "1.22.0"
  }
 }
@@ -1 +0,0 @@
-s3://exp-artifacts/android-shell-builder-89b2d24c86737d5a489c6a18467e31b2f9ce9005.tar.gz
@@ -1 +0,0 @@
-s3://exp-artifacts/android-shell-builder-f796aaffa0b5715079b2950faf26c2ff4e53e4c0.tar.gz
@@ -1 +0,0 @@
-s3://exp-artifacts/android-shell-builder-aebd669d6573b0b3c802871d94cdb8b4116678d2.tar.gz
@@ -0,0 +1 @@
+s3://exp-artifacts/android-shell-builder-1a6203cf1555c3b956a311ed539eafeb7594f030.tar.gz
@@ -1 +1 @@
-s3://exp-artifacts/ios-expo-client-33560c83d858e509e71150d4163836d2bfcae2b6.tar.gz
+s3://exp-artifacts/ios-expo-client-aadfc350d8e4ebf8dce9ce08723bb7e07d563846.tar.gz
@@ -1 +0,0 @@
-s3://exp-artifacts/ios-shell-builder-sdk-latest-55848298c7332f7586c4281fa691a4ca31548532.tar.gz
@@ -1 +0,0 @@
-s3://exp-artifacts/ios-shell-builder-sdk-latest-edd02214dd84368c197df32a2d30a901d6c766ff.tar.gz
@@ -1 +0,0 @@
-s3://exp-artifacts/ios-shell-builder-sdk-latest-36b57e8ebb96aa8dce286c89bd56e8708eca819d.tar.gz
@@ -1 +1 @@
-s3://exp-artifacts/ios-shell-builder-sdk-latest-3dc536f8a36af8404c31501e7a7876a8eda634f6.tar.gz
+s3://exp-artifacts/ios-shell-builder-sdk-latest-661a51216c2241dcfdd930517968cd1d0e0ee237.tar.gz
@@ -0,0 +1 @@
+s3://exp-artifacts/ios-shell-builder-sdk-latest-aadfc350d8e4ebf8dce9ce08723bb7e07d563846.tar.gz
@@ -22,7 +22,8 @@ const REQUIRED_TOOLS: IToolDefinition[] = [
  },
  {
    command: 'javac',
-    missingDescription: `Please install JDK (version ${JAVA_REQUIRED_VERSION}) - check https://jdk.java.net/`,
+    missingDescription:
+      `Please install JDK 8 - keep in mind that other versions are not supported by Android`,
    testFn: async () => {
      const { status, stdout, stderr } = await ExponentTools.spawnAsyncThrowError(
        'java',
@@ -33,11 +34,13 @@ const REQUIRED_TOOLS: IToolDefinition[] = [
        return false;
      }

-      const matchResult = stderr.match(/.*version ".*\.(.*)\..*"/);
+      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}`);
+        const [, currentFullJavaVersion] = matchResult;
+        const javaMajorVersionPosition = currentFullJavaVersion.startsWith('1.') ? 1 : 0;
+        const javaMajorVersion = Number(currentFullJavaVersion.split('.')[javaMajorVersionPosition]);
+        if (javaMajorVersion !== JAVA_REQUIRED_VERSION) {
+          throw new Error(`You're on Java ${currentFullJavaVersion}, please install version ${JAVA_REQUIRED_VERSION}`);
        }
      } else {
        logger.warn(`Couldn't find Java version number, assuming you're on Java ${JAVA_REQUIRED_VERSION}...`);
@@ -27,7 +27,7 @@ export default async function buildAndroid(jobData: IJob): Promise<IJobResult> {
  const s3FileExtension = jobData.config.buildType === ANDROID_BUILD_TYPES.APP_BUNDLE ? 'aab' : 'apk';
  const s3Filename = `${jobData.experienceName}-${randomHex}-signed.${s3FileExtension}`;
  const s3FileKey = `android/${s3Filename}`;
-  const fakeUploadFilename = s3Filename.replace('/', '\\');
+  const fakeUploadFilename = s3Filename.replace('/', '__');

  const artifactUrl = await uploadBuildToS3({
    uploadPath: outputFilePath,
@@ -131,7 +131,7 @@ export function createBuilderContext(job: IJob): IContext {
  const s3FileExtension = buildType === IOS_BUILD_TYPES.SIMULATOR ? 'tar.gz' : 'ipa';
  const s3Filename = `${job.experienceName}-${appUUID}-${buildType}.${s3FileExtension}`;
  if (config.builder.fakeUpload) {
-    const fakeUploadFilename = s3Filename.replace('/', '\\');
+    const fakeUploadFilename = s3Filename.replace('/', '__');
    context.fakeUploadBuildPath = job.fakeUploadBuildPath
      ? job.fakeUploadBuildPath
      : join(job.fakeUploadDir || config.directories.fakeUploadDir, fakeUploadFilename);
@@ -1,3 +1,3 @@
 #! /usr/bin/env bash
 # This file was generated by nix-binstubs
-exec nix run -f "$(dirname "$0")/../../../nix" nodejs-8_x --command node "$@"
+exec nix run -f "$(dirname "$0")/../../../nix" nodejs-12_x --command node "$@"
@@ -1,3 +1,3 @@
 #! /usr/bin/env bash
 # This file was generated by nix-binstubs
-exec nix run -f "$(dirname "$0")/../../../nix" nodejs-8_x --command npm "$@"
+exec nix run -f "$(dirname "$0")/../../../nix" nodejs-12_x --command npm "$@"
@@ -1,3 +1,3 @@
 #! /usr/bin/env bash
 # This file was generated by nix-binstubs
-exec nix run -f "$(dirname "$0")/../../../nix" nodejs-8_x --command npx "$@"
+exec nix run -f "$(dirname "$0")/../../../nix" nodejs-12_x --command npx "$@"
Author	SHA1	Message	Date
Eric Samelson	7a5b402bca	[ci] use sdk 36 for android tests	2020-03-31 12:54:41 -07:00
Eric Samelson	63d3e82cd7	[ci] update android tests to use sdk 37	2020-03-31 12:30:21 -07:00
Eric Samelson	b2f8fdd342	[ios][android] drop SDK 33	2020-03-30 21:53:42 -07:00
Eric Samelson	4d9b3bdee9	[android][sdk37] add SDK 37 shell tarball (#198 )	2020-03-30 21:52:41 -07:00
Bartłomiej Bukowski	15c165be26	[ios][sdk37] Add SDK 37 shell app tarball (#194 )	2020-03-30 21:51:32 -07:00
Dominik Sokal	f63e34ace3	Upgrade node to v12 / Drop node v8 support / Drop SDK 31 and 32 (#186 )	2020-03-23 16:17:18 -07:00
dependabot[bot]	e4ec82d1db	Bump acorn from 5.7.3 to 5.7.4 (#195 ) Bumps [acorn](https://github.com/acornjs/acorn) from 5.7.3 to 5.7.4. - [Release notes](https://github.com/acornjs/acorn/releases) - [Commits](https://github.com/acornjs/acorn/compare/5.7.3...5.7.4) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-03-18 15:35:29 +01:00
Dominik Sokal	941a605591	[turtle-cli] print currently using java version (if other than 8)	2020-03-10 12:26:28 +01:00
Dominik Sokal	8b9ad9846b	[turtle-cli] replace / with __ to fix a bug with selecting APK file in Android Studio	2020-03-10 10:46:23 +01:00
Charlie Cruzan	d488177daa	Update CHANGELOG.md	2020-03-09 14:47:59 -04:00
cruzach	1ef3564adf	Release 0.13.10	2020-03-09 14:44:58 -04:00
Dominik Sokal	1e29177bd0	preinstall gradle 4.10.2 and 5.6.3 (#189 )	2020-03-09 13:56:02 +01:00
cruzach	aa1605a5db	[ios][expo-ads-admob][expo-ads-facebook] Remove UIWebView refs	2020-03-08 11:18:27 -04:00
				`@@ -1 +0,0 @@`
				`s3://exp-artifacts/android-shell-builder-89b2d24c86737d5a489c6a18467e31b2f9ce9005.tar.gz`
				`@@ -0,0 +1 @@`
				`s3://exp-artifacts/android-shell-builder-1a6203cf1555c3b956a311ed539eafeb7594f030.tar.gz`
				`@@ -1 +0,0 @@`
				`s3://exp-artifacts/ios-shell-builder-sdk-latest-55848298c7332f7586c4281fa691a4ca31548532.tar.gz`