From 1ef38fe7f33ace5f9702a3e885d75715466407d2 Mon Sep 17 00:00:00 2001
From: Patrick Goldinger <patrick.goldinger@pm.me>
Date: Wed, 12 May 2021 19:40:56 +0200
Subject: [PATCH] Fix GitHub workflows not setting up cmake

---
 .editorconfig                   | 2 +-
 .github/workflows/android.yml   | 4 +++-
 app/build.gradle.kts            | 1 -
 app/src/main/cpp/CMakeLists.txt | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 8c5d16a8..7ebc17b6 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -9,7 +9,7 @@ insert_final_newline = true
 max_line_length = 120
 trim_trailing_whitespace = true
 
-[{*.har,*.json}]
+[{*.har,*.json,*yml}]
 indent_size = 2
 
 [*.kt]
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 05062640..c712a4b7 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -16,6 +16,8 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: 1.8
+      - name: Setup CMake and Ninja
+        uses: lukka/get-cmake@v3.20.1
       - uses: actions/cache@v2
         with:
           path: |
@@ -25,7 +27,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
       - name: Build with Gradle
-        run: ./gradlew clean assemble
+        run: ./gradlew clean assembleDebug
       - uses: actions/upload-artifact@v2
         with:
           name: app-debug.apk
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index d76708eb..4a86aedc 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -54,7 +54,6 @@ android {
     externalNativeBuild {
         cmake {
             path("src/main/cpp/CMakeLists.txt")
-            version = "3.18.1"
         }
     }
 
diff --git a/app/src/main/cpp/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt
index 60870eea..73f29b18 100644
--- a/app/src/main/cpp/CMakeLists.txt
+++ b/app/src/main/cpp/CMakeLists.txt
@@ -1,7 +1,7 @@
 # For more information about using CMake with Android Studio, read the
 # documentation: https://d.android.com/studio/projects/add-native-code.html
 
-cmake_minimum_required(VERSION 3.18.1)
+cmake_minimum_required(VERSION 3.10.2)
 
 project("florisboard")