Commit 6947b354a5 for strongswan.org
commit 6947b354a57650a1add70bc451a8f30367adf5fa
Author: Tobias Brunner <tobias@strongswan.org>
Date: Fri Oct 16 11:57:09 2026 +0200
android: Update dependencies and increase compile and minimum SDKs
Some dependencies require the latest compile SDK but also a minimum
build SDK, so we raise them accordingly.
diff --git a/Android.mk b/Android.mk
index 99c471cabc..e8ac526865 100644
--- a/Android.mk
+++ b/Android.mk
@@ -51,6 +51,7 @@ strongswan_CFLAGS := \
-DHAVE_DLADDR \
-DHAVE_PRCTL \
-DHAVE_LINUX_UDP_H \
+ -DHAVE_SIGWAITINFO \
-DHAVE_STRUCT_SADB_X_POLICY_SADB_X_POLICY_PRIORITY \
-DHAVE_IPSEC_MODE_BEET \
-DHAVE_IPSEC_DIR_FWD \
diff --git a/src/frontends/android/app/build.gradle b/src/frontends/android/app/build.gradle
index 37d236041a..fbdb64905c 100644
--- a/src/frontends/android/app/build.gradle
+++ b/src/frontends/android/app/build.gradle
@@ -5,8 +5,8 @@ android {
defaultConfig {
applicationId "org.strongswan.android"
- compileSdk = 36
- minSdkVersion 21
+ compileSdk = 37
+ minSdkVersion 23
targetSdkVersion 36
versionCode 96
@@ -45,13 +45,13 @@ android {
}
dependencies {
- implementation 'androidx.appcompat:appcompat:1.7.1'
- implementation 'androidx.core:core:1.17.0'
- implementation 'androidx.lifecycle:lifecycle-process:2.9.4'
+ implementation 'androidx.appcompat:appcompat:1.8.0'
+ implementation 'androidx.core:core:1.19.1'
+ implementation 'androidx.lifecycle:lifecycle-process:2.11.0'
implementation 'androidx.preference:preference:1.2.1'
implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0'
- implementation 'com.google.android.material:material:1.13.0'
+ implementation 'com.google.android.material:material:1.14.0'
testImplementation 'junit:junit:4.13.2'
- testImplementation 'org.assertj:assertj-core:3.27.6'
- testImplementation 'org.mockito:mockito-core:5.20.0'
+ testImplementation 'org.assertj:assertj-core:3.27.7'
+ testImplementation 'org.mockito:mockito-core:5.24.0'
}
diff --git a/src/frontends/android/app/src/main/jni/Android.mk b/src/frontends/android/app/src/main/jni/Android.mk
index 06cddaa773..b3be94084f 100644
--- a/src/frontends/android/app/src/main/jni/Android.mk
+++ b/src/frontends/android/app/src/main/jni/Android.mk
@@ -44,6 +44,7 @@ strongswan_CFLAGS := \
-DHAVE_DLADDR \
-DHAVE_PRCTL \
-DHAVE_LINUX_UDP_H \
+ -DHAVE_SIGWAITINFO \
-DHAVE_STRUCT_SADB_X_POLICY_SADB_X_POLICY_PRIORITY \
-DHAVE_IPSEC_MODE_BEET \
-DHAVE_IPSEC_DIR_FWD \
diff --git a/src/frontends/android/app/src/main/jni/Application.mk b/src/frontends/android/app/src/main/jni/Application.mk
index a71cd74c99..09ec8c1b99 100644
--- a/src/frontends/android/app/src/main/jni/Application.mk
+++ b/src/frontends/android/app/src/main/jni/Application.mk
@@ -1,2 +1,2 @@
-APP_PLATFORM := android-21
+APP_PLATFORM := android-23
APP_SUPPORT_FLEXIBLE_PAGE_SIZES := true