commit 2a114a6a07be442b7e34fe8e91a41112413bc241 Author: n8fr8 nathan@guardianproject.info Date: Mon Nov 8 09:44:21 2021 -0500

update gitlab CI for Android 30 Java 11 --- .gitlab-ci.yml | 37 +++++++++++++++++++------------------ app/build.gradle | 2 +- 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b3095a87..5e12e5f5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,25 +1,26 @@ -image: openjdk:8-jdk +image: openjdk:11-jdk

variables: - ANDROID_COMPILE_SDK: "28" - ANDROID_BUILD_TOOLS: "28.0.2" - ANDROID_SDK_TOOLS: "4333796" +ANDROID_COMPILE_SDK: "30" +ANDROID_BUILD_TOOLS: "30.0.3" +ANDROID_SDK_TOOLS: "6858069_latest" +

before_script: - - apt-get --quiet update --yes - - apt-get --quiet install --yes wget tar unzip lib32stdc++6 lib32z1 - - wget --quiet --output-document=android-sdk.zip https://dl.google.com/android/repository/sdk-tools-linux-$%7BANDROID_SDK_TOO... - - unzip -qq -d android-sdk-linux android-sdk.zip - - echo y | android-sdk-linux/tools/bin/sdkmanager "platforms;android-${ANDROID_COMPILE_SDK}" >/dev/null - - echo y | android-sdk-linux/tools/bin/sdkmanager "platform-tools" >/dev/null - - echo y | android-sdk-linux/tools/bin/sdkmanager "build-tools;${ANDROID_BUILD_TOOLS}" >/dev/null - - export ANDROID_HOME=$PWD/android-sdk-linux - - export PATH=$PATH:$PWD/android-sdk-linux/platform-tools/ - - chmod +x ./gradlew - # temporarily disable checking for EPIPE error and use yes to accept all licenses - - set +o pipefail - - yes | android-sdk-linux/tools/bin/sdkmanager --licenses - - set -o pipefail +- apt-get --quiet update --yes +- apt-get --quiet install --yes wget tar unzip lib32stdc++6 lib32z1 +- wget --quiet --output-document=android-sdk.zip https://dl.google.com/android/repository/commandlinetools-linux-$%7BANDROID_... +- unzip -d android-sdk-linux android-sdk.zip +- echo y | android-sdk-linux/cmdline-tools/bin/sdkmanager --sdk_root=. "platforms;android-${ANDROID_COMPILE_SDK}" >/dev/null +- echo y | android-sdk-linux/cmdline-tools/bin/sdkmanager --sdk_root=. "platform-tools" >/dev/null +- echo y | android-sdk-linux/cmdline-tools/bin/sdkmanager --sdk_root=. "build-tools;${ANDROID_BUILD_TOOLS}" >/dev/null +- export ANDROID_SDK_ROOT=$PWD +- export PATH=$PATH:$PWD/platform-tools/ +- chmod +x ./gradlew +# temporarily disable checking for EPIPE error and use yes to accept all licenses +- set +o pipefail +- yes | android-sdk-linux/cmdline-tools/bin/sdkmanager --sdk_root=. --licenses +- set -o pipefail

stages: - build diff --git a/app/build.gradle b/app/build.gradle index 93304560..97549791 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -72,4 +72,4 @@ android { ) androidTestImplementation libs.fastlane_screengrab } -} \ No newline at end of file +}