Merge pull request #126 from faberNovel/release/v1.8.0

Prepare release v1.8.0

.ci/images_matrix.json

@@ -1,13 +1,5 @@
 {
     "android_api": [
-        {
-            "api": 28,
-            "build_tools": "28.0.3"
-        },
-        {
-            "api": 29,
-            "build_tools": "29.0.3"
-        },
         {
             "api": 30,
             "build_tools": "30.0.3"
@@ -24,6 +16,10 @@
         {
             "api": 33,
             "build_tools": "33.0.1"
+        },
+        {
+            "api": 34,
+            "build_tools": "34.0.0"
         }
     ],
     "android_ndk": [

.github/workflows/daily_runner.yml

@@ -10,7 +10,7 @@ jobs:
       options: --name=runner
     strategy:
       matrix:
-        android_api: [{ "api": 30, "build_tools": "30.0.3" }, { "api": 31, "build_tools": "32.0.0" }]
+        android_api: [{ "api": 33, "build_tools": "33.0.1" }, { "api": 34, "build_tools": "34.0.0" }]
         android_ndk: ["--android-ndk"]
     steps:
       - name: Checkout

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [v1.8.0](https://github.com/faberNovel/docker-android/tree/v1.8.0) (2023-12-04)
+
+[Full Changelog](https://github.com/faberNovel/docker-android/compare/v1.7.0...v1.8.0)
+
+**Implemented enhancements:**
+
+- Create and use a dedicated dockerhub user to deploy images [\#18](https://github.com/faberNovel/docker-android/issues/18)
+
+**Merged pull requests:**
+
+- Add support for API 34 [\#125](https://github.com/faberNovel/docker-android/pull/125) ([flolom](https://github.com/flolom))
+- README: fix Docker Hub reference [\#124](https://github.com/faberNovel/docker-android/pull/124) ([perlun](https://github.com/perlun))
+- Added openjdk-17-jdk to the Dockerfile [\#123](https://github.com/faberNovel/docker-android/pull/123) ([AngeloAvv](https://github.com/AngeloAvv))
+
 ## [v1.7.0](https://github.com/faberNovel/docker-android/tree/v1.7.0) (2023-02-09)
 
 [Full Changelog](https://github.com/faberNovel/docker-android/compare/v1.6.1...v1.7.0)
@@ -11,6 +25,7 @@
 **Merged pull requests:**
 
 - Add Android API 33 [\#116](https://github.com/faberNovel/docker-android/pull/116) ([RomainGF](https://github.com/RomainGF))
+- Prepare release v1.6.1 [\#114](https://github.com/faberNovel/docker-android/pull/114) ([github-actions[bot]](https://github.com/apps/github-actions))
 
 ## [v1.6.1](https://github.com/faberNovel/docker-android/tree/v1.6.1) (2022-06-14)
 

Dockerfile

@@ -13,6 +13,7 @@ ENV LANG=en_US.UTF-8
 
 ## Install dependencies
 RUN apt-get update && apt-get install --no-install-recommends -y \
+  openjdk-17-jdk \
   openjdk-11-jdk \
   openjdk-8-jdk \
   git \
@@ -49,6 +50,7 @@ RUN mkdir $JENV_ROOT/versions
 ENV JDK_ROOT "/usr/lib/jvm/"
 RUN jenv add ${JDK_ROOT}/java-8-openjdk-amd64
 RUN jenv add ${JDK_ROOT}/java-11-openjdk-amd64
+RUN jenv add ${JDK_ROOT}/java-17-openjdk-amd64
 RUN echo 'export PATH="$JENV_ROOT/bin:$PATH"' >> ~/.bashrc
 RUN echo 'eval "$(jenv init -)"' >> ~/.bashrc
 
@@ -97,10 +99,10 @@ RUN if [ "$gcloud" = true ] ; \
 ## Install Android SDK
 ARG sdk_version=commandlinetools-linux-6200805_latest.zip
 ARG android_home=/opt/android/sdk
-ARG android_api=android-33
-ARG android_build_tools=33.0.1
+ARG android_api=android-34
+ARG android_build_tools=34.0.0
 ARG android_ndk=false
-ARG ndk_version=25.1.8937393
+ARG ndk_version=26.1.10909125
 ARG cmake=3.22.1
 RUN mkdir -p ${android_home} && \
     wget --quiet --output-document=/tmp/${sdk_version} https://dl.google.com/android/repository/${sdk_version} && \

README.md

@@ -34,7 +34,7 @@ keep track of missing native libraries and add them to the next image version.
 
 ## JDK support
 Images support multiple JDK, using [Jenv](https://www.jenv.be/).
-The default JDK is JDK 11, but JDK 8 is also supported for Android API 30 or lower (use `jenv global 1.8`).
+The default JDK is JDK 17, but JDK 11 and 8 are also supported (i.e. use `jenv global 1.8` to set JDK to verion 8).
 To choose a JDK, make sure the script executes on a bash shell, then use Jenv to set the desired version: 
 ```
 jobs:
@@ -121,7 +121,7 @@ jobs:
 ```
 
 ## 📦 Container Registry
-docker-android images are hosted on [DockerHub](https://hub.docker.com/repository/docker/fabernovel/android).
+docker-android images are hosted on [DockerHub](https://hub.docker.com/r/fabernovel/android).
 
 ## 🔤 Naming
 We provide stable and snapshot variants for latest Android API levels, including or not native SDK.

tests/run_tests.sh

@@ -56,15 +56,14 @@ if [ "$gcloud" = true ]; then
 fi
 
 # Setup test app environment variables
-export KOTLIN_VERSION="1.3.71"
-export GRADLE_VERSION="7.3"
-export ANDROID_GRADLE_TOOLS_VERSION="7.0.3"
+export KOTLIN_VERSION="1.9.10"
+export GRADLE_VERSION="8.3"
+export ANDROID_GRADLE_TOOLS_VERSION="8.1.1"
 export COMPILE_SDK_VERSION="$android_api"
 export BUILD_TOOLS_VERSION="$android_build_tools"
 export MIN_SDK_VERSION=21
 export TARGET_SDK_VERSION="$android_api"
 export NDK_VERSION="21.0.6113669"
-jenv global 11
 
 setup_gradle_version() {
   if grep -q "distributionUrl" ./gradle/wrapper/gradle-wrapper.properties; then
@@ -88,6 +87,7 @@ exec_test() {
 ruby -v
 eval "$(jenv init -)"
 
+jenv global 17
 if [ "$android_ndk" = true ]; then
   echo "Running tests with ndk"
   exec_test "$script_path"/test-app-ndk
@@ -97,22 +97,12 @@ else
 fi
 
 if [ "$large_test" = true ]; then
-    echo "Run android tests on Firebase Test Lab"
-    cd "$script_path"/test-firebase-test-lab
-
-    setup_gradle_version
-
-    bundle install
-    bundle exec fastlane android integrated_test
-fi
+  echo "Run android tests on Firebase Test Lab"
+  cd "$script_path"/test-firebase-test-lab
 
-if (( "$android_api" < 31 )); then
-  export GRADLE_VERSION="5.6.4"
-  export ANDROID_GRADLE_TOOLS_VERSION="3.6.1"
-  jenv global 1.8
-  exec_test "$script_path"/test-app-jdk-8
+  setup_gradle_version
 
-  jenv global 11
+  bundle install
+  bundle exec fastlane android integrated_test
 fi
-
 exit 0