From 34f490ff15baae7620dfafc2cef97124a679fec4 Mon Sep 17 00:00:00 2001
From: Florian Schmaus <flo@geekplace.eu>
Date: Fri, 4 Oct 2024 19:13:41 +0200
Subject: [PATCH] Bump minimum Android SDK level to 23

---
 .github/workflows/ci.yml                                        | 2 +-
 .../groovy/org.igniterealtime.smack.android-conventions.gradle  | 2 +-
 .../groovy/org.igniterealtime.smack.global-conventions.gradle   | 2 +-
 .../org/jivesoftware/smack/android/AndroidSmackInitializer.java | 2 ++
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b8a657986..fa9bb447a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -56,7 +56,7 @@ jobs:
         uses: android-actions/setup-android@v3
       - name: Install Android SDK
         run: |
-          sdkmanager "platforms;android-21"
+          sdkmanager "platforms;android-23"
 
       # Testing
       - name: Gradle Check
diff --git a/build-logic/src/main/groovy/org.igniterealtime.smack.android-conventions.gradle b/build-logic/src/main/groovy/org.igniterealtime.smack.android-conventions.gradle
index 6f92548d3..94beb432c 100644
--- a/build-logic/src/main/groovy/org.igniterealtime.smack.android-conventions.gradle
+++ b/build-logic/src/main/groovy/org.igniterealtime.smack.android-conventions.gradle
@@ -3,7 +3,7 @@ plugins {
 	id 'org.igniterealtime.smack.global-conventions'
 }
 dependencies {
-	signature "net.sf.androidscents.signature:android-api-level-${smackMinAndroidSdk}:5.0.1_r2@signature"
+	signature "net.sf.androidscents.signature:android-api-level-${smackMinAndroidSdk}:6.0_r3@signature"
 }
 animalsniffer {
 	sourceSets = [sourceSets.main]
diff --git a/build-logic/src/main/groovy/org.igniterealtime.smack.global-conventions.gradle b/build-logic/src/main/groovy/org.igniterealtime.smack.global-conventions.gradle
index 00fbff953..5bd92c7ee 100644
--- a/build-logic/src/main/groovy/org.igniterealtime.smack.global-conventions.gradle
+++ b/build-logic/src/main/groovy/org.igniterealtime.smack.global-conventions.gradle
@@ -1,7 +1,7 @@
 ext {
 	javaVersion = JavaVersion.VERSION_11
 	javaMajor = javaVersion.getMajorVersion()
-	smackMinAndroidSdk = 21
+	smackMinAndroidSdk = 23
 
 	androidBootClasspath = { getAndroidRuntimeJar() }
 }
diff --git a/smack-android/src/main/java/org/jivesoftware/smack/android/AndroidSmackInitializer.java b/smack-android/src/main/java/org/jivesoftware/smack/android/AndroidSmackInitializer.java
index a34fb1776..b66b56462 100644
--- a/smack-android/src/main/java/org/jivesoftware/smack/android/AndroidSmackInitializer.java
+++ b/smack-android/src/main/java/org/jivesoftware/smack/android/AndroidSmackInitializer.java
@@ -37,6 +37,8 @@ import org.minidns.dnsserverlookup.android21.AndroidUsingLinkProperties;
 public class AndroidSmackInitializer implements SmackInitializer {
 
     @Override
+    // Android deprecated StrictHostnameVerifier in API level 22
+    @SuppressWarnings("deprecation")
     public List<Exception> initialize() {
         SmackConfiguration.setDefaultHostnameVerifier(new StrictHostnameVerifier());
         Base64.setEncoder(AndroidBase64Encoder.INSTANCE);