Fix BasicUITest, raise targetSdk and update dependencies (QuantumBadger#1194)

* Fix BasicUITest

* Update Gradle to 8.7

* Update AGP to 8.4.1

* Update Kotlin to 2.0

* Update other dependencies

* Raise compileSdk and targetSdk to 34

Author: equeim

build.gradle.kts

@@ -56,9 +56,11 @@ dependencies {
 
 	testImplementation(libs.junit)
 
+	androidTestImplementation(libs.androidx.test.core)
 	androidTestImplementation(libs.androidx.test.espresso.core)
 	androidTestImplementation(libs.androidx.test.espresso.contrib)
 	androidTestImplementation(libs.androidx.test.rules)
+	androidTestImplementation(libs.androidx.test.junit)
 }
 
 android {
@@ -83,11 +85,11 @@ android {
 		additionalParameters.add("--no-version-vectors")
 	}
 
-	buildTypes.forEach {
-		it.isMinifyEnabled = true
-		it.isShrinkResources = false
+	buildTypes.configureEach {
+		isMinifyEnabled = true
+		isShrinkResources = false
 
-		it.proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+		proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
 	}
 
 	compileOptions {

gradle/libs.versions.toml

@@ -1,17 +1,17 @@
 [versions]
-agp = "8.2.2"
-kotlin = "1.9.22"
+agp = "8.4.1"
+kotlin = "2.0.0"
 java = "1.8"
 
-sdk-compile = "33"
+sdk-compile = "34"
 sdk-min = "16"
-sdk-target = "33"
+sdk-target = "34"
 ndk = "23.1.7779620"
 
-androidx-annotation = "1.7.1"
+androidx-annotation = "1.8.0"
 androidx-appcompat = "1.6.1"
 androidx-constraintlayout = "2.1.4"
-androidx-core = "1.9.0"
+androidx-core = "1.12.0"
 androidx-fragment = "1.6.2"
 androidx-multidex = "2.0.1"
 androidx-preference = "1.2.1"
@@ -20,22 +20,24 @@ androidx-swiperefreshlayout = "1.1.0"
 
 checkstyle = "10.12.5"
 commons-lang = "3.14.0"
-commons-text = "1.11.0"
+commons-text = "1.12.0"
 exoplayer = "2.19.0"
 google-flexbox = "3.0.0"
 google-material = "1.9.0"
 jackson = "2.16.1"
 jdk-desugar = "2.0.4"
-kotlinx-datetime = "0.5.0"
+kotlinx-datetime = "0.6.0"
 kotlinx-serialization = "1.6.3"
 netcipher = "2.1.0"
 okhttp = "3.12.13"
 pmd = "6.55.0"
 zstd = "1.5.5-11"
 
 junit = "4.13.2"
+androidx-test-core = "1.5.0"
 androidx-test-espresso = "3.5.1"
 androidx-test-rules = "1.5.0"
+androidx-test-junit = "1.1.5"
 
 [libraries]
 androidx-annotation = { module = "androidx.annotation:annotation", version.ref = "androidx-annotation" }
@@ -65,9 +67,11 @@ okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
 zstd = { module = "com.github.luben:zstd-jni", version.ref = "zstd" }
 
 junit = { module = "junit:junit", version.ref = "junit" }
+androidx-test-core = { module = "androidx.test:core", version.ref = "androidx-test-core" }
 androidx-test-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "androidx-test-espresso" }
 androidx-test-espresso-contrib = { module = "androidx.test.espresso:espresso-contrib", version.ref = "androidx-test-espresso" }
 androidx-test-rules = { module = "androidx.test:rules", version.ref = "androidx-test-rules" }
+androidx-test-junit = { module = "androidx.test.ext:junit", version.ref = "androidx-test-junit" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

libs/redreader-common/build.gradle.kts

@@ -1,3 +1,4 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 
 buildscript {
@@ -21,7 +22,7 @@ java {
 }
 
 tasks.withType(KotlinJvmCompile::class) {
-    kotlinOptions.jvmTarget = libs.versions.java.get()
+    compilerOptions.jvmTarget.set(JvmTarget.fromTarget(libs.versions.java.get()))
 }
 
 dependencies {

libs/redreader-datamodel/build.gradle.kts

@@ -1,3 +1,4 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 
 plugins {
@@ -13,7 +14,7 @@ java {
 }
 
 tasks.withType(KotlinJvmCompile::class) {
-    kotlinOptions.jvmTarget = libs.versions.java.get()
+	compilerOptions.jvmTarget.set(JvmTarget.fromTarget(libs.versions.java.get()))
 }
 
 dependencies {

proguard-rules.pro

@@ -25,3 +25,6 @@
 -keepnames class <1>$$serializer { # -keepnames suffices; class is kept when serializer() is kept.
     static <1>$$serializer INSTANCE;
 }
+
+# Needed for instrumented tests for some reason
+-keep class com.google.common.util.concurrent.ListenableFuture { *; }

src/androidTest/java/org/quantumbadger/redreader/activities/BasicUITest.java

@@ -21,9 +21,11 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewParent;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
+
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
 import org.hamcrest.TypeSafeMatcher;
@@ -59,24 +61,21 @@ public void basicUITest() {
 				.perform(click());
 
 		onView(allOf(
-				withId(R.id.title),
+				withId(androidx.appcompat.R.id.title),
 				withText("Settings"),
 				childAtPosition(
 						childAtPosition(
-								withId(R.id.content),
+								withId(androidx.appcompat.R.id.content),
 								0),
 						0),
 				isDisplayed()))
 				.perform(click());
 
 		onView(allOf(
-				withContentDescription("Navigate up"),
+				withContentDescription("Back"),
 				childAtPosition(
-						allOf(withId(R.id.action_bar),
-								childAtPosition(
-										withId(R.id.action_bar_container),
-										0)),
-						1),
+						withId(R.id.rr_actionbar_toolbar),
+						0),
 				isDisplayed()))
 				.perform(click());
 

src/androidTest/java/org/quantumbadger/redreader/activities/UITestUtils.java

@@ -1,17 +1,20 @@
 package org.quantumbadger.redreader.activities;
 
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.matcher.ViewMatchers.withText;
+import static org.hamcrest.Matchers.allOf;
+
 import android.view.View;
+
 import androidx.test.espresso.NoMatchingViewException;
 import androidx.test.espresso.UiController;
 import androidx.test.espresso.ViewAction;
+
 import org.hamcrest.Matcher;
 import org.hamcrest.core.IsAnything;
-
-import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.action.ViewActions.click;
-import static androidx.test.espresso.matcher.ViewMatchers.withId;
-import static androidx.test.espresso.matcher.ViewMatchers.withText;
-import static org.hamcrest.Matchers.allOf;
+import org.quantumbadger.redreader.R;
 
 public class UITestUtils {
 
@@ -21,15 +24,18 @@ public static void handleFirstRunDialog() {
 
 		try {
 			onView(allOf(
-					withId(android.R.id.button1),
-					withText("Log in now")))
+					withId(R.id.terms_button_decline)))
 					.perform(click());
-
 		} catch(final NoMatchingViewException e) {
 			// Ignore, the first run dialog has already been shown
 			return;
 		}
 
+		onView(allOf(
+				withId(android.R.id.button1),
+				withText("Log in now")))
+				.perform(click());
+
 		onView(allOf(
 				withId(android.R.id.button3),
 				withText("Close")))