diff --git a/app/build.gradle b/app/build.gradle index 0a5f6a7..9c96dbe 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,13 +16,13 @@ android { applicationId "top.itning.smpandroid" minSdkVersion 28 targetSdkVersion 29 - versionCode 1 - versionName "1.0" + versionCode 2 + versionName "1.0.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - ndk { + /*ndk { abiFilters 'arm64-v8a', 'x86_64' - } + }*/ resConfigs "zh", "en" } @@ -39,6 +39,14 @@ android { sourceCompatibility = 1.8 targetCompatibility = 1.8 } + splits { + abi { + enable true + reset() + include 'arm64-v8a', 'x86_64' + universalApk true + } + } } dependencies { @@ -46,8 +54,8 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.annotation:annotation:1.1.0' implementation "androidx.recyclerview:recyclerview:1.1.0" - implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha03" - implementation 'com.google.android.material:material:1.2.0-alpha05' + implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-rc01" + implementation 'com.google.android.material:material:1.3.0-alpha01' implementation 'com.github.itning:shadow:0.0.3' implementation 'com.amap.api:location:4.7.2' implementation 'com.squareup.retrofit2:retrofit:2.6.2' @@ -59,16 +67,17 @@ dependencies { implementation 'io.reactivex.rxjava2:rxandroid:2.1.1' implementation 'io.reactivex.rxjava2:rxjava:2.2.14' implementation 'cat.ereza:customactivityoncrash:2.2.0' - implementation 'org.bytedeco:javacv:1.5.2' - implementation group: 'org.bytedeco', name: 'opencv', version: '4.1.2-1.5.2' - implementation group: 'org.bytedeco', name: 'opencv', version: '4.1.2-1.5.2', classifier: "android-x86_64" - implementation group: 'org.bytedeco', name: 'opencv', version: '4.1.2-1.5.2', classifier: "android-arm64" - implementation group: 'org.bytedeco', name: 'openblas', version: '0.3.7-1.5.2' - implementation group: 'org.bytedeco', name: 'openblas', version: '0.3.7-1.5.2', classifier: "android-x86_64" - implementation group: 'org.bytedeco', name: 'openblas', version: '0.3.7-1.5.2', classifier: "android-arm64" + implementation 'org.bytedeco:javacv:1.5.3' + implementation group: 'org.bytedeco', name: 'opencv', version: '4.3.0-1.5.3' + implementation group: 'org.bytedeco', name: 'opencv', version: '4.3.0-1.5.3', classifier: "android-x86_64" + implementation group: 'org.bytedeco', name: 'opencv', version: '4.3.0-1.5.3', classifier: "android-arm64" + implementation group: 'org.bytedeco', name: 'openblas', version: '0.3.9-1.5.3' + implementation group: 'org.bytedeco', name: 'openblas', version: '0.3.9-1.5.3', classifier: "android-x86_64" + implementation group: 'org.bytedeco', name: 'openblas', version: '0.3.9-1.5.3', classifier: "android-arm64" implementation 'com.jakewharton:butterknife:10.2.0' annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.0' + //noinspection AnnotationProcessorOnCompilePath compileOnly 'org.projectlombok:lombok:1.18.10' annotationProcessor 'org.projectlombok:lombok:1.18.10' testImplementation 'junit:junit:4.12'