Merge pull request #2082 from liutikas/spotless

Upgrade to spotless 8.3.0

build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt

@@ -21,16 +21,12 @@ import com.google.samples.apps.nowinandroid.configureGradleManagedDevices
 import com.google.samples.apps.nowinandroid.configureKotlinAndroid
 import com.google.samples.apps.nowinandroid.configurePrintApksTask
 import com.google.samples.apps.nowinandroid.configureSpotlessForAndroid
-import com.google.samples.apps.nowinandroid.isIsolatedProjectsEnabled
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.api.configuration.BuildFeatures
 import org.gradle.kotlin.dsl.apply
 import org.gradle.kotlin.dsl.configure
-import javax.inject.Inject
 
 abstract class AndroidApplicationConventionPlugin : Plugin<Project> {
-    @get:Inject abstract val buildFeatures: BuildFeatures
     override fun apply(target: Project) {
         with(target) {
             apply(plugin = "com.android.application")
@@ -47,9 +43,7 @@ abstract class AndroidApplicationConventionPlugin : Plugin<Project> {
                 configurePrintApksTask(this)
                 configureBadgingTasks(this)
             }
-            if (!buildFeatures.isIsolatedProjectsEnabled()) {
+            configureSpotlessForAndroid()
-                configureSpotlessForAndroid()
-            }
         }
     }
 }

build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt

@@ -22,18 +22,14 @@ import com.google.samples.apps.nowinandroid.configureKotlinAndroid
 import com.google.samples.apps.nowinandroid.configurePrintApksTask
 import com.google.samples.apps.nowinandroid.configureSpotlessForAndroid
 import com.google.samples.apps.nowinandroid.disableUnnecessaryAndroidTests
-import com.google.samples.apps.nowinandroid.isIsolatedProjectsEnabled
 import com.google.samples.apps.nowinandroid.libs
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.api.configuration.BuildFeatures
 import org.gradle.kotlin.dsl.apply
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.dependencies
-import javax.inject.Inject
 
 abstract class AndroidLibraryConventionPlugin : Plugin<Project> {
-    @get:Inject abstract val buildFeatures: BuildFeatures
     override fun apply(target: Project) {
         with(target) {
             apply(plugin = "com.android.library")
@@ -57,9 +53,7 @@ abstract class AndroidLibraryConventionPlugin : Plugin<Project> {
                 configurePrintApksTask(this)
                 disableUnnecessaryAndroidTests(target)
             }
-            if (!buildFeatures.isIsolatedProjectsEnabled()) {
+            configureSpotlessForAndroid()
-                configureSpotlessForAndroid()
-            }
             dependencies {
                 "androidTestImplementation"(libs.findLibrary("kotlin.test").get())
                 "testImplementation"(libs.findLibrary("kotlin.test").get())

build-logic/convention/src/main/kotlin/JvmLibraryConventionPlugin.kt

@@ -16,26 +16,20 @@
 
 import com.google.samples.apps.nowinandroid.configureKotlinJvm
 import com.google.samples.apps.nowinandroid.configureSpotlessForJvm
-import com.google.samples.apps.nowinandroid.isIsolatedProjectsEnabled
 import com.google.samples.apps.nowinandroid.libs
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.api.configuration.BuildFeatures
 import org.gradle.kotlin.dsl.apply
 import org.gradle.kotlin.dsl.dependencies
-import javax.inject.Inject
 
 abstract class JvmLibraryConventionPlugin : Plugin<Project> {
-    @get:Inject abstract val buildFeatures: BuildFeatures
     override fun apply(target: Project) {
         with(target) {
             apply(plugin = "org.jetbrains.kotlin.jvm")
             apply(plugin = "nowinandroid.android.lint")
 
             configureKotlinJvm()
-            if (!buildFeatures.isIsolatedProjectsEnabled()) {
+            configureSpotlessForJvm()
-                configureSpotlessForJvm()
-            }
             dependencies {
                 "testImplementation"(libs.findLibrary("kotlin.test").get())
             }

build-logic/convention/src/main/kotlin/RootPlugin.kt

@@ -16,7 +16,6 @@
 
 import com.google.samples.apps.nowinandroid.configureGraphTasks
 import com.google.samples.apps.nowinandroid.configureSpotlessForRootProject
-import com.google.samples.apps.nowinandroid.isIsolatedProjectsEnabled
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.configuration.BuildFeatures
@@ -29,7 +28,11 @@ abstract class RootPlugin : Plugin<Project> {
         require(target.path == ":")
         if (!buildFeatures.isIsolatedProjectsEnabled()) {
             target.subprojects { configureGraphTasks() }
-            target.configureSpotlessForRootProject()
         }
+        target.configureSpotlessForRootProject()
     }
 }
+
+private fun BuildFeatures.isIsolatedProjectsEnabled(): Boolean {
+    return isolatedProjects.active.getOrElse(false)
+}

build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/ProjectIsolation.kt

@@ -1,23 +0,0 @@
-/*
- * Copyright 2026 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.samples.apps.nowinandroid
-
-import org.gradle.api.configuration.BuildFeatures
-
-fun BuildFeatures.isIsolatedProjectsEnabled(): Boolean {
-    return isolatedProjects.active.orElse(false).get()
-}

gradle/libs.versions.toml

@@ -60,7 +60,7 @@ retrofitKotlinxSerializationJson = "1.0.0"
 robolectric = "4.16"
 roborazzi = "1.56.0"
 room = "2.8.3"
-spotless = "8.2.1"
+spotless = "8.3.0"
 truth = "1.4.4"
 turbine = "1.2.0"
 uiTestJunit4 = "1.9.0-rc01"