Skip to content

Commit 50abafb

Browse files
fix: target api level 29 in circleci scripts (#2038)
1 parent 94445ba commit 50abafb

File tree

1 file changed

+23
-23
lines changed

1 file changed

+23
-23
lines changed

.circleci/config.yml

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ commands:
4242
steps:
4343
- run:
4444
name: Accept SDK license
45-
command: sudo yes | sdkmanager --licenses
45+
command: sudo yes | sdkmanager --licenses 2>&1 >/dev/null || true
4646
- run:
4747
name: Update SDK
48-
command: sudo yes | sdkmanager --update
48+
command: sudo yes | sdkmanager --update 2>&1 >/dev/null || true
4949

5050
configure_aws:
5151
description: >-
@@ -293,7 +293,7 @@ jobs:
293293
build:
294294
working_directory: ~/code
295295
docker:
296-
- image: circleci/android:api-27-alpha
296+
- image: circleci/android:api-29
297297
resource_class: xlarge
298298
environment:
299299
JVM_OPTS: -Xmx8192m
@@ -319,7 +319,7 @@ jobs:
319319
unittest:
320320
working_directory: ~/code
321321
docker:
322-
- image: circleci/android:api-27-alpha
322+
- image: circleci/android:api-29
323323
resource_class: xlarge
324324
environment:
325325
JVM_OPTS: -Xmx8192m
@@ -369,7 +369,7 @@ jobs:
369369
370370
release_javadoc:
371371
docker:
372-
- image: circleci/android:api-27-alpha
372+
- image: circleci/android:api-29
373373
resource_class: xlarge
374374
environment:
375375
JVM_OPTS: -Xmx8192m
@@ -394,7 +394,7 @@ jobs:
394394
command: |
395395
aws --profile build_resources s3 cp s3://android-circleci-payload/third-party/third-party.zip third-party.zip
396396
unzip third-party.zip
397-
cp "$ANDROID_HOME/platforms/android-27/android.jar" third-party/android.jar
397+
cp "$ANDROID_HOME/platforms/android-29/android.jar" third-party/android.jar
398398
- run:
399399
name: generate documents
400400
command: |
@@ -471,7 +471,7 @@ jobs:
471471
- run:
472472
name: Install Android build tools
473473
command: |
474-
sudo yes | sdkmanager "platforms;android-27" "build-tools;27.0.1" "extras;google;m2repository" "extras;android;m2repository"
474+
sudo yes | sdkmanager "platforms;android-29" "build-tools;29.0.2" "extras;google;m2repository" "extras;android;m2repository"
475475
- run:
476476
name: Install GPG
477477
command: |
@@ -491,8 +491,8 @@ jobs:
491491
echo "JAVA_HOME: $JAVA_HOME"
492492
echo "ANDROID_HOME: $ANDROID_HOME"
493493
echo "PATH: $PATH"
494-
echo 'export ANDROID_PLATFORM="27"' >> $BASH_ENV
495-
echo 'export ANDROID_BUILDTOOL_VERSION="27.0.1"' >> $BASH_ENV
494+
echo 'export ANDROID_PLATFORM="29"' >> $BASH_ENV
495+
echo 'export ANDROID_BUILDTOOL_VERSION="29.0.2"' >> $BASH_ENV
496496
- run:
497497
name: publish to maven
498498
command: |
@@ -510,7 +510,7 @@ jobs:
510510

511511
release_s3:
512512
docker:
513-
- image: circleci/android:api-27-alpha
513+
- image: circleci/android:api-29
514514
environment:
515515
JVM_OPTS: -Xmx1024m
516516
steps:
@@ -576,7 +576,7 @@ jobs:
576576
577577
pre_integrationtest:
578578
docker:
579-
- image: circleci/android:api-27-alpha
579+
- image: circleci/android:api-29
580580
environment:
581581
JVM_OPTS: -Xmx1024m
582582
steps:
@@ -611,7 +611,7 @@ jobs:
611611
612612
post_integrationtest:
613613
docker:
614-
- image: circleci/android:api-27-alpha
614+
- image: circleci/android:api-29
615615
environment:
616616
JVM_OPTS: -Xmx1024m
617617
steps:
@@ -663,7 +663,7 @@ jobs:
663663
- run:
664664
name: install sdk
665665
command: |
666-
sudo yes | sdkmanager "platforms;android-27"
666+
sudo yes | sdkmanager "platforms;android-29"
667667
- setup_emulator
668668
- run:
669669
name: Generate testconfiguration.json
@@ -696,7 +696,7 @@ jobs:
696696
bump_sampleapp_version:
697697
working_directory: ~/code
698698
docker:
699-
- image: circleci/android:api-27-alpha
699+
- image: circleci/android:api-29
700700
resource_class: xlarge
701701
environment:
702702
JVM_OPTS: -Xmx8192m
@@ -730,7 +730,7 @@ jobs:
730730
bump_applifydocs_version:
731731
working_directory: ~/code
732732
docker:
733-
- image: circleci/android:api-27-alpha
733+
- image: circleci/android:api-29
734734
resource_class: xlarge
735735
environment:
736736
JVM_OPTS: -Xmx8192m
@@ -762,7 +762,7 @@ jobs:
762762
- bump_version_post
763763
bump_sdk_version:
764764
docker:
765-
- image: circleci/android:api-27-alpha
765+
- image: circleci/android:api-29
766766
environment:
767767
JVM_OPTS: -Xmx1024m
768768
steps:
@@ -826,7 +826,7 @@ jobs:
826826

827827
merge_to_main:
828828
docker:
829-
- image: circleci/android:api-27-alpha
829+
- image: circleci/android:api-29
830830
environment:
831831
JVM_OPTS: -Xmx1024m
832832
steps:
@@ -869,7 +869,7 @@ jobs:
869869
870870
prepare_release_sdk:
871871
docker:
872-
- image: circleci/android:api-27-alpha
872+
- image: circleci/android:api-29
873873
environment:
874874
JVM_OPTS: -Xmx1024m
875875
steps:
@@ -898,7 +898,7 @@ jobs:
898898
899899
create_pullrequest_for_modelupdate:
900900
docker:
901-
- image: circleci/android:api-27-alpha
901+
- image: circleci/android:api-29
902902
environment:
903903
JVM_OPTS: -Xmx1024m
904904
steps:
@@ -915,7 +915,7 @@ jobs:
915915
916916
check_sdk_on_maven:
917917
docker:
918-
- image: circleci/android:api-27-alpha
918+
- image: circleci/android:api-29
919919
environment:
920920
JVM_OPTS: -Xmx1024m
921921
steps:
@@ -943,7 +943,7 @@ jobs:
943943
944944
run_integrationtest_on_devicefarm:
945945
docker:
946-
- image: circleci/android:api-27-alpha
946+
- image: circleci/android:api-29
947947
environment:
948948
JVM_OPTS: -Xmx1024m
949949
steps:
@@ -983,7 +983,7 @@ jobs:
983983
- run:
984984
name: install sdk
985985
command: |
986-
sudo yes | sdkmanager "platforms;android-27"
986+
sudo yes | sdkmanager "platforms;android-29"
987987
- run:
988988
name: download devicefarm configure file
989989
command: |
@@ -1008,7 +1008,7 @@ jobs:
10081008
"https://circleci.com/api/v1.1/project/github/${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}/envvar?circle-token=${CIRCLE_API_USER_TOKEN}"
10091009
check_testresult_on_devicefarm:
10101010
docker:
1011-
- image: circleci/android:api-27-alpha
1011+
- image: circleci/android:api-29
10121012
environment:
10131013
JVM_OPTS: -Xmx1024m
10141014
steps:

0 commit comments

Comments
 (0)