From 0b801528d8a49752c25b8bcbe92404465f70c950 Mon Sep 17 00:00:00 2001 From: Ilya Stepanyuk Date: Sat, 30 Mar 2024 22:29:42 +0300 Subject: [PATCH] Update android_build.yml --- .github/workflows/android_build.yml | 8 ++++---- build.gradle.kts | 4 +--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/android_build.yml b/.github/workflows/android_build.yml index e89477bb..a973967a 100644 --- a/.github/workflows/android_build.yml +++ b/.github/workflows/android_build.yml @@ -10,7 +10,7 @@ jobs: build: runs-on: ubuntu-latest - timeout-minutes: 60 + timeout-minutes: 15 steps: @@ -46,8 +46,8 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x gradlew + - name: Junit tests with Gradle + run: ./gradlew testDebugUnitTest + - name: Build with Gradle run: ./gradlew build - - - name: Junit tests with Gradle - run: ./gradlew testDebugUnitTest \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 60b49721..b5f0d0b9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,4 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. -@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed plugins { alias(libs.plugins.application) apply false alias(libs.plugins.kotlin) apply false @@ -7,7 +6,6 @@ plugins { alias(libs.plugins.serialization) alias(libs.plugins.ksp) apply false } -true // Needed to make the Suppress annotation work for the plugins block buildscript { @@ -18,5 +16,5 @@ buildscript { } tasks.register(name = "type", type = Delete::class) { - delete(rootProject.buildDir) + delete(rootProject.projectDir.resolve("build")) }