Build WireGuard from source instead of library

.gitmodules

@@ -3,4 +3,7 @@
 	url = https://github.com/eduvpn/ics-openvpn
 [submodule "common/libs/eduvpn-common"]
 	path = common/libs/eduvpn-common
-	url = https://github.com/eduvpn/eduvpn-common
+	url = https://github.com/eduvpn/eduvpn-common
+[submodule "wireguard"]
+	path = wireguard
+	url = https://codeberg.org/fkooman/wireguard-android

CHANGES.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 3.3.3 (2024-10-04)
+- embed WireGuard for Android
+- fix crash when reconnecting
+
 ## 3.3.2 (2024-08-30)
 - bump release for Google Play Store
 

app/build.gradle

@@ -15,8 +15,8 @@ android {
         applicationId "nl.eduvpn.app"
         minSdkVersion 21
         targetSdkVersion 34
-        versionCode 29
-        versionName "3.3.2"
+        versionCode 30
+        versionName "3.3.3"
         ndkVersion "26.1.10909125"
 
         vectorDrawables.useSupportLibrary = true
@@ -166,7 +166,7 @@ dependencies {
     // eduVPN common library written in Go, stores all data and does the communication with the servers
     implementation project(path: ':common')
     // WireGuard VPN library
-    implementation(eduvpnVersions.wireguard)
+    implementation project(path: ':wireguard')
 
     // Please try to stay in sync with the versions used in the ics-openvpn module
     implementation(eduvpnVersions.android.appcompat)

build_app_git.sh

@@ -8,7 +8,7 @@ SDK_DIR=${HOME}/android-sdk
 KEY_STORE=${HOME}/android.jks
 
 GIT_REPO=https://codeberg.org/eduVPN/android
-#GIT_TAG=3.3.2
+#GIT_TAG=3.3.3
 GIT_TAG=master
 
 PROJECT_DIR=${HOME}/Projects

build_app_tar.sh

@@ -7,7 +7,7 @@
 SDK_DIR=${HOME}/android-sdk
 KEY_STORE=${HOME}/android.jks
 
-V=3.3.2
+V=3.3.3
 DOWNLOAD_URL=https://codeberg.org/eduVPN/android/releases/download/${V}/eduvpn-android-${V}.tar.xz
 
 PROJECT_DIR=${HOME}/Projects

create_release_tar.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GIT_REPO=https://codeberg.org/eduVPN/android
-GIT_TAG=3.3.2
+GIT_TAG=3.3.3
 #GIT_TAG=master
 
 ###############################################################################

fastlane/metadata/android/en-US/changelogs/30.txt

@@ -0,0 +1,2 @@
+- embed WireGuard for Android
+- fix crash when reconnecting

gradle.properties

@@ -20,4 +20,7 @@ org.gradle.jvmargs=-Xmx1536M
 
 android.useAndroidX=true
 android.enableJetifier=true
-android.defaults.buildfeatures.buildconfig=true
+android.defaults.buildfeatures.buildconfig=true
+
+wireguardPackageName=com.wireguard
+wireguardVersionName=1.0.20231018-eduvpn-fork

gradle/libs.versions.toml

@@ -1,5 +1,4 @@
 [versions]
-wireguard = "1.0.20230706"
 # Please try to stay in sync with the versions used in the ics-openvpn module
 activity-ktx = "1.1.0"
 appcompat = "1.6.1"
@@ -24,7 +23,6 @@ espresso = "3.5.1"
 uiautomator = "2.3.0"
 
 [libraries]
-wireguard = { group = "com.wireguard.android", name = "tunnel", version.ref = "wireguard" }
 android-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
 android-activity-ktx = { group = "androidx.activity", name = "activity-ktx", version.ref = "activity-ktx" }
 android-fragment-ktx = { group = "androidx.fragment", name = "fragment-ktx", version.ref = "fragment-ktx" }
@@ -51,4 +49,4 @@ androidx-test-orchestrator = { group = "androidx.test", name = "orchestrator", v
 espresso = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espresso" }
 uiautomator = { group = "androidx.test.uiautomator", name = "uiautomator", version.ref = "uiautomator" }
 
-[plugins]
+[plugins]

settings.gradle

@@ -27,10 +27,15 @@ dependencyResolutionManagement {
         eduvpnVersions {
             from(files('gradle/libs.versions.toml'))
         }
+        wireguardVersions {
+            from(files('wireguard/gradle/libs.versions.toml'))
+        }
     }
 }
 
 include ':app'
 include ':ics-openvpn-main'
 project(':ics-openvpn-main').projectDir = new File(rootDir, '/ics-openvpn/main')
-include ':common'
+include ':common'
+include ':wireguard'
+project(':wireguard').projectDir = new File(rootDir, '/wireguard/tunnel')