ADFA-2784: add Gradle build tuner

app/src/main/AndroidManifest.xml

@@ -89,11 +89,11 @@
             android:name=".activities.MainActivity"
             android:exported="false"
             android:theme="@style/Theme.AndroidIDE" />
-        <activity
-            android:name=".activities.editor.EditorActivityKt"
-            android:configChanges="orientation|screenSize"
-            android:launchMode="singleTask"
-            android:windowSoftInputMode="adjustResize" />
+        <activity
+            android:name=".activities.editor.EditorActivityKt"
+            android:configChanges="orientation|screenSize"
+            android:launchMode="singleTask"
+            android:windowSoftInputMode="adjustResize" />
         <activity android:name=".activities.PreferencesActivity" />
         <activity android:name=".activities.PluginManagerActivity" />
         <activity android:name=".activities.AboutActivity" />
@@ -222,4 +222,4 @@
                 android:value="true" />
         </service>
     </application>
-</manifest>
+</manifest>

app/src/main/java/com/itsaky/androidide/activities/editor/ProjectHandlerActivity.kt

@@ -65,6 +65,7 @@ import com.itsaky.androidide.services.builder.GradleBuildService
 import com.itsaky.androidide.services.builder.GradleBuildServiceConnnection
 import com.itsaky.androidide.services.builder.gradleDistributionParams
 import com.itsaky.androidide.tooling.api.messages.AndroidInitializationParams
+import com.itsaky.androidide.tooling.api.messages.BuildId
 import com.itsaky.androidide.tooling.api.messages.InitializeProjectParams
 import com.itsaky.androidide.tooling.api.messages.result.InitializeResult
 import com.itsaky.androidide.tooling.api.messages.result.TaskExecutionResult
@@ -93,12 +94,12 @@ import com.itsaky.androidide.viewmodel.BuildVariantsViewModel
 import com.itsaky.androidide.viewmodel.BuildViewModel
 import io.github.rosemoe.sora.text.ICUUtils
 import io.github.rosemoe.sora.util.IntPair
-import org.koin.android.ext.android.inject
 import io.sentry.Sentry
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.adfa.constants.CONTENT_KEY
+import org.koin.android.ext.android.inject
 import java.io.File
 import java.io.FileNotFoundException
 import java.nio.file.NoSuchFileException
