diff --git a/veilid-core/src/tests/android/app/build.gradle b/veilid-core/src/tests/android/app/build.gradle index 0c7d08ce..9dadf0aa 100644 --- a/veilid-core/src/tests/android/app/build.gradle +++ b/veilid-core/src/tests/android/app/build.gradle @@ -3,13 +3,13 @@ plugins { } android { - compileSdkVersion 30 + compileSdkVersion 33 buildToolsVersion "30.0.3" defaultConfig { applicationId "com.veilid.veilid_core_android_tests" minSdkVersion 24 - targetSdkVersion 30 + targetSdkVersion 33 versionCode 1 versionName "1.0" @@ -38,7 +38,7 @@ 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 { @@ -46,16 +46,14 @@ android { path file('CMakeLists.txt') } } + namespace 'com.veilid.veilid_core_android_tests' } 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' } apply plugin: 'org.mozilla.rust-android-gradle.rust-android' diff --git a/veilid-core/src/tests/android/app/src/main/AndroidManifest.xml b/veilid-core/src/tests/android/app/src/main/AndroidManifest.xml index 8f900643..14b07cbe 100644 --- a/veilid-core/src/tests/android/app/src/main/AndroidManifest.xml +++ b/veilid-core/src/tests/android/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + diff --git a/veilid-core/src/tests/android/app/src/main/java/com/veilid/veilid-core/veilid-core_android_tests/MainActivity.java b/veilid-core/src/tests/android/app/src/main/java/com/veilid/veilid_core_android_tests/MainActivity.java similarity index 100% rename from veilid-core/src/tests/android/app/src/main/java/com/veilid/veilid-core/veilid-core_android_tests/MainActivity.java rename to veilid-core/src/tests/android/app/src/main/java/com/veilid/veilid_core_android_tests/MainActivity.java diff --git a/veilid-core/src/tests/android/build.gradle b/veilid-core/src/tests/android/build.gradle index 96496236..2e8d8f04 100644 --- a/veilid-core/src/tests/android/build.gradle +++ b/veilid-core/src/tests/android/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath "com.android.tools.build:gradle:4.1.2" + classpath 'com.android.tools.build:gradle:7.3.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/veilid-core/src/tests/android/gradle/wrapper/gradle-wrapper.properties b/veilid-core/src/tests/android/gradle/wrapper/gradle-wrapper.properties index 3a56e3d2..c5da459e 100644 --- a/veilid-core/src/tests/android/gradle/wrapper/gradle-wrapper.properties +++ b/veilid-core/src/tests/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip