From c59d3dcae280b735b50a48132857fe97b3d4d0a5 Mon Sep 17 00:00:00 2001
From: Tom Tresansky <ttresansky@gradle.com>
Date: Thu, 4 Apr 2024 11:35:35 -0400
Subject: [PATCH] Fix checkout

---
 .github/workflows/Build.yaml | 23 ++++++++++-------------
 .idea/codeStyles/Project.xml | 18 ------------------
 2 files changed, 10 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/Build.yaml b/.github/workflows/Build.yaml
index e4d4fd58f..ae7819404 100644
--- a/.github/workflows/Build.yaml
+++ b/.github/workflows/Build.yaml
@@ -157,18 +157,6 @@ jobs:
         api-level: [26, 30]
 
     steps:
-      - name: Checkout Declarative Gradle
-        uses: actions/checkout@v4
-        with:
-          repository: 'gradle/declarative-gradle'
-          path: 'declarative-gradle'
-
-      - name: Checkout Now in Android
-        uses: actions/checkout@v4
-        with:
-          repository: 'gradle/nowinandroid'
-          path: 'now-in-android'
-
       - name: Delete unnecessary tools 🔧
         uses: jlumbroso/free-disk-space@v1.3.1
         with:
@@ -187,8 +175,17 @@ jobs:
           sudo udevadm trigger --name-match=kvm
           ls /dev/kvm
 
-      - name: Checkout
+      - name: Checkout Declarative Gradle
         uses: actions/checkout@v4
+        with:
+          repository: 'gradle/declarative-gradle'
+          path: 'declarative-gradle'
+
+      - name: Checkout Now in Android
+        uses: actions/checkout@v4
+        with:
+          repository: 'gradle/nowinandroid'
+          path: 'now-in-android'
 
       - name: Copy CI gradle.properties
         run: mkdir -p ~/.gradle ; cp now-in-android/.github/ci-gradle.properties ~/.gradle/gradle.properties
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 6ef06e25a..de6c80b8f 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -2,24 +2,6 @@
   <code_scheme name="Project" version="173">
     <JavaCodeStyleSettings>
       <option name="ANNOTATION_PARAMETER_WRAP" value="1" />
-      <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="5" />
-      <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="3" />
-      <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
-        <value>
-          <package name="java.awt" withSubpackages="false" static="false" />
-          <package name="javax.swing" withSubpackages="false" static="false" />
-        </value>
-      </option>
-      <option name="IMPORT_LAYOUT_TABLE">
-        <value>
-          <package name="" withSubpackages="true" static="false" />
-          <emptyLine />
-          <package name="javax" withSubpackages="true" static="false" />
-          <package name="java" withSubpackages="true" static="false" />
-          <emptyLine />
-          <package name="" withSubpackages="true" static="true" />
-        </value>
-      </option>
       <option name="JD_P_AT_EMPTY_LINES" value="false" />
       <option name="JD_DO_NOT_WRAP_ONE_LINE_COMMENTS" value="true" />
       <option name="JD_KEEP_EMPTY_PARAMETER" value="false" />