mirror of
https://github.com/vitorpamplona/amethyst.git
synced 2026-10-05 11:18:24 +00:00
Claude
a87222c51f
`:commons` is on the CLI classpath, yet it declared Compose UI, Coil, Compose resources, markdown and desktop Compose as dependencies, dragging ~40 MB of UI/Skiko jars into every `amy` distribution. This moves every Compose-dependent file into a new KMP module, `:commonsUI`, that `api`-depends on `:commons`; `:commons` keeps only the Compose runtime (stability annotations + snapshot state) and lifecycle-viewmodel. Files keep their `com.vitorpamplona.amethyst.commons.*` packages, so the split is a build-graph boundary and no consumer import changed. 236 files were `git mv`'d (composables, icons, robohash, theme, Coil fetchers, the `@Composable` relay-client entry points, `composeResources`, and the tests that exercise them). Two headless files needed surgery instead of a move: `GalleryParser` lost a vestigial foundation `@OptIn`, and the `LocalPrivacyLockState`/`lockStateFor` CompositionLocal accessor moved out of `PrivacyLockState` into its own commonsUI file. The feed DAL under `ui/feeds` and `ui/note/ParentNote`+`ReplyContext` stay in `commons` because ViewModels depend on them. `amethyst`, `desktopApp`, `nappletHost` (NappletWebContract serves the shell from composeResources) and `benchmark` now depend on `:commonsUI`; `cli`, `geode` and `marmotBench` do not. commons' androidMain gains an explicit androidx.core KTX dep it previously got transitively through Compose UI. CI, crowdin, the icon-font tools and the escaping hook point at the new composeResources location; CLAUDE.md, commons/ARCHITECTURE.md, a new commonsUI/ARCHITECTURE.md, CONTRIBUTING, BUILDING and the affected skills document the boundary. A plan doc under commons/plans records the classification method and follow-ups. Verified: JVM compiles for commons, commonsUI, cli, desktopApp; Android debug compiles for nappletHost and amethyst; commons/commonsUI/cli JVM test suites; both verifyKmpPurity gates; the cli runtime classpath no longer resolves Compose UI, material3, Skiko or Coil. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01N56KzPSYiN5edMRamvKEgD
82 lines
2.7 KiB
Kotlin
82 lines
2.7 KiB
Kotlin
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
|
|
|
|
plugins {
|
|
alias(libs.plugins.androidLibrary)
|
|
alias(libs.plugins.androidBenchmark)
|
|
}
|
|
|
|
android {
|
|
namespace = "com.vitorpamplona.amethyst.benchmark"
|
|
compileSdk = libs.versions.android.compileSdk.get().toInt()
|
|
|
|
defaultConfig {
|
|
minSdk = libs.versions.android.minSdk.get().toInt()
|
|
|
|
// Enable measuring on an emulator, or devices with low battery
|
|
testInstrumentationRunner = "androidx.benchmark.junit4.AndroidBenchmarkRunner"
|
|
testInstrumentationRunnerArguments["androidx.benchmark.suppressErrors"] = "EMULATOR,LOW-BATTERY"
|
|
}
|
|
|
|
testOptions {
|
|
targetSdk = libs.versions.android.targetSdk.get().toInt()
|
|
}
|
|
|
|
compileOptions {
|
|
sourceCompatibility = JavaVersion.VERSION_21
|
|
targetCompatibility = JavaVersion.VERSION_21
|
|
}
|
|
|
|
sourceSets {
|
|
getByName("androidTest") {
|
|
resources.directories.add(file("../quartz/src/androidDeviceTest/resources").path)
|
|
}
|
|
}
|
|
|
|
testBuildType = "benchmark"
|
|
buildTypes {
|
|
getByName("debug") {
|
|
// Since debuggable can"t be modified by gradle for library modules,
|
|
// it must be done in a manifest - see src/androidTest/AndroidManifest.xml
|
|
isMinifyEnabled = false
|
|
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "benchmark-proguard-rules.pro")
|
|
}
|
|
getByName("release") {
|
|
isDefault = false
|
|
isMinifyEnabled = true
|
|
}
|
|
create("benchmark") {
|
|
isDefault = true
|
|
initWith(getByName("release"))
|
|
signingConfig = signingConfigs.getByName("debug")
|
|
}
|
|
}
|
|
}
|
|
|
|
kotlin {
|
|
compilerOptions {
|
|
jvmTarget.set(JvmTarget.JVM_21)
|
|
}
|
|
}
|
|
|
|
dependencies {
|
|
implementation(libs.androidx.core.ktx)
|
|
androidTestImplementation(platform(libs.androidx.compose.bom))
|
|
androidTestImplementation(libs.androidx.runner)
|
|
androidTestImplementation(libs.androidx.junit)
|
|
androidTestImplementation(libs.junit)
|
|
androidTestImplementation(libs.androidx.benchmark.junit4)
|
|
androidTestImplementation(project(":quartz"))
|
|
androidTestImplementation(project(":commons"))
|
|
androidTestImplementation(project(":commonsUI"))
|
|
|
|
// Custom C secp256k1 (libschnorr256k1) for the 3-way Android benchmark
|
|
androidTestImplementation(libs.schnorr256k1.kmp)
|
|
|
|
androidTestImplementation(libs.androidx.compose.foundation)
|
|
|
|
// Add your dependencies here. Note that you cannot benchmark code
|
|
// in an app module this way - you will need to move any code you
|
|
// want to benchmark to a library module:
|
|
// https://developer.android.com/studio/projects/android-library#Convert
|
|
}
|