diff --git a/.github/workflows/runTests.yml b/.github/workflows/runTests.yml index 4a9767d..656b601 100644 --- a/.github/workflows/runTests.yml +++ b/.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 \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index f4d5fd5..a306d3c 100644 --- a/gradle.properties +++ b/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 diff --git a/gradle/android-module.gradle b/gradle/android-module.gradle index 48f15f3..38f1f59 100644 --- a/gradle/android-module.gradle +++ b/gradle/android-module.gradle @@ -1,5 +1,5 @@ android { - compileSdkVersion 34 + compileSdkVersion 35 defaultConfig { minSdkVersion 26 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 13048c6..bfe8b9d 100644 --- a/gradle/libs.versions.toml +++ b/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" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7cd3258..1511966 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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 diff --git a/screencaptor-sample-tests/build.gradle.kts b/screencaptor-sample-tests/build.gradle.kts index 9557e92..67d9e2c 100644 --- a/screencaptor-sample-tests/build.gradle.kts +++ b/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" } diff --git a/screencaptor-sample-tests/src/main/java/com/wealthfront/screencaptor/sample/ScreenshotComposeTest.kt b/screencaptor-sample-tests/src/main/java/com/wealthfront/screencaptor/sample/ScreenshotComposeTest.kt index 928765a..475982c 100644 --- a/screencaptor-sample-tests/src/main/java/com/wealthfront/screencaptor/sample/ScreenshotComposeTest.kt +++ b/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) } diff --git a/screencaptor-sample-tests/src/main/res/raw/compose_dialogs_pixel7_api33.png b/screencaptor-sample-tests/src/main/res/raw/compose_dialogs_pixel7_api33.png deleted file mode 100644 index fe5e686..0000000 Binary files a/screencaptor-sample-tests/src/main/res/raw/compose_dialogs_pixel7_api33.png and /dev/null differ diff --git a/screencaptor-sample-tests/src/main/res/raw/compose_dialogs_pixel7_api35.png b/screencaptor-sample-tests/src/main/res/raw/compose_dialogs_pixel7_api35.png new file mode 100644 index 0000000..821f0bf Binary files /dev/null and b/screencaptor-sample-tests/src/main/res/raw/compose_dialogs_pixel7_api35.png differ diff --git a/screencaptor-sample-tests/src/main/res/raw/compose_pixel7_api33.png b/screencaptor-sample-tests/src/main/res/raw/compose_pixel7_api33.png deleted file mode 100644 index 378a62a..0000000 Binary files a/screencaptor-sample-tests/src/main/res/raw/compose_pixel7_api33.png and /dev/null differ diff --git a/screencaptor-sample-tests/src/main/res/raw/compose_pixel7_api35.png b/screencaptor-sample-tests/src/main/res/raw/compose_pixel7_api35.png new file mode 100644 index 0000000..8a81d16 Binary files /dev/null and b/screencaptor-sample-tests/src/main/res/raw/compose_pixel7_api35.png differ diff --git a/screencaptor-sample-tests/src/main/res/raw/screenshot_change_image_pixel7.png b/screencaptor-sample-tests/src/main/res/raw/screenshot_change_image_pixel7.png index 275785f..4438986 100644 Binary files a/screencaptor-sample-tests/src/main/res/raw/screenshot_change_image_pixel7.png and b/screencaptor-sample-tests/src/main/res/raw/screenshot_change_image_pixel7.png differ diff --git a/screencaptor-sample-tests/src/main/res/raw/screenshot_change_text_pixel7.png b/screencaptor-sample-tests/src/main/res/raw/screenshot_change_text_pixel7.png index a7dd4e9..ca0906a 100644 Binary files a/screencaptor-sample-tests/src/main/res/raw/screenshot_change_text_pixel7.png and b/screencaptor-sample-tests/src/main/res/raw/screenshot_change_text_pixel7.png differ diff --git a/screencaptor-sample-tests/src/main/res/raw/screenshot_dialog_pixel7.png b/screencaptor-sample-tests/src/main/res/raw/screenshot_dialog_pixel7.png index 7fea1f6..00b0a9e 100644 Binary files a/screencaptor-sample-tests/src/main/res/raw/screenshot_dialog_pixel7.png and b/screencaptor-sample-tests/src/main/res/raw/screenshot_dialog_pixel7.png differ diff --git a/screencaptor-sample-tests/src/main/res/raw/screenshot_no_logo_pixel7.png b/screencaptor-sample-tests/src/main/res/raw/screenshot_no_logo_pixel7.png index 0e9c149..5cc4b56 100644 Binary files a/screencaptor-sample-tests/src/main/res/raw/screenshot_no_logo_pixel7.png and b/screencaptor-sample-tests/src/main/res/raw/screenshot_no_logo_pixel7.png differ diff --git a/screencaptor-sample-tests/src/main/res/raw/screenshot_recyclerview_pixel7.png b/screencaptor-sample-tests/src/main/res/raw/screenshot_recyclerview_pixel7.png index a7ab4cd..996df3a 100644 Binary files a/screencaptor-sample-tests/src/main/res/raw/screenshot_recyclerview_pixel7.png and b/screencaptor-sample-tests/src/main/res/raw/screenshot_recyclerview_pixel7.png differ diff --git a/screencaptor-sample/build.gradle.kts b/screencaptor-sample/build.gradle.kts index 38ccba4..b81b2b6 100644 --- a/screencaptor-sample/build.gradle.kts +++ b/screencaptor-sample/build.gradle.kts @@ -20,8 +20,9 @@ android { dependencies { implementation(project(":screencaptor")) - implementation(libs.recyclerview) implementation(libs.appcompat) + implementation(libs.recyclerview) + implementation(libs.androidx.activity.ktx) testImplementation(project(":internal-test-support")) implementation(platform(libs.compose.bom)) diff --git a/screencaptor-sample/src/main/java/com/wealthfront/screencaptor/sample/SampleActivity.kt b/screencaptor-sample/src/main/java/com/wealthfront/screencaptor/sample/SampleActivity.kt index a5590ea..41f5d26 100644 --- a/screencaptor-sample/src/main/java/com/wealthfront/screencaptor/sample/SampleActivity.kt +++ b/screencaptor-sample/src/main/java/com/wealthfront/screencaptor/sample/SampleActivity.kt @@ -3,6 +3,7 @@ package com.wealthfront.screencaptor.sample import android.app.AlertDialog import android.os.Bundle import android.widget.Button +import androidx.activity.enableEdgeToEdge import androidx.appcompat.app.AppCompatActivity import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.LinearLayoutManager @@ -12,6 +13,8 @@ class SampleActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + enableEdgeToEdge() + setContentView(R.layout.screenshot_test) findViewById