ci: fix

.gitlab-ci.yml

@@ -1,46 +1,41 @@
-image: docker.io/eclipse-temurin:21
+image: eclipse-temurin:21-jdk
+
+variables:
+  ANDROID_COMPILE_SDK: "36"
+  ANDROID_BUILD_TOOLS: "36.0.0"
+  ANDROID_SDK_TOOLS: "11076708"
+
+before_script:
+  - apt-get update -qq && apt-get install -y wget tar unzip lib32stdc++6 lib32z1
+  - export ANDROID_SDK_ROOT="${PWD}/android-home"
+  - mkdir -p $ANDROID_SDK_ROOT/cmdline-tools
+  - wget -q -O $ANDROID_SDK_ROOT/cmdline-tools.zip "https://dl.google.com/android/repository/commandlinetools-linux-${ANDROID_SDK_TOOLS}_latest.zip"
+  - unzip -d $ANDROID_SDK_ROOT/cmdline-tools $ANDROID_SDK_ROOT/cmdline-tools.zip
+  - mv $ANDROID_SDK_ROOT/cmdline-tools/cmdline-tools $ANDROID_SDK_ROOT/cmdline-tools/tools || true
+  - export PATH=$PATH:${ANDROID_SDK_ROOT}/cmdline-tools/tools/bin/
+  - sdkmanager --verbose --version
+  - yes | sdkmanager --licenses || true
+  - sdkmanager --verbose "platforms;android-${ANDROID_COMPILE_SDK}" "platform-tools" "build-tools;${ANDROID_BUILD_TOOLS}" || true
+  - chmod +x ./gradlew
 
 stages:
   - build
   - test
 
-cache:
+lintDebug:
-  key: ${CI_COMMIT_REF_SLUG}
+  stage: build
-  paths:
+  script:
-    - .gradle/
+    - ./gradlew -Pci --console=plain :app:lintDebug -PbuildDir=lint
-    - $HOME/Android/
 
-before_script:
+assembleDebug:
-  - apt-get update -y
-  - apt-get install -y wget unzip git
-  - wget https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip -O cmdline-tools.zip
-  - mkdir -p $HOME/Android/cmdline-tools
-  - unzip cmdline-tools.zip -d $HOME/Android/cmdline-tools
-  - yes | $HOME/Android/cmdline-tools/cmdline-tools/bin/sdkmanager --sdk_root=$HOME/Android "platform-tools" "platforms;android-33" "build-tools;33.0.2"
-  - export ANDROID_HOME=$HOME/Android
-  - export PATH=$ANDROID_HOME/platform-tools:$ANDROID_HOME/cmdline-tools/latest/bin:$PATH
-
-build:
   stage: build
   script:
     - ./gradlew assembleDebug
   artifacts:
     paths:
-      - app/build/outputs/apk/debug/*.apk
+      - app/build/outputs/
-    expire_in: 1 week
-  rules:
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
 
-test:
+debugTests:
   stage: test
   script:
-    - ./gradlew test
+    - ./gradlew -Pci --console=plain :app:testDebug
-  artifacts:
-    paths:
-      - app/build/test-results/test/*.xml
-      - app/build/reports/tests/test/*.html
-    expire_in: 1 week
-  rules:
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'

settings.gradle.kts

@@ -25,4 +25,3 @@ dependencyResolutionManagement {
 
 rootProject.name = "MoscowHackatonTemplate"
 include(":app")
-