Skip to content

Android: Fixes androidMainActivity to only run when there's no passed activity#6992

Merged
lefou merged 4 commits intocom-lihaoyi:mainfrom
vaslabs-ltd:android-fix-when-main-activity
Apr 17, 2026
Merged

Android: Fixes androidMainActivity to only run when there's no passed activity#6992
lefou merged 4 commits intocom-lihaoyi:mainfrom
vaslabs-ltd:android-fix-when-main-activity

Conversation

@vaslabs
Copy link
Copy Markdown
Contributor

@vaslabs vaslabs commented Apr 9, 2026

Fixes an issue introduced in #6980

1/1, 1 FAILED] mill show Jetcaster.tv.androidRun --activity com.example.jetcaster.tv.MainActivity
Error: 1-099] [error] Jetcaster.tv.androidMainActivity No launchable main activity found in the manifest.

Runs the androidMainActivity only if it's not passed as an argument, avoiding the non-existing error

cc: @souvlakias

Verification: https://github.com/vaslabs-ltd/compose-samples-with-mill/actions/runs/24177395330 and https://github.com/vaslabs-ltd/compose-samples-with-mill/actions/runs/24390871608

Also fixes the auto-detection of Android TV android activities

Screenshot From 2026-04-14 12-09-09

@vaslabs vaslabs marked this pull request as ready for review April 9, 2026 07:51
@vaslabs vaslabs changed the title Fixes androidMainActivity to only run when there's no passed activity Android: Fixes androidMainActivity to only run when there's no passed activity Apr 9, 2026
@vaslabs
Copy link
Copy Markdown
Contributor Author

vaslabs commented Apr 9, 2026

This is ready

@vaslabs vaslabs marked this pull request as draft April 14, 2026 09:05
@vaslabs
Copy link
Copy Markdown
Contributor Author

vaslabs commented Apr 14, 2026

on the Jetcaster tv, it wasn't discovering the main activity automatically because the launcher is different -> android.intent.category.LEANBACK_LAUNCHER fixing for that too

@vaslabs vaslabs marked this pull request as ready for review April 14, 2026 10:49
@vaslabs
Copy link
Copy Markdown
Contributor Author

vaslabs commented Apr 15, 2026

@lihaoyi @lefou please review, I'd prefer to have this fix in before 1.1.6

@lefou lefou merged commit 40cb071 into com-lihaoyi:main Apr 17, 2026
36 checks passed
@lefou lefou deleted the android-fix-when-main-activity branch April 17, 2026 11:20
@lefou lefou added this to the 1.1.6 milestone Apr 17, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants