veilid-tools work

veilid-tools/src/tests/android/veilidtools-tests/app/build.gradle

@@ -3,13 +3,13 @@ plugins {
 }
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion "30.0.3"
+    compileSdkVersion 33
+    buildToolsVersion "33.0.1"
 
     defaultConfig {
-        applicationId "com.veilid.veilidtools.veilidtools_android_tests"
+        applicationId "com.veilid.veilidtools_tests"
         minSdkVersion 24
-        targetSdkVersion 30
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
 
@@ -38,33 +38,53 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    ndkVersion '22.0.7026061'
+    ndkVersion '25.1.8937393'
 
     // Required to copy libc++_shared.so
     externalNativeBuild {
         cmake {
+            version '3.22.1'
             path file('CMakeLists.txt')
         }
     }
+    namespace 'com.veilid.veilidtools_tests'
+
+    testOptions {
+        managedDevices {
+            devices {
+                pixel2api30 (com.android.build.api.dsl.ManagedVirtualDevice) {
+                    // Use device profiles you typically see in Android Studio.
+                    device = "Pixel 2"
+                    // ATD currently support only API level 30.
+                    apiLevel = 30
+                    // You can also specify "google-atd" if you require Google
+                    // Play Services.
+                    systemImageSource = "aosp-atd"
+                    // Whether the image must be a 64 bit image.
+                    require64Bit = false
+                }
+            }
+        }
+    }
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation 'com.google.android.material:material:1.4.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
-    implementation 'androidx.security:security-crypto:1.1.0-alpha03'
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'com.google.android.material:material:1.7.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.security:security-crypto:1.1.0-alpha04'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
+    androidTestImplementation 'androidx.test:runner:1.5.1'
+    androidTestImplementation 'androidx.test:rules:1.5.0'
 }
 
 apply plugin: 'org.mozilla.rust-android-gradle.rust-android'
 
 cargo {
-    module  = "../../../../../veilid-tools"
+    module  = "../../../../../"
     libname = "veilid_tools"
     targets = ["arm", "arm64", "x86", "x86_64"]
-    targetDirectory = "../../../../../target"
+    targetDirectory = "../../../../../../target"
     prebuiltToolchains = true
     profile = gradle.startParameter.taskNames.any{it.toLowerCase().contains("debug")} ? "debug" : "release"
     pythonCommand = "python3"
@@ -84,4 +104,3 @@ afterEvaluate {
         tasks["generate${productFlavor}${buildType}Assets"].dependsOn(tasks["cargoBuild"])
     }
 }
-