From 7423fdec0faa6849f397c5ed20a87d5e93bd718f Mon Sep 17 00:00:00 2001 From: Kevin Block Date: Wed, 26 Feb 2025 09:04:47 -0500 Subject: [PATCH 01/14] Bump overscroll dependency --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 0a37e890..c3bf82ee 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -103,7 +103,7 @@ dependencies { implementation 'io.reactivex.rxjava2:rxandroid:2.1.1' implementation 'com.jakewharton.rx2:replaying-share-kotlin:2.2.0' - implementation 'me.everything:overscroll-decor-android:1.1.0' + implementation 'io.github.everythingme:overscroll-decor-android:1.1.1' implementation 'com.andkulikov:transitionseverywhere:2.1.0' implementation 'com.opencsv:opencsv:5.4' From d85ba1f47568c261da05673ddaeb9bef8a4fcb9f Mon Sep 17 00:00:00 2001 From: Kevin Block Date: Wed, 26 Feb 2025 09:06:40 -0500 Subject: [PATCH 02/14] Add .gitignore --- .gitignore | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..347e252e --- /dev/null +++ b/.gitignore @@ -0,0 +1,33 @@ +# Gradle files +.gradle/ +build/ + +# Local configuration file (sdk path, etc) +local.properties + +# Log/OS Files +*.log + +# Android Studio generated files and folders +captures/ +.externalNativeBuild/ +.cxx/ +*.apk +output.json + +# IntelliJ +*.iml +.idea/ +misc.xml +deploymentTargetDropDown.xml +render.experimental.xml + +# Keystore files +*.jks +*.keystore + +# Google Services (e.g. APIs or Firebase) +google-services.json + +# Android Profiling +*.hprof From 56f5a7a53f4c9a4f8f34a270cbd16295d362e68d Mon Sep 17 00:00:00 2001 From: Kevin Block Date: Wed, 26 Feb 2025 09:25:19 -0500 Subject: [PATCH 03/14] Bump workflow --- .github/workflows/core_tests.yml | 9 +++++---- .github/workflows/navigation_tests.yml | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/core_tests.yml b/.github/workflows/core_tests.yml index 7883acdf..3fa44b03 100644 --- a/.github/workflows/core_tests.yml +++ b/.github/workflows/core_tests.yml @@ -13,11 +13,12 @@ jobs: steps: - name: checkout - uses: actions/checkout@v2 - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 + uses: actions/checkout@v4 + - name: Set up JDK 11 + uses: actions/setup-java@v4 with: - java-version: 1.8 + distribution: 'jetbrains' + java-version: '11' - name: Navigation test uses: ReactiveCircus/android-emulator-runner@v2.14.3 with: diff --git a/.github/workflows/navigation_tests.yml b/.github/workflows/navigation_tests.yml index 49cde426..43138a01 100644 --- a/.github/workflows/navigation_tests.yml +++ b/.github/workflows/navigation_tests.yml @@ -13,11 +13,12 @@ jobs: steps: - name: checkout - uses: actions/checkout@v2 - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 + uses: actions/checkout@v4 + - name: Set up JDK 11 + uses: actions/setup-java@v4 with: - java-version: 1.8 + distribution: 'jetbrains' + java-version: '11' - name: Navigation test uses: ReactiveCircus/android-emulator-runner@v2.14.3 with: From 17aec58071faaa479f6037a4f049b524c94622c3 Mon Sep 17 00:00:00 2001 From: Kevin Block Date: Wed, 26 Feb 2025 09:38:02 -0500 Subject: [PATCH 04/14] Try adding github token for authenticated pulls --- .github/workflows/core_tests.yml | 3 ++- .github/workflows/navigation_tests.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/core_tests.yml b/.github/workflows/core_tests.yml index 3fa44b03..554d3891 100644 --- a/.github/workflows/core_tests.yml +++ b/.github/workflows/core_tests.yml @@ -10,7 +10,8 @@ jobs: test: runs-on: macos-latest - + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - name: checkout uses: actions/checkout@v4 diff --git a/.github/workflows/navigation_tests.yml b/.github/workflows/navigation_tests.yml index 43138a01..5730f9d8 100644 --- a/.github/workflows/navigation_tests.yml +++ b/.github/workflows/navigation_tests.yml @@ -10,7 +10,8 @@ jobs: test: runs-on: macos-latest - + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - name: checkout uses: actions/checkout@v4 From 0cb1504a2e82048aad625dab362152939b90545c Mon Sep 17 00:00:00 2001 From: Kevin Block Date: Wed, 26 Feb 2025 09:48:05 -0500 Subject: [PATCH 05/14] Try java 17 --- .github/workflows/core_tests.yml | 2 +- .github/workflows/navigation_tests.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/core_tests.yml b/.github/workflows/core_tests.yml index 554d3891..1db01508 100644 --- a/.github/workflows/core_tests.yml +++ b/.github/workflows/core_tests.yml @@ -19,7 +19,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: 'jetbrains' - java-version: '11' + java-version: '17' - name: Navigation test uses: ReactiveCircus/android-emulator-runner@v2.14.3 with: diff --git a/.github/workflows/navigation_tests.yml b/.github/workflows/navigation_tests.yml index 5730f9d8..c0290fd0 100644 --- a/.github/workflows/navigation_tests.yml +++ b/.github/workflows/navigation_tests.yml @@ -19,7 +19,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: 'jetbrains' - java-version: '11' + java-version: '17' - name: Navigation test uses: ReactiveCircus/android-emulator-runner@v2.14.3 with: From 66c21af78556f1fb76e58b7d7a4f94e1c5b1f548 Mon Sep 17 00:00:00 2001 From: Kevin Block Date: Wed, 26 Feb 2025 09:52:01 -0500 Subject: [PATCH 06/14] Change arch --- .github/workflows/core_tests.yml | 3 ++- .github/workflows/navigation_tests.yml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/core_tests.yml b/.github/workflows/core_tests.yml index 1db01508..4976729d 100644 --- a/.github/workflows/core_tests.yml +++ b/.github/workflows/core_tests.yml @@ -25,4 +25,5 @@ jobs: with: api-level: 21 profile: pixel - script: ./gradlew :core:connectedCheck --stacktrace \ No newline at end of file + arch: arm64-v8a + script: ./gradlew:core:connectedCheck --stacktrace \ No newline at end of file diff --git a/.github/workflows/navigation_tests.yml b/.github/workflows/navigation_tests.yml index c0290fd0..0884de3a 100644 --- a/.github/workflows/navigation_tests.yml +++ b/.github/workflows/navigation_tests.yml @@ -25,4 +25,5 @@ jobs: with: api-level: 21 profile: pixel + arch: arm64-v8a script: ./gradlew :navigation:connectedCheck --stacktrace \ No newline at end of file From 65b1ac01262ea85a2ff182723e9568fda350eaa5 Mon Sep 17 00:00:00 2001 From: Kevin Block Date: Wed, 26 Feb 2025 09:54:45 -0500 Subject: [PATCH 07/14] Bump emulator runner to support arm --- .github/workflows/core_tests.yml | 2 +- .github/workflows/navigation_tests.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/core_tests.yml b/.github/workflows/core_tests.yml index 4976729d..e5f5cd90 100644 --- a/.github/workflows/core_tests.yml +++ b/.github/workflows/core_tests.yml @@ -21,7 +21,7 @@ jobs: distribution: 'jetbrains' java-version: '17' - name: Navigation test - uses: ReactiveCircus/android-emulator-runner@v2.14.3 + uses: ReactiveCircus/android-emulator-runner@v2.21.0 with: api-level: 21 profile: pixel diff --git a/.github/workflows/navigation_tests.yml b/.github/workflows/navigation_tests.yml index 0884de3a..a19beb14 100644 --- a/.github/workflows/navigation_tests.yml +++ b/.github/workflows/navigation_tests.yml @@ -21,7 +21,7 @@ jobs: distribution: 'jetbrains' java-version: '17' - name: Navigation test - uses: ReactiveCircus/android-emulator-runner@v2.14.3 + uses: ReactiveCircus/android-emulator-runner@v2.21.0 with: api-level: 21 profile: pixel From c8eada92794d5d836df69794dd4fbd63ed116a53 Mon Sep 17 00:00:00 2001 From: Kevin Block Date: Wed, 26 Feb 2025 10:01:16 -0500 Subject: [PATCH 08/14] Try using ubuntu --- .github/workflows/core_tests.yml | 3 +-- .github/workflows/navigation_tests.yml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/core_tests.yml b/.github/workflows/core_tests.yml index e5f5cd90..7493ea83 100644 --- a/.github/workflows/core_tests.yml +++ b/.github/workflows/core_tests.yml @@ -9,7 +9,7 @@ on: jobs: test: - runs-on: macos-latest + runs-on: ubuntu-latest env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: @@ -25,5 +25,4 @@ jobs: with: api-level: 21 profile: pixel - arch: arm64-v8a script: ./gradlew:core:connectedCheck --stacktrace \ No newline at end of file diff --git a/.github/workflows/navigation_tests.yml b/.github/workflows/navigation_tests.yml index a19beb14..fb83752a 100644 --- a/.github/workflows/navigation_tests.yml +++ b/.github/workflows/navigation_tests.yml @@ -9,7 +9,7 @@ on: jobs: test: - runs-on: macos-latest + runs-on: ubuntu-latest env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: @@ -25,5 +25,4 @@ jobs: with: api-level: 21 profile: pixel - arch: arm64-v8a script: ./gradlew :navigation:connectedCheck --stacktrace \ No newline at end of file From 63769d025071484f279627beccc8fef640aa6ccf Mon Sep 17 00:00:00 2001 From: Kevin Block Date: Wed, 26 Feb 2025 10:09:16 -0500 Subject: [PATCH 09/14] Try enabling kvm --- .github/workflows/core_tests.yml | 7 ++++++- .github/workflows/navigation_tests.yml | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/core_tests.yml b/.github/workflows/core_tests.yml index 7493ea83..103b6fb5 100644 --- a/.github/workflows/core_tests.yml +++ b/.github/workflows/core_tests.yml @@ -20,8 +20,13 @@ jobs: with: distribution: 'jetbrains' java-version: '17' + - name: Enable KVM + run: | + echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules + sudo udevadm control --reload-rules + sudo udevadm trigger --name-match=kvm - name: Navigation test - uses: ReactiveCircus/android-emulator-runner@v2.21.0 + uses: reactivecircus/android-emulator-runner@v2 with: api-level: 21 profile: pixel diff --git a/.github/workflows/navigation_tests.yml b/.github/workflows/navigation_tests.yml index fb83752a..eca90cc3 100644 --- a/.github/workflows/navigation_tests.yml +++ b/.github/workflows/navigation_tests.yml @@ -20,8 +20,13 @@ jobs: with: distribution: 'jetbrains' java-version: '17' + - name: Enable KVM + run: | + echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules + sudo udevadm control --reload-rules + sudo udevadm trigger --name-match=kvm - name: Navigation test - uses: ReactiveCircus/android-emulator-runner@v2.21.0 + uses: ReactiveCircus/android-emulator-runner@v2 with: api-level: 21 profile: pixel From 06a73cb07ced310ee543d0e619946f3d151f2769 Mon Sep 17 00:00:00 2001 From: Kevin Block Date: Wed, 26 Feb 2025 10:15:56 -0500 Subject: [PATCH 10/14] Try swapping to java 11 right before running tests --- .github/workflows/core_tests.yml | 19 +++++++++++++++---- .github/workflows/navigation_tests.yml | 18 +++++++++++++++--- 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/.github/workflows/core_tests.yml b/.github/workflows/core_tests.yml index 103b6fb5..3fb409b9 100644 --- a/.github/workflows/core_tests.yml +++ b/.github/workflows/core_tests.yml @@ -15,19 +15,30 @@ jobs: steps: - name: checkout uses: actions/checkout@v4 - - name: Set up JDK 11 + + - name: Set up JDK 17 uses: actions/setup-java@v4 with: distribution: 'jetbrains' java-version: '17' + - name: Enable KVM run: | echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules sudo udevadm control --reload-rules sudo udevadm trigger --name-match=kvm - - name: Navigation test - uses: reactivecircus/android-emulator-runner@v2 + + - name: Setup emulator + uses: ReactiveCircus/android-emulator-runner@v2 with: api-level: 21 profile: pixel - script: ./gradlew:core:connectedCheck --stacktrace \ No newline at end of file + + - name: Set up JDK 11 + uses: actions/setup-java@v4 + with: + distribution: 'jetbrains' + java-version: '11' + + - name: Run Core Tests + run: ./gradlew:core:connectedCheck --stacktrace \ No newline at end of file diff --git a/.github/workflows/navigation_tests.yml b/.github/workflows/navigation_tests.yml index eca90cc3..9f0f7915 100644 --- a/.github/workflows/navigation_tests.yml +++ b/.github/workflows/navigation_tests.yml @@ -15,19 +15,31 @@ jobs: steps: - name: checkout uses: actions/checkout@v4 - - name: Set up JDK 11 + + - name: Set up JDK 17 uses: actions/setup-java@v4 with: distribution: 'jetbrains' java-version: '17' + - name: Enable KVM run: | echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules sudo udevadm control --reload-rules sudo udevadm trigger --name-match=kvm - - name: Navigation test + + - name: Setup emulator uses: ReactiveCircus/android-emulator-runner@v2 with: api-level: 21 profile: pixel - script: ./gradlew :navigation:connectedCheck --stacktrace \ No newline at end of file + + - name: Set up JDK 11 + uses: actions/setup-java@v4 + with: + distribution: 'jetbrains' + java-version: '11' + + - name: Run Navigation Tests + run: ./gradlew :navigation:connectedCheck --stacktrace + From c03bd481f1dea2d587c46398113b1c60d5f7e3e1 Mon Sep 17 00:00:00 2001 From: Kevin Block Date: Wed, 26 Feb 2025 10:18:43 -0500 Subject: [PATCH 11/14] Add echo script --- .github/workflows/core_tests.yml | 1 + .github/workflows/navigation_tests.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/core_tests.yml b/.github/workflows/core_tests.yml index 3fb409b9..dabc250e 100644 --- a/.github/workflows/core_tests.yml +++ b/.github/workflows/core_tests.yml @@ -33,6 +33,7 @@ jobs: with: api-level: 21 profile: pixel + script: echo "Generated AVD" - name: Set up JDK 11 uses: actions/setup-java@v4 diff --git a/.github/workflows/navigation_tests.yml b/.github/workflows/navigation_tests.yml index 9f0f7915..cc35e1dd 100644 --- a/.github/workflows/navigation_tests.yml +++ b/.github/workflows/navigation_tests.yml @@ -33,6 +33,7 @@ jobs: with: api-level: 21 profile: pixel + script: echo "Generated AVD" - name: Set up JDK 11 uses: actions/setup-java@v4 From 8bae2a708632bf40a02ec6759eba3e3be0950df9 Mon Sep 17 00:00:00 2001 From: Kevin Block Date: Wed, 26 Feb 2025 10:57:30 -0500 Subject: [PATCH 12/14] Bump gradle version to allow java 17 building --- build.gradle | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 3ba46955..a5d171b1 100644 --- a/build.gradle +++ b/build.gradle @@ -3,14 +3,14 @@ import groovy.json.JsonSlurper // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.5.0' + ext.kotlin_version = '1.6.21' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.0' + classpath 'com.android.tools.build:gradle:7.3.0' classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:2.0.0' classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 691fb4cc..f805383e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip From 76b22b48131bd62c08be874c935a78b1ba939114 Mon Sep 17 00:00:00 2001 From: Kevin Block Date: Wed, 26 Feb 2025 10:58:46 -0500 Subject: [PATCH 13/14] Use java 17 --- .github/workflows/core_tests.yml | 13 ++----------- .github/workflows/navigation_tests.yml | 14 ++------------ 2 files changed, 4 insertions(+), 23 deletions(-) diff --git a/.github/workflows/core_tests.yml b/.github/workflows/core_tests.yml index dabc250e..faefa29b 100644 --- a/.github/workflows/core_tests.yml +++ b/.github/workflows/core_tests.yml @@ -28,18 +28,9 @@ jobs: sudo udevadm control --reload-rules sudo udevadm trigger --name-match=kvm - - name: Setup emulator + - name: Run core tests uses: ReactiveCircus/android-emulator-runner@v2 with: api-level: 21 profile: pixel - script: echo "Generated AVD" - - - name: Set up JDK 11 - uses: actions/setup-java@v4 - with: - distribution: 'jetbrains' - java-version: '11' - - - name: Run Core Tests - run: ./gradlew:core:connectedCheck --stacktrace \ No newline at end of file + script: ./gradlew:core:connectedCheck --stacktrace \ No newline at end of file diff --git a/.github/workflows/navigation_tests.yml b/.github/workflows/navigation_tests.yml index cc35e1dd..d1e19a34 100644 --- a/.github/workflows/navigation_tests.yml +++ b/.github/workflows/navigation_tests.yml @@ -28,19 +28,9 @@ jobs: sudo udevadm control --reload-rules sudo udevadm trigger --name-match=kvm - - name: Setup emulator + - name: Navigation test uses: ReactiveCircus/android-emulator-runner@v2 with: api-level: 21 profile: pixel - script: echo "Generated AVD" - - - name: Set up JDK 11 - uses: actions/setup-java@v4 - with: - distribution: 'jetbrains' - java-version: '11' - - - name: Run Navigation Tests - run: ./gradlew :navigation:connectedCheck --stacktrace - + script: ./gradlew :navigation:connectedCheck --stacktrace From 17ba97b39b543b47d26f0f70bd1be62dd463ccaa Mon Sep 17 00:00:00 2001 From: Kevin Block Date: Wed, 26 Feb 2025 11:33:59 -0500 Subject: [PATCH 14/14] Add space --- .github/workflows/core_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/core_tests.yml b/.github/workflows/core_tests.yml index faefa29b..5e1e29f0 100644 --- a/.github/workflows/core_tests.yml +++ b/.github/workflows/core_tests.yml @@ -33,4 +33,4 @@ jobs: with: api-level: 21 profile: pixel - script: ./gradlew:core:connectedCheck --stacktrace \ No newline at end of file + script: ./gradlew :core:connectedCheck --stacktrace \ No newline at end of file