@@ -119,9 +120,10 @@ abstract class ProjectHandlerActivity : BaseEditorActivity() {
 	private val buildViewModel by viewModels<BuildViewModel>()
 	protected var initializingFuture: CompletableFuture<out InitializeResult?>? = null
 	private val Throwable?.isFileNotFound: Boolean
-		get() = this is FileNotFoundException ||
-			this is NoSuchFileException ||
-			(this is ErrnoException && this.errno == OsConstants.ENOENT)
+		get() =
+			this is FileNotFoundException ||
+				this is NoSuchFileException ||
+				(this is ErrnoException && this.errno == OsConstants.ENOENT)
 
 	val findInProjectDialog: AlertDialog?
 		get() {
@@ -287,7 +289,12 @@ abstract class ProjectHandlerActivity : BaseEditorActivity() {
 				.onSuccess {
 					showRestartPrompt(this@ProjectHandlerActivity)
 				}.onFailure { error ->
-					flashError(getString(string.msg_plugin_install_failed, error.message ?: "Unknown error"))
+					flashError(
+						getString(
+							string.msg_plugin_install_failed,
+							error.message ?: "Unknown error",
+						),
+					)
 				}
 			setStatus("")
 			buildViewModel.pluginInstallationAttempted()
@@ -318,7 +325,8 @@ abstract class ProjectHandlerActivity : BaseEditorActivity() {
 	override fun onResume() {
 		super.onResume()
 
-		val service = Lookup.getDefault().lookup(BuildService.KEY_BUILD_SERVICE) as? GradleBuildService
+		val service =
+			Lookup.getDefault().lookup(BuildService.KEY_BUILD_SERVICE) as? GradleBuildService
 		editorViewModel.isBuildInProgress = service?.isBuildInProgress == true
 		editorViewModel.isInitializing = initializingFuture?.isDone == false
 
@@ -381,7 +389,7 @@ abstract class ProjectHandlerActivity : BaseEditorActivity() {
 	}
 
 	fun appendBuildOutput(str: String) {
-        if (_binding == null || isDestroyed || isFinishing) return
+		if (_binding == null || isDestroyed || isFinishing) return
 		content.bottomSheet.appendBuildOut(str)
 	}
 
@@ -466,7 +474,10 @@ abstract class ProjectHandlerActivity : BaseEditorActivity() {
 			newSelections.putAll(buildVariantsViewModel.updatedBuildVariants)
 
 			val selectedVariants = newSelections.mapToSelectedVariants()
-			log.debug("Initializing project with new build variant selections: {}", selectedVariants)
+			log.debug(
+				"Initializing project with new build variant selections: {}",
+				selectedVariants,
+			)
 
 			initializeProject(buildVariants = selectedVariants, forceSync = forceSync)
 			return
@@ -501,7 +512,8 @@ abstract class ProjectHandlerActivity : BaseEditorActivity() {
 	/**
 	 * Initialize (sync) the project.
 	 *
-	 * @param buildVariants A map of project paths to the selected build variants.
+	 * @param buildVariants A map of project paths to the selected build
+	 *    variants.
 	 */
 	fun initializeProject(
 		buildVariants: Map<String, String>,
@@ -524,6 +536,7 @@ abstract class ProjectHandlerActivity : BaseEditorActivity() {
 						handleMissingProjectDirectory(projectDir.name)
 						return@launch
 					}
+
 					else -> throw e
 				}
 			}
@@ -532,7 +545,8 @@ abstract class ProjectHandlerActivity : BaseEditorActivity() {
 			preProjectInit()
 		}
 
-		val buildService = Lookup.getDefault().lookup(BuildService.KEY_BUILD_SERVICE)
+		val buildService =
+			Lookup.getDefault().lookup(BuildService.KEY_BUILD_SERVICE) as? GradleBuildService
 		if (buildService == null) {
 			log.error("No build service found. Cannot initialize project.")
 			return@launch
@@ -544,7 +558,16 @@ abstract class ProjectHandlerActivity : BaseEditorActivity() {
 		}
 
 		log.info("Sending init request to tooling server (needs sync: {})...", needsSync)
-		initializingFuture = buildService.initializeProject(params = createProjectInitParams(projectDir, buildVariants, needsSync))
+		initializingFuture =
+			buildService.initializeProject(
+				params =
+					createProjectInitParams(
+						projectDir = projectDir,
+						buildVariants = buildVariants,
+						needsGradleSync = needsSync,
+						buildId = buildService.nextBuildId(),
+					),
+			)
 
 		initializingFuture!!.whenCompleteAsync { result, error ->
 			releaseServerListener()
@@ -568,12 +591,14 @@ abstract class ProjectHandlerActivity : BaseEditorActivity() {
 		projectDir: File,
 		buildVariants: Map<String, String>,
 		needsGradleSync: Boolean,
+		buildId: BuildId,
 	): InitializeProjectParams =
 		InitializeProjectParams(
 			directory = projectDir.absolutePath,
 			gradleDistribution = gradleDistributionParams,
 			androidParams = createAndroidParams(buildVariants),
 			needsGradleSync = needsGradleSync,
+			buildId = buildId,
 		)
 
 	private fun createAndroidParams(buildVariants: Map<String, String>): AndroidInitializationParams {
@@ -856,7 +881,11 @@ abstract class ProjectHandlerActivity : BaseEditorActivity() {
 				view.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS)
 				SearchFieldToolbar(view).show()
 				true
-			} else if (view === binding.input || view === binding.filter || view.parent === binding.input || view.parent === binding.filter) {
+			} else if (view === binding.input ||
+				view === binding.filter ||
+				view.parent === binding.input ||
+				view.parent === binding.filter
+			) {
 				true
 			} else {
 				TooltipManager.showIdeCategoryTooltip(
@@ -887,9 +916,10 @@ abstract class ProjectHandlerActivity : BaseEditorActivity() {
 		val newStart = IntPair.getFirst(range)
 		val newEnd = IntPair.getSecond(range)
 
-		val isValidRange = newStart >= 0 &&
-			newEnd <= content.length &&
-			newStart <= newEnd
+		val isValidRange =
+			newStart >= 0 &&
+				newEnd <= content.length &&
+				newStart <= newEnd
 
 		if (isValidRange && newStart != newEnd) {
 			setSelection(newStart, newEnd)