Undo minSdk 24 for compose.

.github/actions/gradle-task-with-commit/action.yml

@@ -19,12 +19,12 @@ inputs :
     default: ''
   personal-access-token:
     description: 'The personal access token to use for checkouts'
-  restore-cache-key:
-    description: 'The unique identifier for the associated cache.  Any other consumers or producers for this cache must use the same name.'
-    default: 'null'
-  write-cache-key:
-    description: 'The unique identifier for the associated cache.  Any other consumers or producers for this cache must use the same name.'
-    default: 'null'
+  # restore-cache-key:
+  #   description: 'The unique identifier for the associated cache.  Any other consumers or producers for this cache must use the same name.'
+  #   default: 'null'
+  # write-cache-key:
+  #   description: 'The unique identifier for the associated cache.  Any other consumers or producers for this cache must use the same name.'
+  #   default: 'null'
 
 runs:
   using: 'composite'
@@ -59,8 +59,8 @@ runs:
         task: ${{ inputs.fix-task }}
         distribution: ${{ inputs.distribution }}
         java-version: ${{ inputs.java-version }}
-        restore-cache-key: ${{ inputs.restore-cache-key }}
-        write-cache-key: ${{ inputs.write-cache-key }}
+        # restore-cache-key: ${{ inputs.restore-cache-key }}
+        # write-cache-key: ${{ inputs.write-cache-key }}
 
     - name: Set Commit Message
       id: set-commit-message
@@ -87,5 +87,5 @@ runs:
         task: ${{ inputs.check-task }}
         distribution: ${{ inputs.distribution }}
         java-version: ${{ inputs.java-version }}
-        restore-cache-key: ${{ inputs.restore-cache-key }}
-        write-cache-key: ${{ inputs.write-cache-key }}
+        # restore-cache-key: ${{ inputs.restore-cache-key }}
+        # write-cache-key: ${{ inputs.write-cache-key }}

.github/actions/gradle-task/action.yml

@@ -14,12 +14,12 @@ inputs :
   distribution :
     description : 'The JDK distribution to use.'
     default : 'zulu'
-  restore-cache-key :
-    description : 'The unique identifier for the associated cache.  Any other consumers or producers for this cache must use the same name.'
-    default : 'null'
-  write-cache-key :
-    description : 'The unique identifier for the associated cache.  Any other consumers or producers for this cache must use the same name.'
-    default : 'null'
+  # restore-cache-key :
+  #   description : 'The unique identifier for the associated cache.  Any other consumers or producers for this cache must use the same name.'
+  #   default : 'null'
+  # write-cache-key :
+  #   description : 'The unique identifier for the associated cache.  Any other consumers or producers for this cache must use the same name.'
+  #   default : 'null'
 
 runs :
   using : 'composite'
@@ -37,59 +37,59 @@ runs :
 
     - name : Gradle build action
       uses : gradle/gradle-build-action@v2
-      with :
-        cache-read-only : false
-        gradle-home-cache-cleanup : true
+      # with :
+      #   cache-read-only : false
+      #   gradle-home-cache-cleanup : true
 
     # Calculate all the hashes for keys just one time.
     # These should only be referenced before the actual task action, since that action
     # may generate changes and we want the final cache key to reflect its current state.
-    - name : Calculate hashes
-      id : hashes
-      shell: bash
-      run : |
-        echo "lib_versions=${{ hashFiles('**/libs.versions.toml') }}" >> $GITHUB_OUTPUT
-        echo "gradle_props=${{ hashFiles('**/gradle.properties') }}" >> $GITHUB_OUTPUT
-        echo "gradle_kts=${{ hashFiles('**/*.gradle.kts') }}" >> $GITHUB_OUTPUT
-        echo "src_kt=${{ hashFiles('**/src/**/*.kt') }}" >> $GITHUB_OUTPUT
+    # - name : Calculate hashes
+    #   id : hashes
+    #   shell: bash
+    #   run : |
+    #     echo "lib_versions=${{ hashFiles('**/libs.versions.toml') }}" >> $GITHUB_OUTPUT
+    #     echo "gradle_props=${{ hashFiles('**/gradle.properties') }}" >> $GITHUB_OUTPUT
+    #     echo "gradle_kts=${{ hashFiles('**/*.gradle.kts') }}" >> $GITHUB_OUTPUT
+    #     echo "src_kt=${{ hashFiles('**/src/**/*.kt') }}" >> $GITHUB_OUTPUT
 
     # Attempt to restore from the write-cache-key, or fall back to a partial match for the write key.
     # Skipped if the write-cache-key wasn't set.
     # This step's "cache_hit" output will only be true if an exact match was found.
