From ff9863e57050f049bbe78f69c0d2b73c47129200 Mon Sep 17 00:00:00 2001 From: Fortyseven Date: Wed, 2 Jun 2021 23:46:25 -0400 Subject: [PATCH 1/4] Updated dependencies --- MainApp/build.gradle | 2 +- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/MainApp/build.gradle b/MainApp/build.gradle index 7e6609b..e84c649 100644 --- a/MainApp/build.gradle +++ b/MainApp/build.gradle @@ -36,6 +36,6 @@ android { } dependencies { - implementation 'androidx.appcompat:appcompat:1.0.2' + implementation 'androidx.appcompat:appcompat:1.3.0' implementation fileTree(dir: 'libs', include: ['*.jar']) } diff --git a/build.gradle b/build.gradle index efc8cdd..7e03ffd 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.4.2' + classpath 'com.android.tools.build:gradle:4.2.1' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6353eca..aefb36b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip From 47aa532b30020a5d2011f38f6e526a3f35ca3db8 Mon Sep 17 00:00:00 2001 From: Fortyseven Date: Sat, 5 Jun 2021 20:25:42 -0400 Subject: [PATCH 2/4] Added first go at a workflow action --- MainApp/src/main/res/layout/.github/workflows/android_build.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 MainApp/src/main/res/layout/.github/workflows/android_build.yml diff --git a/MainApp/src/main/res/layout/.github/workflows/android_build.yml b/MainApp/src/main/res/layout/.github/workflows/android_build.yml new file mode 100644 index 0000000..e69de29 From 43365e36e86b86b6c78a64dd6906e503213c21ad Mon Sep 17 00:00:00 2001 From: Fortyseven Date: Sat, 5 Jun 2021 20:31:32 -0400 Subject: [PATCH 3/4] Added workflow action for real this time --- .github/workflows/android_build.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .github/workflows/android_build.yml diff --git a/.github/workflows/android_build.yml b/.github/workflows/android_build.yml new file mode 100644 index 0000000..4942501 --- /dev/null +++ b/.github/workflows/android_build.yml @@ -0,0 +1,21 @@ +name: Android Build + +on: pull_request + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + + - name: Set Up JDK + uses: actions/setup-java@v1 + with: + java-version: 1.8 + + - name: Run Tests + run: ./gradlew test + + - name: Build Project + run: ./gradlew assemble \ No newline at end of file From 7be430e97923e46dd3f7ccdb32e35c329d0006a8 Mon Sep 17 00:00:00 2001 From: Fortyseven Date: Sat, 5 Jun 2021 20:35:04 -0400 Subject: [PATCH 4/4] Added executable mode to `gradlew` --- gradlew | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 gradlew diff --git a/gradlew b/gradlew old mode 100644 new mode 100755