Skip to content

Commit

Permalink
fix: lintVitalRelease issues on Android (#188)
Browse files Browse the repository at this point in the history
  • Loading branch information
edeckers authored Jan 15, 2022
1 parent 6e7924f commit 4405b19
Show file tree
Hide file tree
Showing 13 changed files with 1,941 additions and 1,855 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/ci-build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: set up JDK 1.8
- name: set up JDK 11
uses: actions/setup-java@v1
with:
java-version: 1.8
java-version: 11
- uses: actions/cache@v2
id: node_modules
with:
Expand All @@ -101,10 +101,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: set up JDK 1.8
- name: set up JDK 11
uses: actions/setup-java@v1
with:
java-version: 1.8
java-version: 11
- uses: actions/cache@v2
id: node_modules
with:
Expand All @@ -121,10 +121,10 @@ jobs:
runs-on: m1
steps:
- uses: actions/checkout@v2
- name: set up JDK 1.8
- name: set up JDK 11
uses: actions/setup-java@v1
with:
java-version: 1.8
java-version: 11
- uses: actions/cache@v2
id: node_modules
with:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ npm install react-native-blob-courier

- Android >= 21
- iOS >= 10
- Kotlin >= 1.4.x
- JDK >= 11
- React Native >= 0.63.x

## Usage
Expand Down
6 changes: 3 additions & 3 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,11 @@ android {
disable 'GradleCompatible'
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}
kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8.toString()
jvmTarget = JavaVersion.VERSION_11.toString()
}
}

Expand Down
170 changes: 106 additions & 64 deletions android/gradle.lockfile

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions android/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
BlobCourier_coroutinesVersion = 1.3.+
BlobCourier_espressoVersion = 3.3.+
BlobCourier_gradleToolsVersion = 4.2.+
BlobCourier_gradleToolsVersion = 7.0.+
BlobCourier_junitVersion = 4.13.+
BlobCourier_kotlinVersion = 1.4.+
BlobCourier_kotlinVersion = 1.5.+
BlobCourier_localbroadcastmanagerVersion = 1.0.+
BlobCourier_mockkVersion = 1.12.+
BlobCourier_multidexVersion = 2.0.+
Expand Down
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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-7.0-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
11 changes: 6 additions & 5 deletions example/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ import com.android.build.OutputFile

project.ext.react = [
enableHermes: false, // clean and rebuild if changing
bundleInRelease: true, // whether to bundle JS and assets in release mode
]

apply from: "../../node_modules/react-native/react.gradle"
Expand Down Expand Up @@ -129,8 +130,8 @@ android {
compileSdkVersion rootProject.ext.compileSdkVersion

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}

