Merge branch 'master' into km-TDOC-324

Author: kamildevtactics

user/languages/android.md

@@ -14,25 +14,25 @@ Android builds are not available on the macOS environment.
 
 ### Overview
 
-> Android builds are officially supported only on our Trusty Build environment at this time; hence, you'll need to explicitly specify `dist: trusty` in your .travis.yml file.
+> Android builds are officially supported on our Bionic, Focal, and Jammy build environments; hence, you'll need to explicitly specify `dist: bionic`, `dist: focal`, or `dist: jammy` in your .travis.yml file.
 
 Travis CI environment provides a large set of build tools for JVM languages with [multiple JDKs, Ant, Gradle, Maven](/user/languages/java/#overview), [sbt](/user/languages/scala/#projects-using-sbt) and [Leiningen](/user/languages/clojure/).
 
 By setting
 
 ```yaml
 language: android
-dist: trusty
+dist: focal  # or dist: jammy, dist: bionic
 ```
 {: data-file=".travis.yml"}
 
-in your `.travis.yml` file, your project will be built in the Android environment which provides [Android SDK Tools](http://developer.android.com/tools/sdk/tools-notes.html) 25.2.3.
+in your `.travis.yml` file, your project will be built in the Android environment which provides [Android SDK Tools](http://developer.android.com/tools/sdk/tools-notes.html).
 
 Here is an example `.travis.yml` for an Android project:
 
 ```yaml
 language: android
-dist: trusty
+dist: focal
 android:
   components:
     # Uncomment the lines below if you want to
@@ -41,10 +41,10 @@ android:
     # - platform-tools
 
     # The BuildTools version used by your project
-    - build-tools-26.0.2
+    - build-tools-30.0.0
 
     # The SDK version used to compile your project
-    - android-26
+    - android-30
 
     # Additional components
     - extra-google-google_play_services
@@ -53,7 +53,7 @@ android:
 
     # Specify at least one system image,
     # if you need to run emulator(s) during your tests
-    - sys-img-x86-android-26
+    - sys-img-x86-android-30
     - sys-img-armeabi-v7a-android-17
 ```
 {: data-file=".travis.yml"}
@@ -64,28 +64,60 @@ In your `.travis.yml`, you can define the list of SDK components to be installed
 
 ```yaml
 language: android
-dist: trusty
+dist: focal
 android:
   components:
-    - build-tools-26.0.2
-    - android-26
-    - extra
+    - build-tools-30.0.0
+    - android-30
+    - extras;google;google_play_services
+    - extras;google;m2repository
+    - extras;android;m2repository
 ```
 {: data-file=".travis.yml"}
 
 The exact component names must be specified (filter aliases like `add-on` or `extra` are also accepted). To get a list of available exact component names and descriptions run the command `sdkmanager --list` (preferably in your local development machine).
 
+Here are specific extra components you can install:
+
+```yaml
+android:
+  components:
+    # Google Play services
+    - extras;google;google_play_services
+    
+    # Google Repository
+    - extras;google;m2repository
+    
+    # Android Support Repository
+    - extras;android;m2repository
+    
+    # Android Support Library
+    - extras;android;support
+    
+    # Google Analytics libraries
+    - extras;google;analytics_sdk_v2
+    
+    # Google Cloud Messaging libraries
+    - extras;google;gcm
+    
+    # Google USB Driver (Windows only)
+    - extras;google;usb_driver
+    
+    # Intel x86 Emulator Accelerator (HAXM installer)
+    - extras;intel;Hardware_Accelerated_Execution_Manager
+```
+
 #### Deal with Licenses
 
 By default, Travis CI will accept all the requested licenses, but it is also possible to define a white list of licenses to be accepted, as shown in the following example:
 
 ```yaml
 language: android
-dist: trusty
+dist: focal
 android:
   components:
-    - build-tools-26.0.2
-    - android-26
+    - build-tools-30.0.0
+    - android-30
     - add-on
     - extra
   licenses:
@@ -103,22 +135,20 @@ While the following components are preinstalled, the exact list may change witho
 
 - tools
 - platform-tools
-- build-tools-25.0.2
-- android-25
-- extra-google-google_play_services
-- extra-google-m2repository
-- extra-android-m2repository
+- build-tools;30.0.0
+- platforms;android-30
+- extras;google;google_play_services
+- extras;google;m2repository
+- extras;android;m2repository
 
 ### Create and Start an Emulator
 
-**Warning:** At the moment, these steps are not fully supported by Travis CI Android builder.
-
-If you feel adventurous, you may use the script [`/usr/local/bin/android-wait-for-emulator`](https://github.com/travis-ci/travis-cookbooks/blob/precise-stable/ci_environment/android-sdk/files/default/android-wait-for-emulator) and adapt your `.travis.yml` to make this emulator available for your tests. For example:
+If you need to use an emulator for your tests, you can use the script [`/usr/local/bin/android-wait-for-emulator`](https://github.com/travis-ci/travis-cookbooks/blob/precise-stable/ci_environment/android-sdk/files/default/android-wait-for-emulator) and adapt your `.travis.yml` to make this emulator available for your tests. For example:
 
 ```yaml
 # Emulator Management: Create, Start and Wait
 before_script:
-  - echo no | android create avd --force -n test -t android-22 --abi armeabi-v7a -c 100M
+  - echo no | android create avd --force -n test -t android-30 --abi armeabi-v7a -c 100M
   - emulator -avd test -no-audio -no-window &
   - android-wait-for-emulator
   - adb shell input keyevent 82 &
@@ -133,7 +163,7 @@ If your project is built with Ant or any other build tool that does not automati
 
 ```yaml
 language: android
-dist: trusty
+dist: focal
 install: ant deps
 ```
 {: data-file=".travis.yml"}
@@ -198,9 +228,9 @@ As for any JVM language, it is also possible to [test against multiple JDKs](/us
 
 For Android projects, `env` and `jdk` can be given as arrays to construct a build matrix.
 
-## Build Android projects on new build environments
+## Build Android projects on different build environments
 
-The `dist: trusty` build environment is the only supported build environment for Android but if you would like to build on newer build environments e.g. `dist: jammy`, you can exercise your access to the Travis CI build environments and install required packages and tools. An example .travis.yml config can be reviewed below:
+Android projects are supported on `dist: bionic`, `dist: focal`, and `dist: jammy` build environments. If you have specific requirements for other build environments, you can install required packages and tools as shown in this example:
 
 ```yaml
 os: linux
@@ -227,15 +257,15 @@ before_install:
 install:
  # INSTALL REQUIRED ANDROID SDK TOOLS
  - sdkmanager --sdk_root=$ANDROID_HOME --list | awk '/Installed/{flag=1; next} /Available/{flag=0} flag'
- - yes | sdkmanager --sdk_root=$ANDROID_HOME --install "platform-tools" "platforms;android-33" "build-tools;33.0.2" "emulator" "system-images;android-33;google_apis;x86_64"
+ - yes | sdkmanager --sdk_root=$ANDROID_HOME --install "platform-tools" "platforms;android-30" "build-tools;30.0.0" "emulator" "system-images;android-30;google_apis;x86_64"
  - sdkmanager --list --sdk_root=$ANDROID_HOME | awk '/Installed/{flag=1; next} /Available/{flag=0} flag'
  # CREATE AVD
- - echo "no" | avdmanager --verbose create avd --force --name "my_android_33" --package "system-images;android-33;google_apis;x86_64" --tag "google_apis" --abi "x86_64"
+ - echo "no" | avdmanager --verbose create avd --force --name "my_android_30" --package "system-images;android-30;google_apis;x86_64" --tag "google_apis" --abi "x86_64"
  - sudo chmod -R 777 /dev/kvm
  # Start emulator in background and wait for it to start
  - adb kill-server && adb start-server &
  - sleep 15 # sleep values may require adjusting depending on the specific build environment
- - emulator @my_android_33 -no-audio -no-window &
+ - emulator @my_android_30 -no-audio -no-window &
  - sleep 60
 
 script: