Merge remote-tracking branch 'origin/master'

2025-01-23 14:20:24 +08:00 · 2019-12-15 15:13:32 +08:00 · 2019-12-15 15:13:32 +08:00 · 1c33da8f98
commit 1c33da8f98
parent 50e9dac339 236d71cd7e
1 changed files with 7 additions and 5 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -2,22 +2,24 @@ language: android
 #### use android since there are android components####
 jdk:
  - openjdk11
+os: linux
+

 android:
  components:
    - build-tools-29
    - android-29
    - extra
+  licenses:
+    - 'android-sdk-license-.+'
+    - 'google-gdk-license-.+'
+    - 'android-sdk-preview-license-.+'

-licenses:
-  - 'android-sdk-license-.+'
-  - 'google-gdk-license-.+'
-  - 'android-sdk-preview-license-.+'


 install: true

-sudo: required
+
 before_script:
  - chmod +x gradlew