From cc76e4f3cc4e4d958f398ed2899a8d653815985b Mon Sep 17 00:00:00 2001 From: Peter Stone Date: Sun, 15 Mar 2026 06:52:23 +0000 Subject: fix: move weather feature to org/terst/nav package directories Package declarations were already org.terst.nav.* but files lived under com/example/androidapp/. Kotlin 2.0 (K2) compiler on CI fails when package declarations don't match directory structure during kapt stub generation. Moved all 20 files to their correct locations and renamed MainActivity (weather) -> WeatherActivity to avoid confusion with the nav app's MainActivity. Co-Authored-By: Claude Sonnet 4.6 --- .../packageDebug/tmp/debug/dex-renamer-state.txt | 33 +++++++++++++++++++-- .../tmp/debug/zip-cache/androidResources | Bin 87879 -> 88487 bytes .../tmp/debug/zip-cache/javaResources0 | Bin 6752 -> 7813 bytes 3 files changed, 30 insertions(+), 3 deletions(-) (limited to 'android-app/app/build/intermediates/incremental/packageDebug') diff --git a/android-app/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/android-app/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index a634460..2ac7e47 100644 --- a/android-app/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/android-app/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,13 +1,40 @@ -#Fri Mar 13 23:47:10 UTC 2026 -path.3=classes2.dex +#Sun Mar 15 06:52:00 UTC 2026 +path.4=14/classes.dex +path.3=12/classes.dex path.2=10/classes.dex +renamed.9=classes10.dex path.1=0/classes.dex +renamed.8=classes9.dex +path.8=4/classes.dex +path.7=3/classes.dex +path.6=2/classes.dex +renamed.12=classes13.dex +path.5=15/classes.dex +renamed.11=classes12.dex +renamed.10=classes11.dex path.0=classes.dex -base.3=/workspace/nav/android-app/app/build/intermediates/dex/debug/mergeExtDexDebug/classes2.dex +base.4=/workspace/nav/android-app/app/build/intermediates/dex/debug/mergeProjectDexDebug/14/classes.dex +base.3=/workspace/nav/android-app/app/build/intermediates/dex/debug/mergeProjectDexDebug/12/classes.dex base.2=/workspace/nav/android-app/app/build/intermediates/dex/debug/mergeProjectDexDebug/10/classes.dex base.1=/workspace/nav/android-app/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex base.0=/workspace/nav/android-app/app/build/intermediates/dex/debug/mergeExtDexDebug/classes.dex renamed.3=classes4.dex +path.12=classes2.dex renamed.2=classes3.dex renamed.1=classes2.dex +path.10=8/classes.dex renamed.0=classes.dex +base.9=/workspace/nav/android-app/app/build/intermediates/dex/debug/mergeProjectDexDebug/7/classes.dex +path.9=7/classes.dex +path.11=9/classes.dex +renamed.7=classes8.dex +base.8=/workspace/nav/android-app/app/build/intermediates/dex/debug/mergeProjectDexDebug/4/classes.dex +renamed.6=classes7.dex +base.7=/workspace/nav/android-app/app/build/intermediates/dex/debug/mergeProjectDexDebug/3/classes.dex +renamed.5=classes6.dex +base.6=/workspace/nav/android-app/app/build/intermediates/dex/debug/mergeProjectDexDebug/2/classes.dex +renamed.4=classes5.dex +base.5=/workspace/nav/android-app/app/build/intermediates/dex/debug/mergeProjectDexDebug/15/classes.dex +base.12=/workspace/nav/android-app/app/build/intermediates/dex/debug/mergeExtDexDebug/classes2.dex +base.11=/workspace/nav/android-app/app/build/intermediates/dex/debug/mergeProjectDexDebug/9/classes.dex +base.10=/workspace/nav/android-app/app/build/intermediates/dex/debug/mergeProjectDexDebug/8/classes.dex diff --git a/android-app/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/android-app/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources index a75a2e1..f6ae607 100644 Binary files a/android-app/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/android-app/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ diff --git a/android-app/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 b/android-app/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 index 7b7e21a..6d3f376 100644 Binary files a/android-app/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 and b/android-app/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 differ -- cgit v1.2.3