migrated gradle 4.0 --> 7.0

This commit is contained in:
Khosraw Azizi 2022-09-18 19:27:51 -05:00
parent ff4cf9f07c
commit 612a211458
4 changed files with 14 additions and 5 deletions

View file

@ -15,6 +15,18 @@
apply from: '../build.common.gradle'
apply from: '../build.dependencies.gradle'
android {
androidResources {
noCompress 'tflite'
}
packagingOptions {
jniLibs {
pickFirsts += ['**/*.so']
}
}
}
dependencies {
implementation project(':FtcRobotController')
annotationProcessor files('lib/OpModeAnnotationProcessor.jar')

View file

@ -112,9 +112,6 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}
packagingOptions {
pickFirst '**/*.so'
}
sourceSets.main {
jni.srcDirs = []
jniLibs.srcDir rootProject.file('libs')

View file

@ -15,7 +15,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.0.2'
classpath 'com.android.tools.build:gradle:7.2.1'
}
}

View file

@ -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-6.1.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip