vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-10-18 12:15:58 +02:00
Code Issues Releases Wiki Activity

Bump minimum Android SDK level to 23

Browse source
This commit is contained in:
Florian Schmaus 2024-10-04 19:13:41 +02:00
parent c35443928c
commit 34f490ff15
4 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/ci.yml vendored
View file

@ -56,7 +56,7 @@ jobs:
uses: android-actions/setup-android@v3 uses: android-actions/setup-android@v3
- name: Install Android SDK - name: Install Android SDK
run: | run: |
sdkmanager "platforms;android-21" sdkmanager "platforms;android-23"
# Testing # Testing
- name: Gradle Check - name: Gradle Check

2
build-logic/src/main/groovy/org.igniterealtime.smack.android-conventions.gradle
View file

@ -3,7 +3,7 @@ plugins {
id 'org.igniterealtime.smack.global-conventions' id 'org.igniterealtime.smack.global-conventions'
} }
dependencies { 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 { animalsniffer {
sourceSets = [sourceSets.main] sourceSets = [sourceSets.main]

2
build-logic/src/main/groovy/org.igniterealtime.smack.global-conventions.gradle
View file

@ -1,7 +1,7 @@
ext { ext {
javaVersion = JavaVersion.VERSION_11 javaVersion = JavaVersion.VERSION_11
javaMajor = javaVersion.getMajorVersion() javaMajor = javaVersion.getMajorVersion()
smackMinAndroidSdk = 21 smackMinAndroidSdk = 23
androidBootClasspath = { getAndroidRuntimeJar() } androidBootClasspath = { getAndroidRuntimeJar() }
} }

2
smack-android/src/main/java/org/jivesoftware/smack/android/AndroidSmackInitializer.java
View file

@ -37,6 +37,8 @@ import org.minidns.dnsserverlookup.android21.AndroidUsingLinkProperties;
public class AndroidSmackInitializer implements SmackInitializer { public class AndroidSmackInitializer implements SmackInitializer {
@Override @Override
// Android deprecated StrictHostnameVerifier in API level 22
@SuppressWarnings("deprecation")
public List<Exception> initialize() { public List<Exception> initialize() {
SmackConfiguration.setDefaultHostnameVerifier(new StrictHostnameVerifier()); SmackConfiguration.setDefaultHostnameVerifier(new StrictHostnameVerifier());
Base64.setEncoder(AndroidBase64Encoder.INSTANCE); Base64.setEncoder(AndroidBase64Encoder.INSTANCE);