-    - name : restore cache for ${{inputs.write-cache-key}}
-      id : restore-write-cache
-      if : inputs.write-cache-key != 'null'
-      uses : actions/cache/restore@v3
-      with :
-        path : |
-          ~/.gradle/caches/build-cache-1
-          ~/.konan
-          ./**/build/**/!(*.dex)
-          ./**/.gradle
-        key : ${{runner.os}}-${{inputs.write-cache-key}}-${{steps.hashes.outputs.lib_versions}}-${{steps.hashes.outputs.gradle_props}}-${{steps.hashes.outputs.gradle_kts}}-${{steps.hashes.outputs.src_kt}}
-        restore-keys : |
-          ${{runner.os}}-${{inputs.write-cache-key}}-${{steps.hashes.outputs.lib_versions}}-${{steps.hashes.outputs.gradle_props}}-${{steps.hashes.outputs.gradle_kts}}
-          ${{runner.os}}-${{inputs.write-cache-key}}-${{steps.hashes.outputs.lib_versions}}-${{steps.hashes.outputs.gradle_props}}
-          ${{runner.os}}-${{inputs.write-cache-key}}-${{steps.hashes.outputs.lib_versions}}
-          ${{runner.os}}-${{inputs.write-cache-key}}
+    # - name : restore cache for ${{inputs.write-cache-key}}
+    #   id : restore-write-cache
+    #   if : inputs.write-cache-key != 'null'
+    #   uses : actions/cache/restore@v3
+    #   with :
+    #     path : |
+    #       ~/.gradle/caches/build-cache-1
+    #       ~/.konan
+    #       ./**/build/**/!(*.dex)
+    #       ./**/.gradle
+    #     key : ${{runner.os}}-${{inputs.write-cache-key}}-${{steps.hashes.outputs.lib_versions}}-${{steps.hashes.outputs.gradle_props}}-${{steps.hashes.outputs.gradle_kts}}-${{steps.hashes.outputs.src_kt}}
+    #     restore-keys : |
+    #       ${{runner.os}}-${{inputs.write-cache-key}}-${{steps.hashes.outputs.lib_versions}}-${{steps.hashes.outputs.gradle_props}}-${{steps.hashes.outputs.gradle_kts}}
+    #       ${{runner.os}}-${{inputs.write-cache-key}}-${{steps.hashes.outputs.lib_versions}}-${{steps.hashes.outputs.gradle_props}}
+    #       ${{runner.os}}-${{inputs.write-cache-key}}-${{steps.hashes.outputs.lib_versions}}
+    #       ${{runner.os}}-${{inputs.write-cache-key}}
 
