Merge pull request #45 from wealthfront/api-35

Update samples, libraries for Edge-to-Edge

Author: cmathew

.github/workflows/runTests.yml

@@ -20,13 +20,14 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout sources
+        uses: actions/checkout@v4
       - name: Set up our JDK environment
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17.0.10'
+          java-version: '17.0.14'
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@v4
       - name: Build with Gradle
-        uses: gradle/actions/setup-gradle@v3
-        with:
-          arguments: testDebugUnitTest
+        run: ./gradlew testDebugUnitTest

gradle.properties

@@ -22,6 +22,7 @@ kotlin.code.style=official
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
 android.enableJetifier=false
+android.injected.androidTest.leaveApksInstalledAfterRun=true
 
 GROUP=com.wealthfront
 VERSION_NAME=2.1.2-SNAPSHOT

gradle/android-module.gradle

@@ -1,5 +1,5 @@
 android {
-  compileSdkVersion 34
+  compileSdkVersion 35
 
   defaultConfig {
     minSdkVersion 26

gradle/libs.versions.toml

@@ -1,21 +1,23 @@
 [versions]
-recyclerview = "1.3.2"
+recyclerview = "1.4.0"
 appcompat = "1.7.0"
+androidx-activity-ktx = "1.9.1"
 screenshotty = "1.0.4"
-robolectric = "4.13"
+robolectric = "4.14.1"
 test-core = "1.6.1"
 test-rules = "1.6.1"
 test-ext = "1.2.1"
 junit = "4.13.2"
-truth = "1.0"
+truth = "1.4.0"
 espresso = "3.6.1"
-agp = "8.5.1"
-kotlin = "2.0.0"
-compose-bom = "2023.09.02"
+agp = "8.9.0"
+kotlin = "2.0.21"
+compose-bom = "2025.03.00"
 
 [libraries]
 recyclerview = { group = "androidx.recyclerview", name = "recyclerview", version.ref = "recyclerview" }
 appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
+androidx-activity-ktx = { group = "androidx.activity", name = "activity-ktx", version.ref = "androidx-activity-ktx" }
 screenshotty = { group = "eu.bolt", name = "screenshotty", version.ref = "screenshotty" }
 junit = { group = "junit", name = "junit", version.ref = "junit" }
 truth = { group = "com.google.truth", name = "truth", version.ref = "truth" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Wed Jan 10 11:07:40 PST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

screencaptor-sample-tests/build.gradle.kts

@@ -4,16 +4,16 @@ plugins {
   alias(libs.plugins.compose.compiler)
 }
 
+apply(from = "../gradle/android-module.gradle")
+
 android {
   namespace = "com.wealthfront.screencaptor.sample.test"
-  compileSdk = 34
 
   testOptions {
     animationsDisabled = true
   }
 
   defaultConfig {
-    minSdk = 26
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   }
 

screencaptor-sample-tests/src/main/java/com/wealthfront/screencaptor/sample/ScreenshotComposeTest.kt

@@ -61,7 +61,7 @@ class ScreenshotComposeTest {
       screenshotDirectory = screenShotDirectory
     )
 
-    compareScreenshots("compose", TestRes.raw.compose_pixel7_api33)
+    compareScreenshots("compose", TestRes.raw.compose_pixel7_api35)
   }
 
   @Test
@@ -81,7 +81,7 @@ class ScreenshotComposeTest {
       screenshotDirectory = screenShotDirectory
     )
 
-    compareScreenshots("compose_dialogs", TestRes.raw.compose_dialogs_pixel7_api33)
+    compareScreenshots("compose_dialogs", TestRes.raw.compose_dialogs_pixel7_api35)
   }