embed wireguard-android as a submodule

.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

app/build.gradle

@@ -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)

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')