-    # Attempt to restore from the restore-cache-key, or fall back to a partial match for the restore key.
-    # Skipped if the restore-cache-key wasn't set, or if the write-cache-key restore had an exact match.
-    - name : restore cache for ${{inputs.restore-cache-key}}
-      if : inputs.restore-cache-key != 'null' && steps.restore-write-cache.outputs.cache-hit != 'true'
-      uses : actions/cache/restore@v3
-      with :
-        path : |
-          ~/.gradle/caches/build-cache-1
-          ~/.konan
-          ./**/build/**/!(*.dex)
-          ./**/.gradle
-        key : ${{runner.os}}-${{inputs.restore-cache-key}}-${{steps.hashes.outputs.lib_versions}}-${{steps.hashes.outputs.gradle_props}}-${{steps.hashes.outputs.gradle_kts}}-${{steps.hashes.outputs.src_kt}}
-        restore-keys : |
-          ${{runner.os}}-${{inputs.restore-cache-key}}-${{steps.hashes.outputs.lib_versions}}-${{steps.hashes.outputs.gradle_props}}-${{steps.hashes.outputs.gradle_kts}}
-          ${{runner.os}}-${{inputs.restore-cache-key}}-${{steps.hashes.outputs.lib_versions}}-${{steps.hashes.outputs.gradle_props}}
-          ${{runner.os}}-${{inputs.restore-cache-key}}-${{steps.hashes.outputs.lib_versions}}
-          ${{runner.os}}-${{inputs.restore-cache-key}}
+    # # Attempt to restore from the restore-cache-key, or fall back to a partial match for the restore key.
+    # # Skipped if the restore-cache-key wasn't set, or if the write-cache-key restore had an exact match.
+    # - name : restore cache for ${{inputs.restore-cache-key}}
+    #   if : inputs.restore-cache-key != 'null' && steps.restore-write-cache.outputs.cache-hit != 'true'
+    #   uses : actions/cache/restore@v3
+    #   with :
+    #     path : |
+    #       ~/.gradle/caches/build-cache-1
+    #       ~/.konan
+    #       ./**/build/**/!(*.dex)
+    #       ./**/.gradle
+    #     key : ${{runner.os}}-${{inputs.restore-cache-key}}-${{steps.hashes.outputs.lib_versions}}-${{steps.hashes.outputs.gradle_props}}-${{steps.hashes.outputs.gradle_kts}}-${{steps.hashes.outputs.src_kt}}
+    #     restore-keys : |
+    #       ${{runner.os}}-${{inputs.restore-cache-key}}-${{steps.hashes.outputs.lib_versions}}-${{steps.hashes.outputs.gradle_props}}-${{steps.hashes.outputs.gradle_kts}}
+    #       ${{runner.os}}-${{inputs.restore-cache-key}}-${{steps.hashes.outputs.lib_versions}}-${{steps.hashes.outputs.gradle_props}}
+    #       ${{runner.os}}-${{inputs.restore-cache-key}}-${{steps.hashes.outputs.lib_versions}}
+    #       ${{runner.os}}-${{inputs.restore-cache-key}}
 
     - uses : gradle/wrapper-validation-action@v1
 
@@ -101,25 +101,25 @@ runs :
         # something along the way to the actual CLI invocation gets confused and the jvmargs list
         # winds up getting parsed as a single argument.
         arguments : ${{steps.gradle-args.outputs.gradle-property-args}} ${{inputs.task}} '-Dorg.gradle.jvmargs=${{steps.gradle-args.outputs.gradle-jvm-args}}'
-        cache-read-only : false
+        # cache-read-only : false
         build-root-directory : ${{inputs.build-root-directory}}
-        gradle-home-cache-cleanup : true
+        # gradle-home-cache-cleanup : true
 
     # Save the build cache to `write-cache-key`.
     # Skip if we already had an exact match, or if the key is not set, or if this is a Windows runner.
     # Windows runners are welcome to *read* the cross-OS cache, but the directories get weird if
     # they try to write to it.
-    - name : save the '${{inputs.write-cache-key}}' cache
-      uses : actions/cache/save@v3
-      id : save-write-cache-key
-      if : inputs.write-cache-key != 'null' && steps.restore-write-cache.outputs.cache-hit != 'true'
-      with :
-        path : |
-          ~/.gradle/caches/build-cache-1
-          ~/.konan
-          ./**/build/**/!(*.dex)
-          ./**/.gradle
-        key : ${{runner.os}}-${{inputs.write-cache-key}}-${{hashFiles('**/libs.versions.toml')}}-${{hashFiles('**/gradle.properties')}}-${{hashFiles('**/*.gradle.kts')}}-${{hashFiles('**/src/**/*.kt')}}
+    # - name : save the '${{inputs.write-cache-key}}' cache
+    #   uses : actions/cache/save@v3
+    #   id : save-write-cache-key
+    #   if : inputs.write-cache-key != 'null' && steps.restore-write-cache.outputs.cache-hit != 'true'
+    #   with :
+    #     path : |
+    #       ~/.gradle/caches/build-cache-1
+    #       ~/.konan
+    #       ./**/build/**/!(*.dex)
+    #       ./**/.gradle
+    #     key : ${{runner.os}}-${{inputs.write-cache-key}}-${{hashFiles('**/libs.versions.toml')}}-${{hashFiles('**/gradle.properties')}}-${{hashFiles('**/*.gradle.kts')}}-${{hashFiles('**/src/**/*.kt')}}
 
     - name : Upload heap dump
       if : failure()

