Compare commits

...
Author SHA1 Message Date
Dominik Sokal d6432b6455 Release 0.5.3 2019-01-21 16:08:51 +01:00
Dominik Sokal 81f3a0e300 update CHANGELOG for 0.5.3 2019-01-21 16:05:28 +01:00
Dominik Sokal 167766519e Update Android build tools (#12)
* update android build-tools

* update sdkmanager

* pipe yes to sdkmanager

* accepty licenses prior to using sdkmanager

* accept android 28 license

* alter PATH

* do we need android ndk?

* revert installing Android NDK

* remove redundant backslash

* fix license issue when building with turtle-cli

* change path to build-tools
2019-01-21 16:00:44 +01:00
5 changed files with 29 additions and 18 deletions

No files matched your search

+4
View File
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]
## [0.5.3] - 2019-01-21
### Fixed
- Building Android standalone apps ([not accepted license issue](https://github.com/expo/expo/issues/3266)) - updated Android build tools (`build-tools;28.0.3`, `platforms;android-28`).
## [0.5.2] - 2019-01-18
### Added
- The link (in README) to the repository containing `turtle-cli` usage example.
+13 -9
View File
@@ -36,30 +36,34 @@ RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-
# Download and untar SDK
ENV ANDROID_HOME /usr/local/android-sdk-linux
ENV ANDROID_SDK /usr/local/android-sdk-linux
ENV ANDROID_SDK_URL https://dl.google.com/android/repository/sdk-tools-linux-3859397.zip
ENV ANDROID_SDK_URL https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip
RUN mkdir -p ${ANDROID_HOME} && \
curl -L "${ANDROID_SDK_URL}" > ${ANDROID_HOME}/sdk.zip && \
cd ${ANDROID_HOME} && \
unzip -qq sdk.zip && \
rm sdk.zip && \
# prevents warnings about missing repo config
mkdir -p ${HOME}/.android && \
touch ${HOME}/.android/repositories.cfg
ENV PATH ${ANDROID_HOME}/platform-tools:${PATH}
ENV PATH ${ANDROID_HOME}/tools:${PATH}
ENV PATH ${ANDROID_HOME}/tools/bin:${PATH}
ENV PATH ${ANDROID_HOME}/build-tools/25.0.0/:${PATH}
ENV PATH ${ANDROID_HOME}/build-tools/28.0.3/:${PATH}
RUN yes | sdkmanager --licenses > /dev/null
# Install Android SDK components
RUN sdkmanager \
"platform-tools" \
RUN yes | sdkmanager \
"platforms;android-23" \
"build-tools;25.0.0" \
"platforms;android-24" \
"platforms;android-25" \
"platforms;android-26" \
"platforms;android-27" \
"platforms;android-28"
RUN yes | sdkmanager "platform-tools"
RUN yes | sdkmanager "build-tools;28.0.3"
RUN yes | sdkmanager \
"extras;android;m2repository" \
"extras;google;m2repository"
"extras;google;m2repository" \
"extras;google;google_play_services"
# Install Android NDK
ENV ANDROID_NDK_VERSION android-ndk-r10e
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "turtle-cli",
"version": "0.5.2",
"version": "0.5.3",
"description": "The command-line tool for building standalone Expo apps",
"preferGlobal": true,
"scripts": {
+9 -6
View File
@@ -1,9 +1,12 @@
#!/bin/bash
yes | $ANDROID_HOME/tools/bin/sdkmanager --licenses > /dev/null
$ANDROID_HOME/tools/bin/sdkmanager \
"platform-tools" \
"platforms;android-23" \
"build-tools;25.0.0" \
SDKMANAGER=$ANDROID_HOME/tools/bin/sdkmanager
yes | $SDKMANAGER --licenses > /dev/null
yes | $SDKMANAGER "platforms;android-28"
yes | $SDKMANAGER "platform-tools"
yes | $SDKMANAGER "build-tools;28.0.3"
yes | $SDKMANAGER \
"extras;android;m2repository" \
"extras;google;m2repository"
"extras;google;m2repository" \
"extras;google;google_play_services"
+2 -2
View File
@@ -10,7 +10,7 @@ import download from 'turtle/bin/setup/utils/downloader';
import config from 'turtle/config';
import logger from 'turtle/logger';
const ANDROID_SDK_URL = 'https://dl.google.com/android/repository/sdk-tools-linux-3859397.zip';
const ANDROID_SDK_URL = 'https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip';
const LOGGER_FIELDS = { buildPhase: 'setting up environment' };
const l = logger.withFields(LOGGER_FIELDS);
@@ -73,6 +73,6 @@ function _createPaths(androidSdkDir: string) {
path.join(androidSdkDir, 'platform-tools'),
path.join(androidSdkDir, 'tools'),
path.join(androidSdkDir, 'tools/bin'),
path.join(androidSdkDir, 'build-tools/25.0.0'),
path.join(androidSdkDir, 'build-tools/28.0.3'),
];
}