Try to fix clean build for Android

korlibs · Aug 27, 2024 · 06b26eb · 06b26eb
1 parent 252b359
commit 06b26eb
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/buildSrc/src/main/kotlin/korlibs/korge/gradle/targets/android/AndroidDirect.kt b/buildSrc/src/main/kotlin/korlibs/korge/gradle/targets/android/AndroidDirect.kt
@@ -85,6 +85,11 @@ fun Project.configureAndroidDirect(projectType: ProjectType, isKorge: Boolean) {
             targetCompatibility = ANDROID_JAVA_VERSION
         }
 
+        lintOptions.apply {
+            checkOnly()
+            //checkReleaseBuilds = false
+        }
+
         buildFeatures.apply {
             if (project.name == "korlibs-platform") {
                 buildConfig = true

diff --git a/buildSrc/src/main/kotlin/korlibs/korge/gradle/targets/android/AndroidRun.kt b/buildSrc/src/main/kotlin/korlibs/korge/gradle/targets/android/AndroidRun.kt
@@ -1,5 +1,6 @@
 package korlibs.korge.gradle.targets.android
 
+import com.android.build.gradle.internal.lint.*
 import korlibs.korge.gradle.*
 import korlibs.korge.gradle.targets.*
 import korlibs.korge.gradle.util.*
@@ -40,6 +41,7 @@ fun Project.installAndroidRun(dependsOnList: List<String>, direct: Boolean, isKo
 
             tasks.findByName("generate${Type}BuildConfig")?.dependsOn(createAndroidManifest)
             tasks.findByName("process${Type}MainManifest")?.dependsOn(createAndroidManifest)
+            tasks.findByName("process${Type}Resources")?.dependsOn(createAndroidManifest)
 
 
             // Not required anymore
@@ -106,6 +108,7 @@ fun Project.installAndroidRun(dependsOnList: List<String>, direct: Boolean, isKo
                 dependsOn(ordered("createAndroidManifest", installAndroidTaskName))
                 finalizedBy(onlyRunAndroid)
             }
+
         }
     }
 
@@ -125,6 +128,18 @@ fun Project.installAndroidRun(dependsOnList: List<String>, direct: Boolean, isKo
     tasks.createTyped<AndroidAdbLogcatTask>("adbLogcat") {
         group = GROUP_KORGE_ADB
     }
+
+    afterEvaluate {
+        afterEvaluate {
+            listOfNotNull(
+                tasks.findByName("generateReleaseLintVitalReportModel"),
+                tasks.findByName("generateDebugLintVitalReportModel")
+            ).forEach {
+                it.dependsOn("jvmProcessResources")
+                it.enabled = false
+            }
+        }
+    }
 }
 
 open class AndroidCreateAndroidManifest : DefaultTask() {