.github/actions/gradle-tasks-with-emulator/action.yml

@@ -20,12 +20,12 @@ inputs :
   distribution :
     description : 'The JDK distribution to use.'
     default : 'zulu'
-  restore-cache-key :
-    description : 'The unique identifier for the associated cache.  Any other consumers or producers for this cache must use the same name.'
-    default : 'null'
-  write-cache-key :
-    description : 'The unique identifier for the associated cache.  Any other consumers or producers for this cache must use the same name.'
-    default : 'null'
+  # restore-cache-key :
+  #   description : 'The unique identifier for the associated cache.  Any other consumers or producers for this cache must use the same name.'
+  #   default : 'null'
+  # write-cache-key :
+  #   description : 'The unique identifier for the associated cache.  Any other consumers or producers for this cache must use the same name.'
+  #   default : 'null'
 
 runs :
   using : 'composite'
@@ -47,23 +47,23 @@ runs :
         build-root-directory : ${{ inputs.build-root-directory }}
         distribution : ${{ inputs.distribution }}
         java-version : ${{ inputs.java-version }}
-        restore-cache-key : ${{ inputs.restore-cache-key }}
+        # restore-cache-key : ${{ inputs.restore-cache-key }}
         task : ${{ inputs.prepare-task }}
-        write-cache-key : ${{ inputs.write-cache-key }}
+        # write-cache-key : ${{ inputs.write-cache-key }}
 
-    # Get the AVD if it's already cached.
-    - name : AVD cache
-      uses : actions/cache/restore@v3
-      id : restore-avd-cache
-      with :
-        path : |
-          ~/.android/avd/*
-          ~/.android/adb*
-        key : avd-${{ matrix.api-level }}
+    # # Get the AVD if it's already cached.
+    # - name : AVD cache
+    #   uses : actions/cache/restore@v3
+    #   id : restore-avd-cache
+    #   with :
+    #     path : |
+    #       ~/.android/avd/*
+    #       ~/.android/adb*
+    #     key : avd-${{ matrix.api-level }}
 
     # If the AVD cache didn't exist, create an AVD
     - name : create AVD and generate snapshot for caching
-      if : steps.restore-avd-cache.outputs.cache-hit != 'true'
+      # if : steps.restore-avd-cache.outputs.cache-hit != 'true'
       uses : reactivecircus/android-emulator-runner@v2
       with :
         api-level : ${{ inputs.api-level }}
@@ -76,16 +76,16 @@ runs :
         ram-size : 4096M
         script : echo "Generated AVD snapshot."
 
-    # If we just created an AVD because there wasn't one in the cache, then cache that AVD.
-    - name : cache new AVD before tests
-      if : steps.restore-avd-cache.outputs.cache-hit != 'true'
-      id : save-avd-cache
-      uses : actions/cache/save@v3
-      with :
-        path : |
-          ~/.android/avd/*
-          ~/.android/adb*
-        key : avd-${{ matrix.api-level }}
+    # # If we just created an AVD because there wasn't one in the cache, then cache that AVD.
+    # - name : cache new AVD before tests
+    #   if : steps.restore-avd-cache.outputs.cache-hit != 'true'
+    #   id : save-avd-cache
+    #   uses : actions/cache/save@v3
+    #   with :
+    #     path : |
+    #       ~/.android/avd/*
+    #       ~/.android/adb*
+    #     key : avd-${{ matrix.api-level }}
 
     # Run the actual emulator tests.
     # At this point every task should be up-to-date and the AVD should be ready to go.