Move qt binding java code to a separate module

client/android/build.gradle.kts

@@ -11,7 +11,6 @@ kotlin {
 // get values from gradle or local properties
 val qtTargetSdkVersion: String by gradleProperties
 val qtTargetAbiList: String by gradleProperties
-val qtAndroidDir: String by gradleProperties
 
 android {
     namespace = "org.amnezia.vpn"
@@ -42,8 +41,9 @@ android {
     sourceSets {
         getByName("main") {
             manifest.srcFile("AndroidManifest.xml")
-            java.setSrcDirs(listOf("$qtAndroidDir/src", "src"))
+            java.setSrcDirs(listOf("src"))
-            res.setSrcDirs(listOf("$qtAndroidDir/res", "res"))
+            res.setSrcDirs(listOf("res"))
+            // androyddeployqt creates the folders below
             assets.setSrcDirs(listOf("assets"))
             jniLibs.setSrcDirs(listOf("libs"))
         }
@@ -80,6 +80,7 @@ android {
 
 dependencies {
     implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar", "*.aar"))))
+    implementation(project(":qt"))
     implementation(libs.androidx.core)
     implementation(libs.androidx.appcompat)
     implementation(libs.androidx.security.crypto)

client/android/qt/build.gradle.kts

@@ -0,0 +1,25 @@
+plugins {
+    id(libs.plugins.android.library.get().pluginId)
+    id("property-delegate")
+}
+
+java {
+    toolchain.languageVersion.set(JavaLanguageVersion.of(17))
+}
+
+val qtAndroidDir: String by gradleProperties
+
+android {
+    namespace = "org.qtproject.qt.android.binding"
+
+    sourceSets {
+        getByName("main") {
+            java.setSrcDirs(listOf("$qtAndroidDir/src"))
+            res.setSrcDirs(listOf("$qtAndroidDir/res"))
+        }
+    }
+}
+
+dependencies {
+    implementation(fileTree(mapOf("dir" to "../libs", "include" to listOf("*.jar", "*.aar"))))
+}

client/android/settings.gradle.kts

@@ -33,6 +33,8 @@ plugins {
 rootProject.name = "AmneziaVPN"
 rootProject.buildFileName = "build.gradle.kts"
 
+include(":qt")
+
 // get values from gradle or local properties
 val androidBuildToolsVersion: String by gradleProperties
 val androidCompileSdkVersion: String by gradleProperties