From bbc19a0486163d395ac1af95ddea81b45e32d820 Mon Sep 17 00:00:00 2001 From: Allen Date: Mon, 21 Oct 2024 14:28:07 -0700 Subject: [PATCH 1/5] Update build.common.gradle --- build.common.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.common.gradle b/build.common.gradle index 046a4a163f93..4e43a8c57e12 100644 --- a/build.common.gradle +++ b/build.common.gradle @@ -53,6 +53,7 @@ android { minSdkVersion 24 //noinspection ExpiredTargetSdkVersion targetSdkVersion 28 + multiDexEnabled true /** * We keep the versionCode and versionName of robot controller applications in sync with From 7516718fc23aaeb1a8ac14c0e3327539d6702926 Mon Sep 17 00:00:00 2001 From: Allen Date: Mon, 21 Oct 2024 14:29:01 -0700 Subject: [PATCH 2/5] Update build.common.gradle --- build.common.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.common.gradle b/build.common.gradle index 4e43a8c57e12..34d337b7cbaa 100644 --- a/build.common.gradle +++ b/build.common.gradle @@ -119,4 +119,6 @@ android { repositories { } +dependencies { + implementation 'org.ftclib.ftclib:core:2.1.1' // core From 6f839f10ee168f7ad54d45f7932fc42040a87ca7 Mon Sep 17 00:00:00 2001 From: Allen Date: Mon, 21 Oct 2024 14:29:29 -0700 Subject: [PATCH 3/5] Create android.yml --- .github/workflows/android.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/workflows/android.yml diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml new file mode 100644 index 000000000000..91a69d102926 --- /dev/null +++ b/.github/workflows/android.yml @@ -0,0 +1,26 @@ +name: Android CI + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + - name: set up JDK 11 + uses: actions/setup-java@v4 + with: + java-version: '11' + distribution: 'temurin' + cache: gradle + + - name: Grant execute permission for gradlew + run: chmod +x gradlew + - name: Build with Gradle + run: ./gradlew build From 540d93ecdcb1af5e682fa009eb56b11537c63872 Mon Sep 17 00:00:00 2001 From: Allen Date: Mon, 21 Oct 2024 14:33:45 -0700 Subject: [PATCH 4/5] Update build.common.gradle --- build.common.gradle | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build.common.gradle b/build.common.gradle index 34d337b7cbaa..c9cb04d2237a 100644 --- a/build.common.gradle +++ b/build.common.gradle @@ -119,6 +119,5 @@ android { repositories { } -dependencies { - implementation 'org.ftclib.ftclib:core:2.1.1' // core + From c39806d95af8c69942505b9aab557891d3e51468 Mon Sep 17 00:00:00 2001 From: Allen Date: Mon, 21 Oct 2024 14:34:09 -0700 Subject: [PATCH 5/5] Update build.gradle --- TeamCode/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/TeamCode/build.gradle b/TeamCode/build.gradle index 878287a7c712..597e959a8175 100644 --- a/TeamCode/build.gradle +++ b/TeamCode/build.gradle @@ -25,4 +25,5 @@ android { dependencies { implementation project(':FtcRobotController') + implementation 'org.ftclib.ftclib:core:2.1.1' // core }