defaultConfig {
Expand All @@ -142,8 +143,8 @@ android {
}

lintOptions {
abortOnError false
checkReleaseBuilds false
abortOnError true
checkReleaseBuilds true
}

splits {
Expand Down Expand Up @@ -230,7 +231,7 @@ dependencies {
// Run this once to be able to run the application with BUCK
// puts all compile dependencies into folder libs for BUCK to use
task copyDownloadableDepsToLibs(type: Copy) {
from configurations.compile
from configurations.implementation
into 'libs'
}

Expand Down
137 changes: 90 additions & 47 deletions example/android/app/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -58,36 +58,35 @@ androidx.versionedparcelable:versionedparcelable:1.0.0=debugAndroidTestCompileCl
androidx.versionedparcelable:versionedparcelable:1.1.0=releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
androidx.versionedparcelable:versionedparcelable:1.1.1=debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath
androidx.viewpager:viewpager:1.0.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
com.android.tools.analytics-library:protos:27.2.2=lintClassPath
com.android.tools.analytics-library:shared:27.2.2=lintClassPath
com.android.tools.analytics-library:tracker:27.2.2=lintClassPath
com.android.tools.analytics-library:protos:30.0.4=lintClassPath
com.android.tools.analytics-library:shared:30.0.4=lintClassPath
com.android.tools.analytics-library:tracker:30.0.4=lintClassPath
com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524=lintClassPath
com.android.tools.build:apksig:4.2.2=lintClassPath
com.android.tools.build:apkzlib:4.2.2=lintClassPath
com.android.tools.build:builder-model:4.2.2=lintClassPath
com.android.tools.build:builder-test-api:4.2.2=lintClassPath
com.android.tools.build:builder:4.2.2=lintClassPath
com.android.tools.build:gradle-api:4.2.2=lintClassPath
com.android.tools.build:manifest-merger:27.2.2=lintClassPath
com.android.tools.ddms:ddmlib:27.2.2=lintClassPath
com.android.tools.external.com-intellij:intellij-core:27.2.2=lintClassPath
com.android.tools.external.com-intellij:kotlin-compiler:27.2.2=lintClassPath
com.android.tools.external.org-jetbrains:uast:27.2.2=lintClassPath
com.android.tools.layoutlib:layoutlib-api:27.2.2=lintClassPath
com.android.tools.lint:lint-api:27.2.2=lintClassPath
com.android.tools.lint:lint-checks:27.2.2=lintClassPath
com.android.tools.lint:lint-gradle-api:27.2.2=lintClassPath
com.android.tools.lint:lint-gradle:27.2.2=lintClassPath
com.android.tools.lint:lint-model:27.2.2=lintClassPath
com.android.tools.lint:lint:27.2.2=lintClassPath
com.android.tools:annotations:27.2.2=lintClassPath
com.android.tools:common:27.2.2=lintClassPath
com.android.tools:dvlib:27.2.2=lintClassPath
com.android.tools:repository:27.2.2=lintClassPath
com.android.tools:sdk-common:27.2.2=lintClassPath
com.android.tools:sdklib:27.2.2=lintClassPath
com.android:signflinger:4.2.2=lintClassPath
com.android:zipflinger:4.2.2=lintClassPath
com.android.tools.build:apksig:7.0.4=lintClassPath
com.android.tools.build:apkzlib:7.0.4=lintClassPath
com.android.tools.build:builder-model:7.0.4=lintClassPath
com.android.tools.build:builder-test-api:7.0.4=lintClassPath
com.android.tools.build:builder:7.0.4=lintClassPath
com.android.tools.build:manifest-merger:30.0.4=lintClassPath
com.android.tools.ddms:ddmlib:30.0.4=lintClassPath
com.android.tools.external.com-intellij:intellij-core:30.0.4=lintClassPath
com.android.tools.external.com-intellij:kotlin-compiler:30.0.4=lintClassPath
com.android.tools.external.org-jetbrains:uast:30.0.4=lintClassPath
com.android.tools.layoutlib:layoutlib-api:30.0.4=lintClassPath
com.android.tools.lint:lint-api:30.0.4=lintClassPath
com.android.tools.lint:lint-checks:30.0.4=lintClassPath
com.android.tools.lint:lint-gradle:30.0.4=lintClassPath
com.android.tools.lint:lint-model:30.0.4=lintClassPath
com.android.tools.lint:lint:30.0.4=lintClassPath
com.android.tools:annotations:30.0.4=lintClassPath
com.android.tools:common:30.0.4=lintClassPath
com.android.tools:dvlib:30.0.4=lintClassPath
com.android.tools:repository:30.0.4=lintClassPath
com.android.tools:sdk-common:30.0.4=lintClassPath
com.android.tools:sdklib:30.0.4=lintClassPath
com.android:signflinger:7.0.4=lintClassPath
com.android:zipflinger:7.0.4=lintClassPath
com.beust:jcommander:1.78=lintClassPath
com.facebook.fbjni:fbjni-java-only:0.2.2=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
com.facebook.flipper:flipper-fresco-plugin:0.99.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath
com.facebook.flipper:flipper-network-plugin:0.99.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath
Expand Down Expand Up @@ -115,11 +114,12 @@ com.facebook.soloader:annotation:0.10.1=debugAndroidTestCompileClasspath,debugCo
com.facebook.soloader:nativeloader:0.10.1=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
com.facebook.soloader:soloader:0.10.1=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
com.facebook.yoga:proguard-annotations:1.19.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
com.github.javaparser:javaparser-core:3.17.0=lintClassPath
com.google.code.findbugs:jsr305:3.0.2=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
com.google.code.gson:gson:2.8.6=lintClassPath
com.google.errorprone:error_prone_annotations:2.3.2=lintClassPath
com.google.errorprone:error_prone_annotations:2.3.4=lintClassPath
com.google.guava:failureaccess:1.0.1=lintClassPath
com.google.guava:guava:28.1-jre=lintClassPath
com.google.guava:guava:30.1-jre=lintClassPath
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=lintClassPath
com.google.j2objc:j2objc-annotations:1.3=lintClassPath
com.google.jimfs:jimfs:1.1=lintClassPath
Expand All @@ -135,48 +135,91 @@ com.squareup:javawriter:2.5.0=lintClassPath
com.sun.activation:javax.activation:1.2.0=lintClassPath
com.sun.istack:istack-commons-runtime:3.0.8=lintClassPath
com.sun.xml.fastinfoset:FastInfoset:1.2.16=lintClassPath
com.thoughtworks.qdox:qdox:1.12.1=lintClassPath
commons-codec:commons-codec:1.10=lintClassPath
commons-io:commons-io:2.4=lintClassPath
commons-logging:commons-logging:1.2=lintClassPath
info.picocli:picocli:4.5.2=lintClassPath
it.unimi.dsi:fastutil:8.4.0=lintClassPath
jakarta.activation:jakarta.activation-api:1.2.1=lintClassPath
jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=lintClassPath
javax.inject:javax.inject:1=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
jline:jline:2.14.6=lintClassPath
junit:junit:4.13.1=lintClassPath
net.java.dev.jna:jna-platform:5.6.0=lintClassPath
net.java.dev.jna:jna:5.6.0=lintClassPath
net.sf.jopt-simple:jopt-simple:4.9=lintClassPath
net.sf.kxml:kxml2:2.3.0=lintClassPath
org.apache.commons:commons-compress:1.12=lintClassPath
org.apache.ant:ant-antlr:1.10.9=lintClassPath
org.apache.ant:ant-junit:1.10.9=lintClassPath
org.apache.ant:ant-launcher:1.10.9=lintClassPath
org.apache.ant:ant:1.10.9=lintClassPath
org.apache.commons:commons-compress:1.20=lintClassPath
org.apache.httpcomponents:httpclient:4.5.6=lintClassPath
org.apache.httpcomponents:httpcore:4.4.10=lintClassPath
org.apache.httpcomponents:httpmime:4.5.6=lintClassPath
org.bouncycastle:bcpkix-jdk15on:1.56=lintClassPath
org.bouncycastle:bcprov-jdk15on:1.56=lintClassPath
org.checkerframework:checker-qual:2.8.1=lintClassPath
org.codehaus.groovy:groovy-all:2.4.15=lintClassPath
org.codehaus.mojo:animal-sniffer-annotations:1.18=lintClassPath
org.checkerframework:checker-qual:3.5.0=lintClassPath
org.codehaus.groovy:groovy-all:3.0.7=lintClassPath
org.codehaus.groovy:groovy-ant:3.0.7=lintClassPath
org.codehaus.groovy:groovy-astbuilder:3.0.7=lintClassPath
org.codehaus.groovy:groovy-cli-picocli:3.0.7=lintClassPath
org.codehaus.groovy:groovy-console:3.0.7=lintClassPath
org.codehaus.groovy:groovy-datetime:3.0.7=lintClassPath
org.codehaus.groovy:groovy-docgenerator:3.0.7=lintClassPath
org.codehaus.groovy:groovy-groovydoc:3.0.7=lintClassPath
org.codehaus.groovy:groovy-groovysh:3.0.7=lintClassPath
org.codehaus.groovy:groovy-jmx:3.0.7=lintClassPath
org.codehaus.groovy:groovy-json:3.0.7=lintClassPath
org.codehaus.groovy:groovy-jsr223:3.0.7=lintClassPath
org.codehaus.groovy:groovy-macro:3.0.7=lintClassPath
org.codehaus.groovy:groovy-nio:3.0.7=lintClassPath
org.codehaus.groovy:groovy-servlet:3.0.7=lintClassPath
org.codehaus.groovy:groovy-sql:3.0.7=lintClassPath
org.codehaus.groovy:groovy-swing:3.0.7=lintClassPath
org.codehaus.groovy:groovy-templates:3.0.7=lintClassPath
org.codehaus.groovy:groovy-test-junit5:3.0.7=lintClassPath
org.codehaus.groovy:groovy-test:3.0.7=lintClassPath
org.codehaus.groovy:groovy-testng:3.0.7=lintClassPath
org.codehaus.groovy:groovy-xml:3.0.7=lintClassPath
org.codehaus.groovy:groovy:3.0.7=lintClassPath
org.glassfish.jaxb:jaxb-runtime:2.3.2=lintClassPath
org.glassfish.jaxb:txw2:2.3.2=lintClassPath
org.hamcrest:hamcrest-core:1.3=lintClassPath
org.jacoco:org.jacoco.agent:0.8.3=androidJacocoAnt
org.jacoco:org.jacoco.ant:0.8.3=androidJacocoAnt
org.jacoco:org.jacoco.core:0.8.3=androidJacocoAnt
org.jacoco:org.jacoco.report:0.8.3=androidJacocoAnt
org.jetbrains.intellij.deps:trove4j:1.0.20181211=lintClassPath
org.jetbrains.kotlin:kotlin-annotations-jvm:1.3.72=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
org.jetbrains.kotlin:kotlin-reflect:1.4.31=lintClassPath
org.jetbrains.kotlin:kotlin-reflect:1.4.32=lintClassPath
org.jetbrains.kotlin:kotlin-stdlib-common:1.4.10=debugAndroidTestCompileClasspath
org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31=lintClassPath
org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32=lintClassPath
org.jetbrains.kotlin:kotlin-stdlib-common:1.5.32=debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.10=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.31=lintClassPath
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32=lintClassPath
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.10=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.31=lintClassPath
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32=lintClassPath
org.jetbrains.kotlin:kotlin-stdlib:1.4.10=debugAndroidTestCompileClasspath
org.jetbrains.kotlin:kotlin-stdlib:1.4.31=lintClassPath
org.jetbrains.kotlin:kotlin-stdlib:1.4.32=debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
org.jetbrains.kotlin:kotlin-stdlib:1.4.32=lintClassPath
org.jetbrains.kotlin:kotlin-stdlib:1.5.32=debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
org.jetbrains:annotations:13.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,lintClassPath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
org.junit.jupiter:junit-jupiter-api:5.7.0=lintClassPath
org.junit.jupiter:junit-jupiter-engine:5.7.0=lintClassPath
org.junit.platform:junit-platform-commons:1.7.0=lintClassPath
org.junit.platform:junit-platform-engine:1.7.0=lintClassPath
org.junit.platform:junit-platform-launcher:1.7.0=lintClassPath
org.junit:junit-bom:5.7.0=lintClassPath
org.jvnet.staxex:stax-ex:1.8.1=lintClassPath
org.ow2.asm:asm-analysis:7.0=lintClassPath
org.ow2.asm:asm-commons:7.0=lintClassPath
org.ow2.asm:asm-tree:7.0=lintClassPath
org.opentest4j:opentest4j:1.2.0=lintClassPath
org.ow2.asm:asm-analysis:7.0=androidJacocoAnt,lintClassPath
org.ow2.asm:asm-commons:7.0=androidJacocoAnt,lintClassPath
org.ow2.asm:asm-tree:7.0=androidJacocoAnt,lintClassPath
org.ow2.asm:asm-util:7.0=lintClassPath
org.ow2.asm:asm:7.0=lintClassPath
org.ow2.asm:asm:7.0=androidJacocoAnt,lintClassPath
org.testng:testng:7.3.0=lintClassPath
org.webkit:android-jsc:r250230=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath
xerces:xercesImpl:2.12.0=lintClassPath
xml-apis:xml-apis:1.4.01=lintClassPath
empty=androidApis,androidTestUtil,compile,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestRuntimeClasspath,debugAnnotationProcessorClasspath,debugReverseMetadataValues,debugUnitTestAnnotationProcessorClasspath,debugWearBundling,lintChecks,lintPublish,releaseAnnotationProcessorClasspath,releaseReverseMetadataValues,releaseUnitTestAnnotationProcessorClasspath,releaseWearBundling,testCompile
empty=androidApis,androidJdkImage,androidTestUtil,coreLibraryDesugaring,debugAndroidTestAnnotationProcessorClasspath,debugAndroidTestRuntimeClasspath,debugAnnotationProcessorClasspath,debugReverseMetadataValues,debugUnitTestAnnotationProcessorClasspath,debugWearBundling,lintChecks,lintPublish,releaseAnnotationProcessorClasspath,releaseReverseMetadataValues,releaseUnitTestAnnotationProcessorClasspath,releaseWearBundling
2 changes: 1 addition & 1 deletion example/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ buildscript {
jcenter()
}
dependencies {
classpath("com.android.tools.build:gradle:4.2.2")
classpath("com.android.tools.build:gradle:7.0.+")

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
1 change: 0 additions & 1 deletion example/android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

android.useAndroidX=true
android.enableJetifier=true
android.jetifier.blacklist=bcprov-jdk15on

org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=4096m -XX:+HeapDumpOnOutOfMemoryError
org.gradle.daemon=true
Expand Down
2 changes: 1 addition & 1 deletion example/android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 4405b19

Please sign in to comment.