Update Android Gradle Plugin 8.2.2 to 8.3.1

android/database/test_helpers/src/main/java/net/twisterrob/inventory/android/content/Constants.java

@@ -6,7 +6,7 @@
 
 import net.twisterrob.inventory.android.data.R;
 
-@VisibleForTesting
+@VisibleForTesting(otherwise = VisibleForTesting.NONE)
 public interface Constants {
 	String TEST_PROPERTY = "Test Property";
 	String TEST_PROPERTY_OTHER = TEST_PROPERTY + " Other";

android/database/test_helpers/src/main/java/net/twisterrob/inventory/android/content/DataBaseActor.java

@@ -26,7 +26,7 @@
 import static net.twisterrob.inventory.android.content.Constants.*;
 import static net.twisterrob.inventory.android.content.DatabaseMatchers.*;
 
-@VisibleForTesting
+@VisibleForTesting(otherwise = VisibleForTesting.NONE)
 @SuppressWarnings({"unused", "TryFinallyCanBeTryWithResources"})
 public class DataBaseActor extends TestDatabaseRule {
 	private final Database appDB;

android/database/test_helpers/src/main/java/net/twisterrob/inventory/android/content/DatabaseMatchers.java

@@ -11,7 +11,7 @@
 import net.twisterrob.android.utils.tools.DatabaseTools;
 import net.twisterrob.inventory.android.database.test_helpers.R;
 
-@VisibleForTesting
+@VisibleForTesting(otherwise = VisibleForTesting.NONE)
 // TODO refactor to merge with DataBaseActor
 public class DatabaseMatchers {
 	public static @NonNull Matcher<? super Database> countImages(final Matcher<? super Long> countMatcher) {

android/database/test_helpers/src/main/java/net/twisterrob/inventory/android/test/TestDatabaseRule.java

@@ -15,7 +15,7 @@
  * It is safe to apply this rule at any time,
  * because it won't open the database until the first query on {@link #testDB}.
  */
-@VisibleForTesting
+@VisibleForTesting(otherwise = VisibleForTesting.NONE)
 public class TestDatabaseRule implements TestRule {
 	protected Database testDB;
 

android/src/androidTest/java/net/twisterrob/inventory/android/test/actors/BackupActivityActor.java

@@ -12,6 +12,7 @@
 import static org.hamcrest.junit.MatcherAssume.*;
 import static org.junit.Assume.assumeTrue;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.Instrumentation.ActivityResult;
 import android.content.Intent;
@@ -324,6 +325,7 @@ public void cancel() {
 			pressBackExternalUnsafe();
 		}
 
+		@SuppressLint("UseSdkSuppress") // REPORT false positive, the calling tests should use SdkSuppress, not utilities.
 		@RequiresApi(api = VERSION_CODES.JELLY_BEAN_MR2)
 		public void choose(int index) throws UiObjectNotFoundException {
 			String listId = UiAutomatorExtensions.androidId(ResourceTools.getIDResourceID(null, "resolver_list"));
@@ -334,6 +336,7 @@ public void choose(int index) throws UiObjectNotFoundException {
 			AndroidAutomator.acceptAnyPermissions();
 		}
 
+		@SuppressLint("UseSdkSuppress") // REPORT false positive, the calling tests should use SdkSuppress, not utilities.
 		@RequiresApi(api = VERSION_CODES.JELLY_BEAN_MR2)
 		public DriveBackupActor chooseDrive() throws UiObjectNotFoundException, NameNotFoundException {
 			DriveBackupActor drive = new DriveBackupActor();
@@ -349,6 +352,7 @@ public void dismiss() {
 		}
 	}
 
+	@SuppressLint("UseSdkSuppress") // REPORT false positive, the calling tests should use SdkSuppress, not utilities.
 	@RequiresApi(api = VERSION_CODES.JELLY_BEAN_MR2)
 	public static class DriveBackupActor {
 		private static final Logger LOG = LoggerFactory.getLogger(DriveBackupActor.class);

android/src/debug/AndroidManifest.xml

@@ -17,13 +17,19 @@
 		<activity
 			android:name="net.twisterrob.inventory.android.test.activity.ScopedStorageSaver"
 			android:label="ScopedStorageSaver"
-			/>
+			tools:ignore="MissingClass"
+			>
+			<!-- lint:MissingClass workaround for https://github.com/TWiStErRob/net.twisterrob.inventory/issues/309 -->
+		</activity>
 
 		<!--suppress AndroidDomInspection workaround for https://github.com/TWiStErRob/net.twisterrob.inventory/issues/309 -->
 		<activity
 			android:name="net.twisterrob.inventory.android.test.activity.CompatibleLauncher"
 			android:label="CompatibleLauncher"
-			/>
+			tools:ignore="MissingClass"
+			>
+			<!-- lint:MissingClass workaround for https://github.com/TWiStErRob/net.twisterrob.inventory/issues/309 -->
+		</activity>
 
 	</application>
 

android/src/main/AndroidManifest.xml

@@ -51,9 +51,12 @@
 			android:name="net.twisterrob.inventory.android.activity.ImageActivity"
 			android:label="@string/image_title"
 			android:exported="false"
-			android:screenOrientation="fullSensor"
+			android:screenOrientation="fullUser"
 			android:theme="@style/Theme.AppTheme.FullScreen"
-			/>
+			tools:ignore="DiscouragedApi"
+			>
+			<!-- lint:DiscouragedApi REPORT false positive, fullUser does not lock fixed orientation. -->
+		</activity>
 		<activity
 			android:name=".activity.data.MoveTargetActivity"
 			android:label="@string/action_move"

gradle/libs.versions.toml

@@ -2,9 +2,9 @@
 java-android-source = "11"
 java-android-target = "11"
 #
-agp = "8.2.2"
+agp = "8.3.1"
 # 23.0.0 + agp
-agp-tools = "31.2.2"
+agp-tools = "31.3.1"
 twisterrob = "0.16" # https://github.com/TWiStErRob/net.twisterrob.gradle/releases
 detekt = "1.23.5"
 kotlin = "1.9.23"

gradle/plugins-inventory/build.gradle.kts

@@ -38,7 +38,7 @@ dependencies {
 	// UpgradeTestTask: FileUtils, StdLogger, ILogger
 	compileOnly(libs.plugin.android.tools.common)
 	// instrumentation.gradle.kts
-	compileOnly("com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.3.0")
+	compileOnly("com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.3.1")
 	compileOnly("com.google.testing.platform:core-proto:0.0.8-alpha08")
 	compileOnly("com.google.protobuf:protobuf-java:3.25.3")
 	// endregion

gradle/plugins-inventory/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/plugins-inventory/src/main/kotlin/net/twisterrob/inventory/build/dsl/android.kt

@@ -14,9 +14,9 @@ import org.gradle.kotlin.dsl.get
  * @see com.android.build.api.dsl.LibraryExtension
  * created by [com.android.build.gradle.internal.plugins.LibraryPlugin.createExtension]
  */
-internal val Project.android: CommonExtension<*, *, *, *, *>
+internal val Project.android: CommonExtension<*, *, *, *, *, *>
 	@Suppress("UNCHECKED_CAST")
-	get() = this.extensions["android"] as CommonExtension<*, *, *, *, *>
+	get() = this.extensions["android"] as CommonExtension<*, *, *, *, *, *>
 
 /**
  * This is useful to emulate the `android` block in a convention plugin
@@ -25,6 +25,6 @@ internal val Project.android: CommonExtension<*, *, *, *, *>
  * @param block the configuration for common Android things.
  * Using an [Action] to take advantage of `kotlin-dsl`.
  */
-internal fun Project.android(block: Action<CommonExtension<*, *, *, *, *>>) {
+internal fun Project.android(block: Action<CommonExtension<*, *, *, *, *, *>>) {
 	block.execute(android)
 }

gradle/plugins-inventory/src/main/kotlin/net/twisterrob/inventory/build/tests/upgrade/UpgradeTestTask.kt

@@ -141,7 +141,7 @@ abstract class UpgradeTestTask : DefaultTask() {
 			testData.instrumentationRunner.get(),
 			device
 		)
-		testData.instrumentationRunnerArguments.forEach(runner::addInstrumentationArg)
+		testData.instrumentationRunnerArguments.get().forEach(runner::addInstrumentationArg)
 		runner.addInstrumentationArg("class", test)
 		//runner.addInstrumentationArg("annotation", "org.junit.Test")
 		runner.addInstrumentationArg("upgrade", "true")

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists