diff --git a/amethyst/build.gradle b/amethyst/build.gradle index 2df5a4149..432929a9f 100644 --- a/amethyst/build.gradle +++ b/amethyst/build.gradle @@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { alias(libs.plugins.androidApplication) - alias(libs.plugins.jetbrainsKotlinAndroid) alias(libs.plugins.googleServices) alias(libs.plugins.jetbrainsComposeCompiler) alias(libs.plugins.serialization) @@ -192,6 +191,7 @@ android { buildFeatures { compose = true buildConfig = true + resValues = true } packagingOptions { diff --git a/ammolite/build.gradle b/ammolite/build.gradle index 45f99f5b8..7bbfc6eb6 100644 --- a/ammolite/build.gradle +++ b/ammolite/build.gradle @@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { alias(libs.plugins.androidLibrary) - alias(libs.plugins.jetbrainsKotlinAndroid) } android { diff --git a/ammolite/consumer-rules.pro b/ammolite/consumer-rules.pro index fd7f2b7db..b89c71a40 100644 --- a/ammolite/consumer-rules.pro +++ b/ammolite/consumer-rules.pro @@ -20,12 +20,8 @@ # hide the original source file name. #-renamesourcefileattribute SourceFile # preserve the line number information for debugging stack traces. --dontobfuscate -keepattributes LocalVariableTable -keepattributes LocalVariableTypeTable --keepattributes *Annotation* --keepattributes SourceFile --keepattributes LineNumberTable -keepattributes Signature -keepattributes Exceptions -keepattributes InnerClasses diff --git a/benchmark/benchmark-proguard-rules.pro b/benchmark/benchmark-proguard-rules.pro index e4061d222..cc277ab45 100644 --- a/benchmark/benchmark-proguard-rules.pro +++ b/benchmark/benchmark-proguard-rules.pro @@ -20,8 +20,6 @@ # hide the original source file name. #-renamesourcefileattribute SourceFile --dontobfuscate - -ignorewarnings -keepattributes *Annotation* diff --git a/benchmark/build.gradle b/benchmark/build.gradle index e5f9de796..ac57e856b 100644 --- a/benchmark/build.gradle +++ b/benchmark/build.gradle @@ -2,7 +2,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { alias(libs.plugins.androidLibrary) - alias(libs.plugins.jetbrainsKotlinAndroid) alias(libs.plugins.androidBenchmark) } @@ -24,7 +23,7 @@ android { targetCompatibility JavaVersion.VERSION_21 } - sourceSets.androidTest.resources.srcDirs += ["../quartz/src/androidInstrumentedTest/resources"] + sourceSets.androidTest.resources.srcDirs += ["../quartz/src/androidDeviceTest/resources"] testBuildType = "benchmark" buildTypes { diff --git a/build.gradle b/build.gradle index 5bf6769b7..9aed829d8 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,5 @@ plugins { alias(libs.plugins.androidApplication) apply false - alias(libs.plugins.jetbrainsKotlinAndroid) apply false alias(libs.plugins.androidLibrary) apply false alias(libs.plugins.jetbrainsKotlinJvm) apply false alias(libs.plugins.androidBenchmark) apply false diff --git a/commons/build.gradle.kts b/commons/build.gradle.kts index bf482725f..9c2b2e91c 100644 --- a/commons/build.gradle.kts +++ b/commons/build.gradle.kts @@ -1,40 +1,13 @@ + import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { alias(libs.plugins.kotlinMultiplatform) - alias(libs.plugins.androidLibrary) + alias(libs.plugins.androidKotlinMultiplatformLibrary) alias(libs.plugins.jetbrainsComposeCompiler) alias(libs.plugins.composeMultiplatform) } -android { - namespace = "com.vitorpamplona.amethyst.commons" - compileSdk = libs.versions.android.compileSdk.get().toInt() - - defaultConfig { - minSdk = libs.versions.android.minSdk.get().toInt() - targetSdk = libs.versions.android.targetSdk.get().toInt() - - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") - } - - buildTypes { - release { - isMinifyEnabled = true - proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") - } - create("benchmark") { - initWith(getByName("release")) - signingConfig = signingConfigs.getByName("debug") - } - } - compileOptions { - sourceCompatibility = JavaVersion.VERSION_21 - targetCompatibility = JavaVersion.VERSION_21 - } -} - kotlin { compilerOptions { freeCompilerArgs.add("-Xstring-concat=inline") @@ -47,10 +20,20 @@ kotlin { } } - androidTarget { + androidLibrary { + namespace = "com.vitorpamplona.amethyst.commons" + compileSdk = libs.versions.android.compileSdk.get().toInt() + minSdk = libs.versions.android.minSdk.get().toInt() + compilerOptions { jvmTarget.set(JvmTarget.JVM_21) } + + withHostTest {} + + withDeviceTest { + instrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + } } sourceSets { @@ -124,13 +107,13 @@ kotlin { } } - androidUnitTest { + getByName("androidHostTest") { dependencies { implementation(libs.junit) } } - androidInstrumentedTest { + getByName("androidDeviceTest") { dependencies { implementation(libs.androidx.junit) implementation(libs.androidx.espresso.core) diff --git a/commons/src/androidTest/kotlin/com/vitorpamplona/amethyst/commons/compose/TextFieldValueExtensionTest.kt b/commons/src/androidDeviceTest/kotlin/com/vitorpamplona/amethyst/commons/compose/TextFieldValueExtensionTest.kt similarity index 100% rename from commons/src/androidTest/kotlin/com/vitorpamplona/amethyst/commons/compose/TextFieldValueExtensionTest.kt rename to commons/src/androidDeviceTest/kotlin/com/vitorpamplona/amethyst/commons/compose/TextFieldValueExtensionTest.kt diff --git a/commons/src/androidTest/kotlin/com/vitorpamplona/amethyst/commons/preview/BlurhashTest.kt b/commons/src/androidDeviceTest/kotlin/com/vitorpamplona/amethyst/commons/preview/BlurhashTest.kt similarity index 100% rename from commons/src/androidTest/kotlin/com/vitorpamplona/amethyst/commons/preview/BlurhashTest.kt rename to commons/src/androidDeviceTest/kotlin/com/vitorpamplona/amethyst/commons/preview/BlurhashTest.kt diff --git a/commons/src/androidTest/kotlin/com/vitorpamplona/amethyst/commons/preview/MetaTagsParserTest.kt b/commons/src/androidDeviceTest/kotlin/com/vitorpamplona/amethyst/commons/preview/MetaTagsParserTest.kt similarity index 100% rename from commons/src/androidTest/kotlin/com/vitorpamplona/amethyst/commons/preview/MetaTagsParserTest.kt rename to commons/src/androidDeviceTest/kotlin/com/vitorpamplona/amethyst/commons/preview/MetaTagsParserTest.kt diff --git a/commons/src/androidTest/kotlin/com/vitorpamplona/amethyst/commons/richtext/ExpandableTextCutOffCalculatorTest.kt b/commons/src/androidDeviceTest/kotlin/com/vitorpamplona/amethyst/commons/richtext/ExpandableTextCutOffCalculatorTest.kt similarity index 100% rename from commons/src/androidTest/kotlin/com/vitorpamplona/amethyst/commons/richtext/ExpandableTextCutOffCalculatorTest.kt rename to commons/src/androidDeviceTest/kotlin/com/vitorpamplona/amethyst/commons/richtext/ExpandableTextCutOffCalculatorTest.kt diff --git a/commons/src/androidTest/kotlin/com/vitorpamplona/amethyst/commons/richtext/GalleryParserTest.kt b/commons/src/androidDeviceTest/kotlin/com/vitorpamplona/amethyst/commons/richtext/GalleryParserTest.kt similarity index 100% rename from commons/src/androidTest/kotlin/com/vitorpamplona/amethyst/commons/richtext/GalleryParserTest.kt rename to commons/src/androidDeviceTest/kotlin/com/vitorpamplona/amethyst/commons/richtext/GalleryParserTest.kt diff --git a/commons/src/androidTest/kotlin/com/vitorpamplona/amethyst/commons/richtext/RichTextParserTest.kt b/commons/src/androidDeviceTest/kotlin/com/vitorpamplona/amethyst/commons/richtext/RichTextParserTest.kt similarity index 100% rename from commons/src/androidTest/kotlin/com/vitorpamplona/amethyst/commons/richtext/RichTextParserTest.kt rename to commons/src/androidDeviceTest/kotlin/com/vitorpamplona/amethyst/commons/richtext/RichTextParserTest.kt diff --git a/commons/src/androidTest/resources/1x1.png b/commons/src/androidDeviceTest/resources/1x1.png similarity index 100% rename from commons/src/androidTest/resources/1x1.png rename to commons/src/androidDeviceTest/resources/1x1.png diff --git a/commons/src/androidTest/resources/black.png b/commons/src/androidDeviceTest/resources/black.png similarity index 100% rename from commons/src/androidTest/resources/black.png rename to commons/src/androidDeviceTest/resources/black.png diff --git a/commons/src/androidTest/resources/lorikeet.jpg b/commons/src/androidDeviceTest/resources/lorikeet.jpg similarity index 100% rename from commons/src/androidTest/resources/lorikeet.jpg rename to commons/src/androidDeviceTest/resources/lorikeet.jpg diff --git a/commons/src/androidTest/resources/white.png b/commons/src/androidDeviceTest/resources/white.png similarity index 100% rename from commons/src/androidTest/resources/white.png rename to commons/src/androidDeviceTest/resources/white.png diff --git a/gradle.properties b/gradle.properties index 99f780b98..71607cd40 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,7 +22,6 @@ kotlin.code.style=official # thereby reducing the size of the R class for that library android.nonTransitiveRClass=true android.enableR8.fullMode=true -android.nonFinalResIds=false kotlin.daemon.jvmargs=-Xmx12g -XX:MaxMetaspaceSize=3g diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 30fd4a4df..bb3ef8db3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,7 @@ accompanistAdaptive = "0.37.3" composeMultiplatform = "1.9.3" activityCompose = "1.12.2" -agp = "8.13.2" +agp = "9.0.0" android-compileSdk = "36" android-minSdk = "26" android-targetSdk = "36" @@ -10,8 +10,7 @@ androidKotlinGeohash = "b481c6a64e" androidxJunit = "1.3.0" appcompat = "1.7.1" audiowaveform = "1.1.2" -benchmark = "1.4.1" -benchmarkJunit4 = "1.4.1" +benchmark = "1.5.0-alpha01" biometricKtx = "1.2.0-alpha05" coil = "3.3.0" composeBom = "2025.12.01" @@ -72,7 +71,7 @@ accompanist-adaptive = { group = "com.google.accompanist", name = "accompanist-a accompanist-permissions = { group = "com.google.accompanist", name = "accompanist-permissions", version.ref = "accompanistAdaptive" } androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" } androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" } -androidx-benchmark-junit4 = { group = "androidx.benchmark", name = "benchmark-junit4", version.ref = "benchmarkJunit4" } +androidx-benchmark-junit4 = { group = "androidx.benchmark", name = "benchmark-junit4", version.ref = "benchmark" } androidx-biometric-ktx = { group = "androidx.biometric", name = "biometric-ktx", version.ref = "biometricKtx" } androidx-camera-camera2 = { module = "androidx.camera:camera-camera2", version.ref = "androidxCamera" } androidx-camera-core = { module = "androidx.camera:camera-core", version.ref = "androidxCamera" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index da1d086f4..7e74ebf99 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Wed Jan 04 09:23:50 EST 2023 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/quartz/build.gradle.kts b/quartz/build.gradle.kts index e279c3576..11852a57c 100644 --- a/quartz/build.gradle.kts +++ b/quartz/build.gradle.kts @@ -3,47 +3,11 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { alias(libs.plugins.kotlinMultiplatform) - alias(libs.plugins.androidLibrary) + alias(libs.plugins.androidKotlinMultiplatformLibrary) alias(libs.plugins.serialization) alias(libs.plugins.vanniktech.mavenPublish) } -android { - namespace = "com.vitorpamplona.quartz" - compileSdk = libs.versions.android.compileSdk.get().toInt() - - defaultConfig { - minSdk = libs.versions.android.minSdk.get().toInt() - targetSdk = libs.versions.android.targetSdk.get().toInt() - - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles("consumer-rules.pro") - } - - buildTypes { - release { - isMinifyEnabled = true - proguardFiles (getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") - } - create("benchmark") { - initWith(getByName("release")) - signingConfig = signingConfigs.getByName("debug") - } - } - compileOptions { - sourceCompatibility = JavaVersion.VERSION_21 - targetCompatibility = JavaVersion.VERSION_21 - } - packaging { - resources { - excludes.add("**/libscrypt.dylib") - } - } - publishing { - singleVariant("release") - } -} - kotlin { compilerOptions { freeCompilerArgs.add("-Xstring-concat=inline") @@ -55,14 +19,27 @@ kotlin { } } - // Target declarations - add or remove as needed below. These define - // which platforms this KMP module supports. - // See: https://kotlinlang.org/docs/multiplatform-discover-project.html#targets - androidTarget { - publishLibraryVariants("release") + androidLibrary { + namespace = "com.vitorpamplona.quartz" + compileSdk = libs.versions.android.compileSdk.get().toInt() + minSdk = libs.versions.android.minSdk.get().toInt() + compilerOptions { jvmTarget.set(JvmTarget.JVM_21) } + + optimization { + consumerKeepRules.apply { + publish = true + file("consumer-rules.pro") + } + } + + withHostTest {} + + withDeviceTest { + instrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + } } // For iOS targets, this is also where you should @@ -191,14 +168,14 @@ kotlin { } } - androidUnitTest.configure { + getByName("androidHostTest") { dependencies { // Bitcoin secp256k1 bindings implementation(libs.secp256k1.kmp.jni.jvm) } } - androidInstrumentedTest { + getByName("androidDeviceTest") { dependencies { implementation(libs.androidx.runner) implementation(libs.androidx.core) @@ -216,15 +193,15 @@ kotlin { } val iosX64Main by getting { - dependsOn(iosMain.get()) // iosX64Main depends on iosMain + dependsOn(iosMain.get()) } val iosArm64Main by getting { - dependsOn(iosMain.get()) // iosArm64Main depends on iosMain + dependsOn(iosMain.get()) } val iosSimulatorArm64Main by getting { - dependsOn(iosMain.get()) // iosSimulatorArm64Main depends on iosMain + dependsOn(iosMain.get()) } iosTest { @@ -235,15 +212,15 @@ kotlin { } val iosX64Test by getting { - dependsOn(iosTest.get()) // iosX64Test depends on iosTest + dependsOn(iosTest.get()) } val iosArm64Test by getting { - dependsOn(iosTest.get()) // iosArm64Test depends on iosTest + dependsOn(iosTest.get()) } val iosSimulatorArm64Test by getting { - dependsOn(iosTest.get()) // iosSimulatorArm64Test depends on iosTest + dependsOn(iosTest.get()) } } } @@ -255,9 +232,6 @@ mavenPublishing { KotlinMultiplatform( // whether to publish a sources jar sourcesJar = true, - // configure which Android library variants to publish if this project has an Android target - // defaults to "release" when using the main plugin and nothing for the base plugin - androidVariantsToPublish = listOf("release"), ) ) @@ -268,7 +242,6 @@ mavenPublishing { ) // Configure publishing to Maven Central - //publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL, automaticRelease = true) publishToMavenCentral(automaticRelease = true) // Enable GPG signing for all publications diff --git a/quartz/consumer-rules.pro b/quartz/consumer-rules.pro index 5dc1d419e..4985bd413 100644 --- a/quartz/consumer-rules.pro +++ b/quartz/consumer-rules.pro @@ -5,20 +5,6 @@ # For more details, see # http://developer.android.com/guide/developing/tools/proguard.html -# preserve the line number information for debugging stack traces. --dontobfuscate --keepattributes LocalVariableTable --keepattributes LocalVariableTypeTable --keepattributes *Annotation* --keepattributes SourceFile --keepattributes LineNumberTable --keepattributes Signature --keepattributes Exceptions --keepattributes InnerClasses --keepattributes EnclosingMethod --keepattributes MethodParameters --keepparameternames - -keepdirectories libs # Keep all names diff --git a/quartz/src/androidInstrumentedTest/AndroidManifest.xml b/quartz/src/androidDeviceTest/AndroidManifest.xml similarity index 100% rename from quartz/src/androidInstrumentedTest/AndroidManifest.xml rename to quartz/src/androidDeviceTest/AndroidManifest.xml diff --git a/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/LargeDBSignatureCheck.kt b/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/LargeDBSignatureCheck.kt similarity index 100% rename from quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/LargeDBSignatureCheck.kt rename to quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/LargeDBSignatureCheck.kt diff --git a/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/bloom/BloomFilter.kt b/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/bloom/BloomFilter.kt similarity index 100% rename from quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/bloom/BloomFilter.kt rename to quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/bloom/BloomFilter.kt diff --git a/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/lightning/LnInvoiceUtilTest.kt b/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/lightning/LnInvoiceUtilTest.kt similarity index 100% rename from quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/lightning/LnInvoiceUtilTest.kt rename to quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/lightning/LnInvoiceUtilTest.kt diff --git a/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/EventSigCheck.kt b/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip01Core/EventSigCheck.kt similarity index 100% rename from quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/EventSigCheck.kt rename to quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip01Core/EventSigCheck.kt diff --git a/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/Nip01Test.kt b/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip01Core/Nip01Test.kt similarity index 100% rename from quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/Nip01Test.kt rename to quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip01Core/Nip01Test.kt diff --git a/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/crypto/Nip01CryptoTest.kt b/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip01Core/crypto/Nip01CryptoTest.kt similarity index 100% rename from quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/crypto/Nip01CryptoTest.kt rename to quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip01Core/crypto/Nip01CryptoTest.kt diff --git a/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/AddressableTest.kt b/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/AddressableTest.kt similarity index 100% rename from quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/AddressableTest.kt rename to quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/AddressableTest.kt diff --git a/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/AssertUtils.kt b/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/AssertUtils.kt similarity index 100% rename from quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/AssertUtils.kt rename to quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/AssertUtils.kt diff --git a/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/BaseDBTest.kt b/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/BaseDBTest.kt similarity index 100% rename from quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/BaseDBTest.kt rename to quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/BaseDBTest.kt diff --git a/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/BasicTest.kt b/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/BasicTest.kt similarity index 100% rename from quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/BasicTest.kt rename to quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/BasicTest.kt diff --git a/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/DeletionTest.kt b/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/DeletionTest.kt similarity index 100% rename from quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/DeletionTest.kt rename to quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/DeletionTest.kt diff --git a/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/ExpirationTest.kt b/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/ExpirationTest.kt similarity index 100% rename from quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/ExpirationTest.kt rename to quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/ExpirationTest.kt diff --git a/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/FilterMatcherTest.kt b/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/FilterMatcherTest.kt similarity index 100% rename from quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/FilterMatcherTest.kt rename to quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/FilterMatcherTest.kt diff --git a/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/LargeDBTests.kt b/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/LargeDBTests.kt similarity index 100% rename from quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/LargeDBTests.kt rename to quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/LargeDBTests.kt diff --git a/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/QueryAssemblerTest.kt b/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/QueryAssemblerTest.kt similarity index 100% rename from quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/QueryAssemblerTest.kt rename to quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/QueryAssemblerTest.kt diff --git a/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/ReplaceableTest.kt b/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/ReplaceableTest.kt similarity index 100% rename from quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/ReplaceableTest.kt rename to quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/ReplaceableTest.kt diff --git a/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/RightToVanishTest.kt b/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/RightToVanishTest.kt similarity index 100% rename from quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/RightToVanishTest.kt rename to quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/RightToVanishTest.kt diff --git a/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/SearchTest.kt b/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/SearchTest.kt similarity index 100% rename from quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/SearchTest.kt rename to quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/SearchTest.kt diff --git a/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip03Timestamp/ots/OtsTest.kt b/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip03Timestamp/ots/OtsTest.kt similarity index 100% rename from quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip03Timestamp/ots/OtsTest.kt rename to quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip03Timestamp/ots/OtsTest.kt diff --git a/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip04Dm/EncryptionTest.kt b/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip04Dm/EncryptionTest.kt similarity index 100% rename from quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip04Dm/EncryptionTest.kt rename to quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip04Dm/EncryptionTest.kt diff --git a/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip04Dm/Nip04Test.kt b/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip04Dm/Nip04Test.kt similarity index 100% rename from quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip04Dm/Nip04Test.kt rename to quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip04Dm/Nip04Test.kt diff --git a/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip06KeyDerivation/Bip32SeedDerivationTest.kt b/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip06KeyDerivation/Bip32SeedDerivationTest.kt similarity index 100% rename from quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip06KeyDerivation/Bip32SeedDerivationTest.kt rename to quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip06KeyDerivation/Bip32SeedDerivationTest.kt diff --git a/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip06KeyDerivation/Bip39KeyPathTest.kt b/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip06KeyDerivation/Bip39KeyPathTest.kt similarity index 100% rename from quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip06KeyDerivation/Bip39KeyPathTest.kt rename to quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip06KeyDerivation/Bip39KeyPathTest.kt diff --git a/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip06KeyDerivation/Bip39MnemonicsTest.kt b/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip06KeyDerivation/Bip39MnemonicsTest.kt similarity index 100% rename from quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip06KeyDerivation/Bip39MnemonicsTest.kt rename to quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip06KeyDerivation/Bip39MnemonicsTest.kt diff --git a/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip06KeyDerivation/Nip06Test.kt b/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip06KeyDerivation/Nip06Test.kt similarity index 100% rename from quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip06KeyDerivation/Nip06Test.kt rename to quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip06KeyDerivation/Nip06Test.kt diff --git a/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip10Notes/CitationTests.kt b/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip10Notes/CitationTests.kt similarity index 100% rename from quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip10Notes/CitationTests.kt rename to quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip10Notes/CitationTests.kt diff --git a/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip10Notes/ThreadingTests.kt b/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip10Notes/ThreadingTests.kt similarity index 100% rename from quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip10Notes/ThreadingTests.kt rename to quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip10Notes/ThreadingTests.kt diff --git a/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip13Pow/PoWMinerTest.kt b/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip13Pow/PoWMinerTest.kt similarity index 100% rename from quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip13Pow/PoWMinerTest.kt rename to quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip13Pow/PoWMinerTest.kt diff --git a/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip13Pow/PoWRankEvaluatorTest.kt b/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip13Pow/PoWRankEvaluatorTest.kt similarity index 100% rename from quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip13Pow/PoWRankEvaluatorTest.kt rename to quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip13Pow/PoWRankEvaluatorTest.kt diff --git a/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip17Dm/AESGCMTest.kt b/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip17Dm/AESGCMTest.kt similarity index 100% rename from quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip17Dm/AESGCMTest.kt rename to quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip17Dm/AESGCMTest.kt diff --git a/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip17Dm/ChatroomKeyTest.kt b/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip17Dm/ChatroomKeyTest.kt similarity index 100% rename from quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip17Dm/ChatroomKeyTest.kt rename to quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip17Dm/ChatroomKeyTest.kt diff --git a/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip19Bech32/NIP19EmbedTests.kt b/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip19Bech32/NIP19EmbedTests.kt similarity index 100% rename from quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip19Bech32/NIP19EmbedTests.kt rename to quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip19Bech32/NIP19EmbedTests.kt diff --git a/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip22Comments/GeolocatedComments.kt b/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip22Comments/GeolocatedComments.kt similarity index 100% rename from quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip22Comments/GeolocatedComments.kt rename to quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip22Comments/GeolocatedComments.kt diff --git a/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip44Encryption/Nip44v1Test.kt b/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip44Encryption/Nip44v1Test.kt similarity index 100% rename from quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip44Encryption/Nip44v1Test.kt rename to quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip44Encryption/Nip44v1Test.kt diff --git a/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip44Encryption/Nip44v2Test.kt b/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip44Encryption/Nip44v2Test.kt similarity index 100% rename from quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip44Encryption/Nip44v2Test.kt rename to quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip44Encryption/Nip44v2Test.kt diff --git a/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip44Encryption/TestPackageClasses.kt b/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip44Encryption/TestPackageClasses.kt similarity index 100% rename from quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip44Encryption/TestPackageClasses.kt rename to quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip44Encryption/TestPackageClasses.kt diff --git a/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip46RemoteSigner/Nip46Test.kt b/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip46RemoteSigner/Nip46Test.kt similarity index 100% rename from quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip46RemoteSigner/Nip46Test.kt rename to quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip46RemoteSigner/Nip46Test.kt diff --git a/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip49PrivKeyEnc/NIP49Test.kt b/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip49PrivKeyEnc/NIP49Test.kt similarity index 100% rename from quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip49PrivKeyEnc/NIP49Test.kt rename to quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip49PrivKeyEnc/NIP49Test.kt diff --git a/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip55AndroidSigner/SignStringTest.kt b/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip55AndroidSigner/SignStringTest.kt similarity index 100% rename from quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip55AndroidSigner/SignStringTest.kt rename to quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip55AndroidSigner/SignStringTest.kt diff --git a/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip57Zaps/PrivateZapTests.kt b/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip57Zaps/PrivateZapTests.kt similarity index 100% rename from quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip57Zaps/PrivateZapTests.kt rename to quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip57Zaps/PrivateZapTests.kt diff --git a/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip59GiftWraps/GiftWrapEventTest.kt b/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip59GiftWraps/GiftWrapEventTest.kt similarity index 100% rename from quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip59GiftWraps/GiftWrapEventTest.kt rename to quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/nip59GiftWraps/GiftWrapEventTest.kt diff --git a/quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/utils/HexEncodingTest.kt b/quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/utils/HexEncodingTest.kt similarity index 100% rename from quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/utils/HexEncodingTest.kt rename to quartz/src/androidDeviceTest/kotlin/com/vitorpamplona/quartz/utils/HexEncodingTest.kt diff --git a/quartz/src/androidInstrumentedTest/resources/bip39.vectors.json b/quartz/src/androidDeviceTest/resources/bip39.vectors.json similarity index 100% rename from quartz/src/androidInstrumentedTest/resources/bip39.vectors.json rename to quartz/src/androidDeviceTest/resources/bip39.vectors.json diff --git a/quartz/src/androidInstrumentedTest/resources/github_amethyst.html b/quartz/src/androidDeviceTest/resources/github_amethyst.html similarity index 100% rename from quartz/src/androidInstrumentedTest/resources/github_amethyst.html rename to quartz/src/androidDeviceTest/resources/github_amethyst.html diff --git a/quartz/src/androidInstrumentedTest/resources/nip44.vectors.json b/quartz/src/androidDeviceTest/resources/nip44.vectors.json similarity index 100% rename from quartz/src/androidInstrumentedTest/resources/nip44.vectors.json rename to quartz/src/androidDeviceTest/resources/nip44.vectors.json diff --git a/quartz/src/androidInstrumentedTest/resources/nostr_vitor_short.json b/quartz/src/androidDeviceTest/resources/nostr_vitor_short.json similarity index 100% rename from quartz/src/androidInstrumentedTest/resources/nostr_vitor_short.json rename to quartz/src/androidDeviceTest/resources/nostr_vitor_short.json diff --git a/quartz/src/androidInstrumentedTest/resources/nostr_vitor_startup_data.json b/quartz/src/androidDeviceTest/resources/nostr_vitor_startup_data.json similarity index 100% rename from quartz/src/androidInstrumentedTest/resources/nostr_vitor_startup_data.json rename to quartz/src/androidDeviceTest/resources/nostr_vitor_startup_data.json diff --git a/quartz/src/androidInstrumentedTest/resources/ovxxk2vz.jpg b/quartz/src/androidDeviceTest/resources/ovxxk2vz.jpg similarity index 100% rename from quartz/src/androidInstrumentedTest/resources/ovxxk2vz.jpg rename to quartz/src/androidDeviceTest/resources/ovxxk2vz.jpg diff --git a/quartz/src/androidInstrumentedTest/resources/trouble_video b/quartz/src/androidDeviceTest/resources/trouble_video similarity index 100% rename from quartz/src/androidInstrumentedTest/resources/trouble_video rename to quartz/src/androidDeviceTest/resources/trouble_video