diff --git a/Dockerfile b/Dockerfile index 1a3a9a2..69eaf37 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,17 +1,32 @@ -FROM gradle:7-jdk16 +# gradle version https://youtrack.jetbrains.com/issue/KT-45545#focus=Comments-27-5166414.0-0 +FROM gradle:7.2-jdk16 +# install OS packages +RUN apt-get --quiet update --yes + +# Installing build tools +RUN apt-get update && \ + apt-get install -y \ + build-essential \ + ruby \ + jq \ + ruby-dev + +# We use this for xxd hex->binary +RUN apt-get --quiet install --yes vim-common # get link at bottom of https://developer.android.com/studio -ENV ANDROID_SDK_URL https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip -ENV ANDROID_SDK_CHECKSUM 124f2d5115eee365df6cf3228ffbca6fc3911d16f8025bebd5b1c6e2fcfa7faf +ENV ANDROID_SDK_URL https://dl.google.com/android/repository/commandlinetools-linux-8092744_latest.zip +ENV ANDROID_SDK_CHECKSUM d71f75333d79c9c6ef5c39d3456c6c58c613de30e6a751ea0dbd433e8f8b9cbf # https://developer.android.com/studio/releases/platform-tools # higher version casues Warning: Failed to find package -ENV ANDROID_BUILD_TOOLS_VERSION 30.0.2 +ENV ANDROID_BUILD_TOOLS_VERSION 32.0.0 ENV ANDROID_SDK_ROOT /usr/local/android-sdk-linux ENV ANDROID_VERSION 32 # ENV PATH ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools ENV PATH ${PATH}:${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin:${ANDROID_SDK_ROOT}/cmdline-tools/tools/bin + RUN mkdir "$ANDROID_SDK_ROOT" .android && \ cd "$ANDROID_SDK_ROOT" && \ curl -o sdk.zip $ANDROID_SDK_URL && \ @@ -31,20 +46,6 @@ RUN $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager \ "platforms;android-${ANDROID_VERSION}" \ "platform-tools" -# install OS packages -RUN apt-get --quiet update --yes - -# Installing build tools -RUN apt-get update && \ - apt-get install -y \ - build-essential \ - ruby \ - jq \ - ruby-dev - -# We use this for xxd hex->binary -RUN apt-get --quiet install --yes vim-common - # install FastLane COPY Gemfile.lock . COPY Gemfile . diff --git a/Gemfile.lock b/Gemfile.lock index f6295b8..cb16745 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,8 +8,8 @@ GEM artifactory (3.0.15) atomos (0.1.3) aws-eventstream (1.2.0) - aws-partitions (1.543.0) - aws-sdk-core (3.125.0) + aws-partitions (1.551.0) + aws-sdk-core (3.125.6) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) @@ -17,14 +17,14 @@ GEM aws-sdk-kms (1.53.0) aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.110.0) + aws-sdk-s3 (1.111.3) aws-sdk-core (~> 3, >= 3.125.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) aws-sigv4 (1.4.0) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) - claide (1.0.3) + claide (1.1.0) colored (1.2) colored2 (3.1.2) commander (4.6.0) @@ -36,17 +36,18 @@ GEM unf (>= 0.0.5, < 1.0.0) dotenv (2.7.6) emoji_regex (3.2.3) - excon (0.89.0) - faraday (1.8.0) + excon (0.90.0) + faraday (1.9.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.1) + faraday-net_http_persistent (~> 1.0) faraday-patron (~> 1.0) faraday-rack (~> 1.0) - multipart-post (>= 1.2, < 3) + faraday-retry (~> 1.0) ruby2_keywords (>= 0.0.4) faraday-cookie_jar (0.0.7) faraday (>= 0.8.0) @@ -55,14 +56,17 @@ GEM faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) faraday-httpclient (1.0.1) + faraday-multipart (1.0.3) + multipart-post (>= 1.2, < 3) faraday-net_http (1.0.1) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) faraday-rack (1.0.0) + faraday-retry (1.0.3) faraday_middleware (1.2.0) faraday (~> 1.0) fastimage (2.2.6) - fastlane (2.199.0) + fastlane (2.204.1) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -102,9 +106,9 @@ GEM xcpretty (~> 0.3.0) xcpretty-travis-formatter (>= 0.0.3) gh_inspector (1.1.3) - google-apis-androidpublisher_v3 (0.14.0) + google-apis-androidpublisher_v3 (0.16.0) google-apis-core (>= 0.4, < 2.a) - google-apis-core (0.4.1) + google-apis-core (0.4.2) addressable (~> 2.5, >= 2.5.1) googleauth (>= 0.16.2, < 2.a) httpclient (>= 2.8.1, < 3.a) @@ -113,11 +117,11 @@ GEM retriable (>= 2.0, < 4.a) rexml webrick - google-apis-iamcredentials_v1 (0.9.0) + google-apis-iamcredentials_v1 (0.10.0) google-apis-core (>= 0.4, < 2.a) - google-apis-playcustomapp_v1 (0.6.0) + google-apis-playcustomapp_v1 (0.7.0) google-apis-core (>= 0.4, < 2.a) - google-apis-storage_v1 (0.10.0) + google-apis-storage_v1 (0.11.0) google-apis-core (>= 0.4, < 2.a) google-cloud-core (1.6.0) google-cloud-env (~> 1.0) @@ -125,7 +129,7 @@ GEM google-cloud-env (1.5.0) faraday (>= 0.17.3, < 2.0) google-cloud-errors (1.2.0) - google-cloud-storage (1.35.0) + google-cloud-storage (1.36.0) addressable (~> 2.8) digest-crc (~> 0.4) google-apis-iamcredentials_v1 (~> 0.1) @@ -144,7 +148,7 @@ GEM http-cookie (1.0.4) domain_name (~> 0.5) httpclient (2.8.3) - jmespath (1.4.0) + jmespath (1.5.0) json (2.6.1) jwt (2.3.0) memoist (0.16.2) @@ -211,4 +215,4 @@ DEPENDENCIES fastlane BUNDLED WITH - 2.3.3 + 2.3.6