From 5796321f09b56e63f808c2567b54725d392313d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Thu, 1 Sep 2022 15:22:17 -0400
Subject: [PATCH] build: update for Android 13 (API 33)

Change-Id: Ic0ba910aecb6e8512b117e9223a481a2187ac2a8
---
 docker/Dockerfile                                         | 8 ++++----
 ring-android/app/build.gradle.kts                         | 8 ++++----
 .../app/src/main/java/cx/ring/fragments/CallFragment.kt   | 2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 2ac96f106..c833c88d6 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -66,13 +66,13 @@ RUN wget -O /tmp/swig.tar.gz https://github.com/swig/swig/archive/rel-4.0.2.tar.
 
 # Android SDK libraries, NDK
 RUN sdkmanager --sdk_root=${ANDROID_HOME} --update
-RUN (while sleep 1; do echo "y"; done) | sdkmanager --channel=1 --sdk_root=${ANDROID_HOME} 'build-tools;32.0.0' \
-	'platforms;android-32'\
+RUN (while sleep 1; do echo "y"; done) | sdkmanager --channel=1 --sdk_root=${ANDROID_HOME} 'build-tools;33.0.0' \
+	'platforms;android-33'\
 	'extras;android;m2repository'\
 	'extras;google;m2repository'\
-	'ndk;25.0.8775105'
+	'ndk;25.1.8937393'
 ENV ANDROID_SDK=${ANDROID_HOME}
-ENV ANDROID_NDK=${ANDROID_HOME}/ndk/25.0.8775105
+ENV ANDROID_NDK=${ANDROID_HOME}/ndk/25.1.8937393
 
 # Fastlane
 RUN gem install fastlane -NV
diff --git a/ring-android/app/build.gradle.kts b/ring-android/app/build.gradle.kts
index 32213db57..dd182dd8e 100644
--- a/ring-android/app/build.gradle.kts
+++ b/ring-android/app/build.gradle.kts
@@ -12,12 +12,12 @@ plugins {
 }
 
 android {
-    compileSdk = 32
-    buildToolsVersion = "32.0.0"
-    ndkVersion = "25.0.8528842"
+    compileSdk = 33
+    buildToolsVersion = "33.0.0"
+    ndkVersion = "25.1.8937393"
     defaultConfig {
         minSdk = 24
-        targetSdk = 32
+        targetSdk = 33
         versionCode = 341
         versionName = "20220826-01"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
diff --git a/ring-android/app/src/main/java/cx/ring/fragments/CallFragment.kt b/ring-android/app/src/main/java/cx/ring/fragments/CallFragment.kt
index d9a40ea8c..1901158b4 100644
--- a/ring-android/app/src/main/java/cx/ring/fragments/CallFragment.kt
+++ b/ring-android/app/src/main/java/cx/ring/fragments/CallFragment.kt
@@ -1030,7 +1030,7 @@ class CallFragment : BaseSupportFragment<CallPresenter, CallView>(), CallView,
                         .translationY(250f)
                         .alpha(0.0f)
                         .setListener(object : AnimatorListenerAdapter() {
-                            override fun onAnimationEnd(animation: Animator?) {
+                            override fun onAnimationEnd(animation: Animator) {
                                 displayBottomSheet(false)
                             }
                         })
-- 
GitLab