From 6af79d5f419486244fb515c1c477f860440f59d1 Mon Sep 17 00:00:00 2001 From: Sylvia van Os Date: Mon, 2 Aug 2021 20:47:48 +0200 Subject: [PATCH] General cleanups --- .github/workflows/android.yml | 7 ++++--- app/build.gradle | 6 +++--- build.gradle | 1 - 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 81b84e140..e5f2d5176 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -14,10 +14,11 @@ jobs: steps: - uses: actions/checkout@v2 - uses: gradle/wrapper-validation-action@v1 - - name: set up JDK 1.8 - uses: actions/setup-java@v1 + - name: set up JDK 11 + uses: actions/setup-java@v2 with: - java-version: 1.8 + distribution: 'adopt' + java-version: '11' - name: Build run: ./gradlew assembleRelease - name: Check lint diff --git a/app/build.gradle b/app/build.gradle index 5358f9a4b..6d874f970 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -74,9 +74,9 @@ android { dependencies { // AndroidX - implementation 'androidx.appcompat:appcompat:1.3.0' + implementation 'androidx.appcompat:appcompat:1.3.1' implementation 'androidx.cardview:cardview:1.0.0' - implementation 'androidx.constraintlayout:constraintlayout:2.0.4' + implementation 'androidx.constraintlayout:constraintlayout:2.1.0' implementation 'androidx.preference:preference:1.1.1' implementation 'com.google.android.material:material:1.4.0' coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' @@ -95,7 +95,7 @@ dependencies { // Testing testImplementation 'androidx.test:core:1.4.0' testImplementation 'junit:junit:4.13.2' - testImplementation 'org.robolectric:robolectric:4.4' + testImplementation 'org.robolectric:robolectric:4.6.1' } tasks.withType(SpotBugsTask) { diff --git a/build.gradle b/build.gradle index 5103837ff..3c3650631 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,6 @@ buildscript { allprojects { repositories { google() - jcenter() maven { url "https://jitpack.io" } gradlePluginPortal() }