diff --git a/TeamCode/build.gradle b/TeamCode/build.gradle index 63b863a..f8a478d 100644 --- a/TeamCode/build.gradle +++ b/TeamCode/build.gradle @@ -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') diff --git a/build.common.gradle b/build.common.gradle index f6d97a0..f42d7b3 100644 --- a/build.common.gradle +++ b/build.common.gradle @@ -112,9 +112,6 @@ android { targetCompatibility JavaVersion.VERSION_1_8 } - packagingOptions { - pickFirst '**/*.so' - } sourceSets.main { jni.srcDirs = [] jniLibs.srcDir rootProject.file('libs') diff --git a/build.gradle b/build.gradle index 3ff79ba..2157aa6 100644 --- a/build.gradle +++ b/build.gradle @@ -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' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 530fb22..7f1910a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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