Merge branch 'main' of github.com:ooni/probe-multiplatform into chore…

…/flavor-update
ooni · Jul 30, 2024 · c5ff1da · c5ff1da
2 parents df0def3 + bb13929
commit c5ff1da
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -2,7 +2,7 @@ name: Validate
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
 
 jobs:
@@ -21,7 +21,7 @@ jobs:
         uses: ./.github/actions/setup
 
       - name: Build Android
-        run: ./gradlew assemble${{ matrix.type }}
+        run: ./gradlew clean assemble${{ matrix.type }}
 
       - name: Build iOS
         run: ./gradlew link${{ matrix.type }}FrameworkIosSimulatorArm64
@@ -38,7 +38,7 @@ jobs:
         uses: ./.github/actions/setup
 
       - name: Run lint
-        run: ./gradlew lint
+        run: ./gradlew clean lint
 
       - name: Uploads test reports
         uses: actions/upload-artifact@v4
@@ -59,7 +59,7 @@ jobs:
         uses: ./.github/actions/setup
 
       - name: Run lint
-        run: ./gradlew ktlintCheck
+        run: ./gradlew clean ktlintCheck
 
       - name: Uploads test reports
         uses: actions/upload-artifact@v4

diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts
@@ -137,7 +137,7 @@ android {
     android {
         lint {
             warningsAsErrors = true
-            disable += "AndroidGradlePluginVersion"
+            disable += listOf("AndroidGradlePluginVersion", "ObsoleteLintCustomCheck")
         }
     }
 }
@@ -195,6 +195,10 @@ tasks.named("preBuild").configure {
     dependsOn("copyCommonResourcesToFlavor")
 }
 
+tasks.named("clean").configure {
+    dependsOn("copyCommonResourcesToFlavor")
+}
+
 tasks.named("clean").configure {
     dependsOn("cleanCopiedCommonResourcesToFlavor")
 }
@@ -273,7 +277,11 @@ fun copyRecursive(
 tasks.register("runDebug", Exec::class) {
     dependsOn("clean", "uninstallDebug", "installDebug")
     commandLine(
-        "adb", "shell", "am", "start", "-n",
+        "adb",
+        "shell",
+        "am",
+        "start",
+        "-n",
         "${config.appId}.debug/org.ooni.probe.MainActivity",
     )
 }