update robolectric

AmiDavidW · Jul 18, 2021 · d99c7ca · d99c7ca
1 parent 6aa242d
commit d99c7ca
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 36 deletions.
diff --git a/.github/workflows/android_ci.yml b/.github/workflows/android_ci.yml
@@ -6,10 +6,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
-      - name: set up JDK 11
+      - name: set up JDK 15
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 15
       - name: lint
         run: bash ./gradlew lint --stacktrace
       - name: unit tests

diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 sudo: false
 cache: false
 language: android
-jdk: openjdk9
+jdk: openjdk15
 dist: trusty
 env:
   - JAVA_OPTS='-XX:+IgnoreUnrecognizedVMOptions --add-modules java.se.ee'

diff --git a/app/build.gradle b/app/build.gradle
@@ -42,7 +42,7 @@ dependencies {
     testImplementation 'io.mockk:mockk:1.12.0'
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.mockito:mockito-core:3.11.2'
-    testImplementation 'org.robolectric:robolectric:4.5.1'
+    testImplementation 'org.robolectric:robolectric:4.6.1'
     testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
     testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
     // Android Test Dependencies

diff --git a/app/build.properties b/app/build.properties
@@ -1,7 +1,7 @@
 #Build Properties
-#Sat Jul 17 10:18:42 EDT 2021
+#Sun Jul 18 09:43:35 EDT 2021
 version_minor=0
 version_store=56
 version_patch=4
-version_build=14
+version_build=15
 version_major=3
diff --git a/circle.yml b/circle.yml
diff --git a/gradle.properties b/gradle.properties
@@ -21,3 +21,4 @@ org.gradle.daemon.idletimeout=0
 #
 android.useAndroidX=true
 android.enableJetifier=true
+android.jetifier.blacklist=bcprov-jdk15on