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 --- .../incremental/debug-mergeJavaRes/merge-state | Bin 19457 -> 22401 bytes .../zip-cache/BTsM7arBN+LJBTchB_RFxtOy7Pk= | Bin 354492 -> 0 bytes .../zip-cache/CD29ldpmfn4egt60G0So54i3Fag= | Bin 52314 -> 0 bytes .../zip-cache/KHHT2gCqSu9YRcOurvjsJZbjXFw= | Bin 41550 -> 0 bytes .../zip-cache/OVi2ROOs5UDp249c7T+B3kv+hkg= | Bin 9612 -> 0 bytes .../zip-cache/ZtUzXXVujkRb9fpdOOa_kAfIaxE= | Bin 20559 -> 0 bytes .../zip-cache/b7YXrlx5iREPFsYAycvyggVLajk= | Bin 18379 -> 0 bytes .../zip-cache/keFkCi+zHX2jt4gBTjkc8SdDNyg= | Bin 231966 -> 0 bytes .../zip-cache/n476oCJ587bYAm+FQkSiUDqg_2w= | Bin 376794 -> 0 bytes .../zip-cache/q+UyYIGSes_xf6WZM6O5igkX_44= | Bin 14592 -> 0 bytes .../zip-cache/rkBn1rQUJ8O1hxjTqqQFnaedFw0= | Bin 40372 -> 0 bytes .../zip-cache/uXyJfXVcxEsk_0QwSBWrPO3Rqlo= | Bin 506894 -> 0 bytes .../zip-cache/xPEpOv+85OZ9CRffDT+XA5th_fk= | Bin 64553 -> 0 bytes .../zip-cache/yhUKa_Zoljb2zA+y9bKxz+RQu10= | Bin 41698 -> 0 bytes 14 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 android-app/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/BTsM7arBN+LJBTchB_RFxtOy7Pk= delete mode 100644 android-app/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CD29ldpmfn4egt60G0So54i3Fag= delete mode 100644 android-app/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/KHHT2gCqSu9YRcOurvjsJZbjXFw= delete mode 100644 android-app/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/OVi2ROOs5UDp249c7T+B3kv+hkg= delete mode 100644 android-app/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ZtUzXXVujkRb9fpdOOa_kAfIaxE= delete mode 100644 android-app/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/b7YXrlx5iREPFsYAycvyggVLajk= delete mode 100644 android-app/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/keFkCi+zHX2jt4gBTjkc8SdDNyg= delete mode 100644 android-app/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/n476oCJ587bYAm+FQkSiUDqg_2w= delete mode 100644 android-app/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/q+UyYIGSes_xf6WZM6O5igkX_44= delete mode 100644 android-app/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/rkBn1rQUJ8O1hxjTqqQFnaedFw0= delete mode 100644 android-app/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/uXyJfXVcxEsk_0QwSBWrPO3Rqlo= delete mode 100644 android-app/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/xPEpOv+85OZ9CRffDT+XA5th_fk= delete mode 100644 android-app/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/yhUKa_Zoljb2zA+y9bKxz+RQu10= (limited to 'android-app/app/build/intermediates/incremental/debug-mergeJavaRes') diff --git a/android-app/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state b/android-app/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state index 81f1e7a..7f51354 100644 Binary files a/android-app/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state and b/android-app/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state differ diff --git a/android-app/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/BTsM7arBN+LJBTchB_RFxtOy7Pk= b/android-app/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/BTsM7arBN+LJBTchB_RFxtOy7Pk= deleted file mode 100644 index 9e21c96..0000000 Binary files a/android-app/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/BTsM7arBN+LJBTchB_RFxtOy7Pk= and /dev/null differ diff --git a/android-app/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CD29ldpmfn4egt60G0So54i3Fag= b/android-app/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CD29ldpmfn4egt60G0So54i3Fag= deleted file mode 100644 index fd6b42c..0000000 Binary files a/android-app/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CD29ldpmfn4egt60G0So54i3Fag= and /dev/null differ diff --git a/android-app/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/KHHT2gCqSu9YRcOurvjsJZbjXFw= b/android-app/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/KHHT2gCqSu9YRcOurvjsJZbjXFw= deleted file mode 100644 index 2a6441a..0000000 Binary files a/android-app/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/KHHT2gCqSu9YRcOurvjsJZbjXFw= and /dev/null differ diff --git a/android-app/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/OVi2ROOs5UDp249c7T+B3kv+hkg= b/android-app/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/OVi2ROOs5UDp249c7T+B3kv+hkg= deleted file mode 100644 index 4f1af9b..0000000 Binary files a/android-app/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/OVi2ROOs5UDp249c7T+B3kv+hkg= and /dev/null differ diff --git a/android-app/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ZtUzXXVujkRb9fpdOOa_kAfIaxE= b/android-app/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ZtUzXXVujkRb9fpdOOa_kAfIaxE= deleted file mode 100644 index bff7b3b..0000000 Binary files a/android-app/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ZtUzXXVujkRb9fpdOOa_kAfIaxE= and /dev/null differ diff --git a/android-app/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/b7YXrlx5iREPFsYAycvyggVLajk= b/android-app/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/b7YXrlx5iREPFsYAycvyggVLajk= deleted file mode 100644 index 07b7738..0000000 Binary files a/android-app/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/b7YXrlx5iREPFsYAycvyggVLajk= and /dev/null differ diff --git a/android-app/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/keFkCi+zHX2jt4gBTjkc8SdDNyg= b/android-app/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/keFkCi+zHX2jt4gBTjkc8SdDNyg= deleted file mode 100644 index 04a3387..0000000 Binary files a/android-app/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/keFkCi+zHX2jt4gBTjkc8SdDNyg= and /dev/null differ diff --git a/android-app/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/n476oCJ587bYAm+FQkSiUDqg_2w= b/android-app/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/n476oCJ587bYAm+FQkSiUDqg_2w= deleted file mode 100644 index c703ef4..0000000 Binary files a/android-app/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/n476oCJ587bYAm+FQkSiUDqg_2w= and /dev/null differ diff --git a/android-app/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/q+UyYIGSes_xf6WZM6O5igkX_44= b/android-app/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/q+UyYIGSes_xf6WZM6O5igkX_44= deleted file mode 100644 index 8bf936d..0000000 Binary files a/android-app/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/q+UyYIGSes_xf6WZM6O5igkX_44= and /dev/null differ diff --git a/android-app/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/rkBn1rQUJ8O1hxjTqqQFnaedFw0= b/android-app/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/rkBn1rQUJ8O1hxjTqqQFnaedFw0= deleted file mode 100644 index dccab6f..0000000 Binary files a/android-app/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/rkBn1rQUJ8O1hxjTqqQFnaedFw0= and /dev/null differ diff --git a/android-app/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/uXyJfXVcxEsk_0QwSBWrPO3Rqlo= b/android-app/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/uXyJfXVcxEsk_0QwSBWrPO3Rqlo= deleted file mode 100644 index 1fb0044..0000000 Binary files a/android-app/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/uXyJfXVcxEsk_0QwSBWrPO3Rqlo= and /dev/null differ diff --git a/android-app/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/xPEpOv+85OZ9CRffDT+XA5th_fk= b/android-app/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/xPEpOv+85OZ9CRffDT+XA5th_fk= deleted file mode 100644 index 2e07982..0000000 Binary files a/android-app/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/xPEpOv+85OZ9CRffDT+XA5th_fk= and /dev/null differ diff --git a/android-app/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/yhUKa_Zoljb2zA+y9bKxz+RQu10= b/android-app/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/yhUKa_Zoljb2zA+y9bKxz+RQu10= deleted file mode 100644 index 21e1755..0000000 Binary files a/android-app/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/yhUKa_Zoljb2zA+y9bKxz+RQu10= and /dev/null differ -- cgit v1.2.3