Merge branch 'main' into levi/manual-deploy-refactor

.github/actions/setup-android/action.yml

@@ -0,0 +1,20 @@
+name: Setup Android
+description: Setup CI with Android development tools to compile and test Android source code. 
+
+runs:
+  using: "composite"
+  steps:
+  - name: Install Java
+    uses: actions/setup-java@v3
+    with:
+      distribution: 'temurin'
+      java-version: '17'
+
+  - name: Install Android SDK
+    uses: android-actions/setup-android@v3 
+
+  - name: Verify gradle scripts are valid gradle scripts 
+    uses: gradle/wrapper-validation-action@v1
+
+  - name: Setup Gradle and cache dependencies between builds 
+    uses: gradle/gradle-build-action@v2

.github/workflows/binary-validator.yml

@@ -8,11 +8,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK
-      uses: actions/setup-java@v3
-      with:
-        distribution: 'adopt'
-        java-version: '11'
+    - uses: ./.github/actions/setup-android
     - name: API check
-      run: ./gradlew apiCheck
-
+      run: ./gradlew apiCheck

.github/workflows/build-sample-apps.yml

@@ -69,20 +69,12 @@ jobs:
     name: Building app...${{ matrix.sample-app }}
     steps:
     - uses: actions/checkout@v4
-
-    - name: Set up JDK
-      uses: actions/setup-java@v3
-      with:
-        distribution: 'temurin'
-        java-version: '11'
+    - uses: ./.github/actions/setup-android
 
     # CLI to replace strings in files. The CLI recommends using `cargo install` which is slow. This Action is fast because it downloads pre-built binaries. 
     # If using sd on macos, "brew install" works great. for Linux, this is the recommended way. 
     - name: Install sd CLI to use later in the workflow 
       uses: kenji-miyake/setup-sd@v1
-
-    - name: Setup Android SDK
-      uses: android-actions/setup-android@v2 
 
     - name: Install tools from Gemfile (ruby language) used for building our apps with 
       uses: ruby/setup-ruby@v1
@@ -95,12 +87,6 @@ jobs:
         touch "samples/local.properties"
         echo "siteId=${{ secrets[matrix.cio-siteid-secret-key] }}" >> "samples/local.properties"
         echo "apiKey=${{ secrets[matrix.cio-apikey-secret-key] }}" >> "samples/local.properties"  
-    
-    - name: Verify gradle scripts are not modified 
-      uses: gradle/wrapper-validation-action@v1
-
-    - name: Setup Gradle and cache dependencies between builds 
-      uses: gradle/gradle-build-action@v2
 
     - name: Dump GitHub Action metadata because Fastlane uses it. Viewing it here helps debug JSON parsing code in Firebase. 
       run: cat $GITHUB_EVENT_PATH

.github/workflows/deploy-sdk.yml

@@ -150,11 +150,7 @@ jobs:
           ref: ${{ inputs.existing-git-tag }}
 
       - uses: actions/checkout@v4
-      - name: Set up JDK
-        uses: actions/setup-java@v3
-        with:
-          distribution: adopt
-          java-version: 11
+      - uses: ./.github/actions/setup-android
       - name: Push to Sonatype servers
         run: MODULE_VERSION=${{ needs.deploy-git-tag.outputs.new_release_version }} ./scripts/deploy-code.sh
         env:

.github/workflows/lint.yml

@@ -11,13 +11,7 @@ jobs:
     name: Android Lint (${{ matrix.module }})
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK
-      uses: actions/setup-java@v3
-      with:
-        distribution: 'adopt'
-        java-version: '11' # Robolectric requires v9, but we choose LTS: https://adoptopenjdk.net/
-    - name: Setup Android SDK
-      uses: android-actions/setup-android@v2
+    - uses: ./.github/actions/setup-android
 
     - name: Run lint (${{ matrix.module }})
       run: ./gradlew :${{ matrix.module }}:lintDebug
@@ -34,11 +28,7 @@ jobs:
     name: Kotlin Lint
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK
-      uses: actions/setup-java@v3
-      with:
-        distribution: 'adopt'
-        java-version: '11' # Robolectric requires v9, but we choose LTS: https://adoptopenjdk.net/
+    - uses: ./.github/actions/setup-android
 
     - name: Install and run ktlint
       run: make lint-install && make lint-no-format

.github/workflows/snapshot-release.yml

@@ -12,11 +12,7 @@ jobs:
     steps:
       - name: Check out code
         uses: actions/checkout@v4
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
-        with:
-          distribution: adopt
-          java-version: 11
+      - uses: ./.github/actions/setup-android
 
       # Using branch name for name of snapshot. Makes it easy to remember and can easily trigger new builds of Remote Habits. 
       - name: Set snapshot version 

.github/workflows/test.yml

@@ -11,13 +11,7 @@ jobs:
     name: Unit tests (${{ matrix.module }})
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'adopt'
-          java-version: '11' # Robolectric requires v9, but we choose LTS: https://adoptopenjdk.net/
-      - name: Setup Android SDK
-        uses: android-actions/setup-android@v2
+      - uses: ./.github/actions/setup-android      
       - name: Run unit tests (${{ matrix.module }})
         run: ./gradlew :${{ matrix.module }}:runJacocoTestReport
       - name: Upload code coverage report
@@ -44,15 +38,7 @@ jobs:
         sample: [kotlin_compose, java_layout]
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'adopt'
-          java-version: '17'
-      - name: Setup Android SDK
-        uses: android-actions/setup-android@v2
-      - name: Gradle cache
-        uses: gradle/gradle-build-action@v2
+      - uses: ./.github/actions/setup-android
       - name: Start emulator
         uses: reactivecircus/android-emulator-runner@v2
         with: