Updating project to support Android Studio 4.0 (googlesamples#307)

app/build.gradle

@@ -2,6 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion compileSdk
+    testOptions.unitTests.includeAndroidResources = true
 
     defaultConfig {
         applicationId "pub.devrel.easypermissions.sample"
@@ -20,6 +21,7 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation "androidx.annotation:annotation:1.1.0"
     implementation project(':easypermissions')
 }

build.gradle

@@ -6,9 +6,9 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
-        classpath 'com.vanniktech:gradle-android-junit-jacoco-plugin:0.13.0'
+        classpath 'com.android.tools.build:gradle:4.0.0'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5'
+        classpath 'com.vanniktech:gradle-android-junit-jacoco-plugin:0.16.0'
     }
 }
 
@@ -35,6 +35,6 @@ ext {
 
     bintrayOrg = 'easygoogle'
 
-    compileSdk = 28
-    targetSdk = 28
+    compileSdk = 30
+    targetSdk = 30
 }

easypermissions/build.gradle

@@ -3,6 +3,7 @@ apply plugin: "com.vanniktech.android.junit.jacoco"
 
 android {
     compileSdkVersion compileSdk
+    testOptions.unitTests.includeAndroidResources = true
 
     defaultConfig {
         minSdkVersion 14
@@ -33,15 +34,16 @@ junitJacoco {
 }
 
 dependencies {
-    api "androidx.appcompat:appcompat:1.0.2"
-    api "androidx.core:core:1.0.1"
-    api "androidx.fragment:fragment:1.0.0"
+    api "androidx.appcompat:appcompat:1.1.0"
+    api "androidx.annotation:annotation:1.1.0"
+    api "androidx.core:core:1.3.0"
+    api "androidx.fragment:fragment:1.2.5"
 
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13'
     testImplementation 'com.google.truth:truth:0.42'
     testImplementation 'org.robolectric:robolectric:4.1'
-    testImplementation 'androidx.test:core:1.1.0'
-    testImplementation 'androidx.fragment:fragment-testing:1.1.0-alpha03'
+    testImplementation 'androidx.test:core:1.3.0-rc01'
+    testImplementation 'androidx.fragment:fragment-testing:1.2.5'
     testImplementation 'org.mockito:mockito-core:2.23.4'
 }
 

gradle.properties

@@ -20,7 +20,7 @@ org.gradle.jvmargs=-Xmx1536m
 org.gradle.configureondemand=true
 
 # Required by Robolectric 4.x
-android.enableUnitTestBinaryResources=true
+#android.enableUnitTestBinaryResources=true
 
 # Move transitive dependencies to AndroidX
 android.useAndroidX=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Tue Jul 07 16:12:58 CST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip